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 1/3] 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 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 2/3] 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 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 3/3] 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)
       }
     })
   }