Merge pull request #142 from sunbird-cb/onboarding

Onboarding
sunbird-cb · Jul 1, 2022 · 6c9c4b1 · 6c9c4b1
2 parents 8c701e1 + b50622b
commit 6c9c4b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.../src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.html b/.../src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.html
@@ -35,7 +35,7 @@ <h2>Organization information</h2>
 </mat-sidenav-container>
 
 
-<div class="footer_box flex flex-row justify-between">
+<div class="footer_box flex flex-row justify-between" *ngIf="router.url!='/app/setup/welcome'">
   <!-- <a class="skip_link mat-body-2 margin-remove-bottom">Cancel</a> -->
 
   <ng-container *ngIf="previous && previous !== 'first'">

diff --git a/.../src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.scss b/.../src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.scss
@@ -199,3 +199,7 @@ background-color: #F0F3F4!important;
 .theme-igot.day-mode .mat-drawer-container {
   background-color: #f0f3f4!important;
 }
+
+::ng-deep ws-app-footer {
+  display: none!important;
+}
diff --git a/...ws/app/src/lib/routes/state-profile/routes/welcome-onboard/welcome-onboard.component.scss b/...ws/app/src/lib/routes/state-profile/routes/welcome-onboard/welcome-onboard.component.scss
@@ -31,3 +31,6 @@
 .welcome-mat-card {
     padding:48px 48px!important;
 }
+.footer_box {
+    display: none!important;
+}
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
@@ -347,6 +347,13 @@ export class InitService {
 
         this.configSvc.userGroups = new Set(details.group)
         this.configSvc.userRoles = new Set((details.roles || []).map((v: string) => v.toLowerCase()))
+
+        // This is for showing side menu based on loggged in user's root org
+        // since we dont have new role for such users, we'll add a role 'isInstuteOrg'
+        // so that this role check can be used to show side menu items based on this condition
+        if (completeProdata.rootOrg && completeProdata.rootOrg.isInstitute) {
+          this.configSvc.userRoles.add('isInstuteOrg')
+        }
         return details
       } catch (e) {
         this.configSvc.userProfile = null