Profilev3 updated (#470)

* topic and other changes:buildFix * topic and other changes:buildFix and disabled left menu * Updated competency list loading condition * profile Update Changes#1 * Update user-profile.component.ts * Update user-profile.component.ts * build Fix * lint FIx Co-authored-by: NandiniAV <nandini.achutha@tarento.com>
sunbird-cb · Jun 10, 2022 · 6a4f795 · 6a4f795
1 parent 2430b40
commit 6a4f795
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/project/ws/app/src/lib/routes/profile-v3/models/profile-v3.models.ts b/project/ws/app/src/lib/routes/profile-v3/models/profile-v3.models.ts
@@ -14,7 +14,8 @@ export namespace NSProfileDataV3 {
         routerLink: string
         step: number
         description: string
-        largeDesc?: any
+        largeDesc?: any,
+        allowSkip?: any
     }
 
     export interface ICompetencie {

diff --git a/project/ws/app/src/lib/routes/profile-v3/routes/profile-home/profile-home.component.html b/project/ws/app/src/lib/routes/profile-v3/routes/profile-home/profile-home.component.html
@@ -1,6 +1,6 @@
 <div class="container-balanced-banner flex flex-row justify-between margin-bottom-xl margin-top-xl">
   <h1>{{currentStep}}. {{message}} </h1>
-  <ng-container *ngIf="current.allowSkip">
+  <ng-container *ngIf="current?.allowSkip">
     <a *ngIf="skip" [routerLink]="skip.routerLink" class="skip_link mat-body-2 margin-remove-bottom">Skip, I will do this later</a>
   </ng-container>
 </div>

diff --git a/...p/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.ts b/...p/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.ts
@@ -8,8 +8,6 @@ import { MatChipInputEvent, MatDialog, MatSnackBar } from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 import { RolesAndActivityService } from '../../services/rolesandActivities.service'
 import { DialogConfirmComponent } from 'src/app/component/dialog-confirm/dialog-confirm.component'
-
-
 @Component({
     selector: 'ws-app-roles-and-activities',
     templateUrl: './roles-and-activities.component.html',
@@ -103,9 +101,9 @@ export class RolesAndActivitiesComponent implements OnInit, OnDestroy {
                             userRoles: _.map(this.userRoles, role => {
                                 return {
                                     name: role.name,
-                                    activities: role.activities
+                                    activities: role.activities,
                                 }
-                            }) as NSProfileDataV3.IRolesAndActivities[]
+                            }) as NSProfileDataV3.IRolesAndActivities[],
                         },
                     },
                 }
@@ -153,7 +151,7 @@ export class RolesAndActivitiesComponent implements OnInit, OnDestroy {
             this.editRole = role
             this.createRole.setValue({
                 roleName: role.name,
-                activity: role.activities
+                activity: role.activities,
             }),
                 _.each(role.activities, a => {
                     this.addActivity({ input: this.act, value: a.name })
@@ -181,9 +179,9 @@ export class RolesAndActivitiesComponent implements OnInit, OnDestroy {
                                     return {
                                         name: rol.name,
                                         // tslint:disable-next-line:arrow-return-shorthand
-                                        activities: rol.activities
+                                        activities: rol.activities,
                                     }
-                                }) as NSProfileDataV3.IRolesAndActivities[]
+                                }) as NSProfileDataV3.IRolesAndActivities[],
                             },
                         },
                     }

diff --git a/project/ws/app/src/lib/routes/profile-v3/routes/welcome-onboard/welcome-onboard.component.ts b/project/ws/app/src/lib/routes/profile-v3/routes/welcome-onboard/welcome-onboard.component.ts
@@ -10,4 +10,4 @@ export class WelcomeOnboardComponent implements OnInit {
 
     ngOnInit() {
     }
-}
+}
diff --git a/project/ws/app/src/lib/routes/user-profile/components/user-profile/user-profile.component.ts b/project/ws/app/src/lib/routes/user-profile/components/user-profile/user-profile.component.ts
@@ -600,7 +600,7 @@ export class UserProfileComponent implements OnInit, OnDestroy {
         orgName: organisation.name,
         orgNameOther: organisation.nameOther,
         industry: organisation.industry,
-        industryOther: organisation.industryOther, 
+        industryOther: organisation.industryOther,
         // tslint:disable-next-line
         designation: _.findIndex(this.designationsMeta.designations, { name: organisation.designation }) != -1 ? organisation.designation : 'Other',
         designationOther: organisation.designationOther,
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ export class WelcomeOnboardComponent implements OnInit { @@
         ngOnInit() {
         }
-    }
+    }