Small e2eid fixes and sign-out component

Gid733 · Gid733 · commit 6deb06cb5126 · 2018-06-05T00:15:39.000+03:00
diff --git a/eform-client/src/app/app.module.ts b/eform-client/src/app/app.module.ts
@@ -10,8 +10,10 @@ import {DndModule} from 'ng2-dnd';
 
 import {AccountManagementModule, SimpleSitesModule, SettingsModule, AdvancedModule, HelpersModule} from 'app/modules';
 import {PluginsModule} from 'app/plugins/plugins.module';
-import {AppComponent, AuthComponent, RestorePasswordComponent, HeaderComponent,
-  NavigationComponent, FooterComponent} from 'app/components';
+import {
+  AppComponent, AuthComponent, RestorePasswordComponent, HeaderComponent,
+  NavigationComponent, FooterComponent, SignOutComponent
+} from 'app/components';
 import {FullLayoutComponent, SimpleLayoutComponent} from 'app/layouts';
 import {
   AdminService, EntitySearchService, EntitySelectService, SettingsService,
@@ -42,6 +44,7 @@ import {EqualValidatorDirective} from 'app/components/directives/equal-validator
     AppComponent,
     AuthComponent,
     RestorePasswordComponent,
+    SignOutComponent,
     HeaderComponent,
     FooterComponent,
     NavigationComponent,
diff --git a/eform-client/src/app/app.routing.ts b/eform-client/src/app/app.routing.ts
@@ -3,7 +3,7 @@ import {RouterModule, Routes} from '@angular/router';
 
 import {PreloadResolverConfig} from 'app/configs';
 import {FullLayoutComponent, SimpleLayoutComponent} from 'app/layouts';
-import {RestorePasswordComponent, AuthComponent} from 'app/components';
+import {RestorePasswordComponent, AuthComponent, SignOutComponent} from 'app/components';
 import {AuthGuard} from 'app/guards';
 
 export const routes: Routes = [
@@ -65,6 +65,10 @@ export const routes: Routes = [
       {
         path: 'restore-password',
         component: RestorePasswordComponent
+      },
+      {
+        path: 'sign-out',
+        component: SignOutComponent
       }
     ]
   },
diff --git a/eform-client/src/app/components/auth/sign-out.component.ts b/eform-client/src/app/components/auth/sign-out.component.ts
@@ -0,0 +1,29 @@
+import {AfterViewChecked, AfterViewInit, Component, OnInit} from '@angular/core';
+import {Router} from '@angular/router';
+import {AuthService} from 'app/services';
+
+
+@Component({
+  selector: 'sign-out',
+  template: ''
+})
+export class SignOutComponent implements OnInit, AfterViewChecked {
+
+  constructor(private authService: AuthService, private router: Router) { }
+
+  ngOnInit() {
+
+  }
+
+
+  signOut() {
+    this.authService.logout().subscribe(() => {
+      localStorage.clear();
+      this.router.navigate(['/login']).then();
+    });
+  }
+
+  ngAfterViewChecked(): void {
+    this.signOut();
+  }
+}
diff --git a/eform-client/src/app/components/index.ts b/eform-client/src/app/components/index.ts
@@ -1,5 +1,6 @@
 export * from './auth/auth.component';
 export * from './auth/restore-password.component';
+export * from './auth/sign-out.component';
 export * from './footer/footer.component';
 export * from './header/header.component';
 export * from './navigation/navigation.component';
diff --git a/eform-client/src/app/components/navigation/navigation.component.html b/eform-client/src/app/components/navigation/navigation.component.html
@@ -7,15 +7,15 @@
               *ngIf="menu.appendLeftStyles && (userInfo.role == menu.guard
               || userInfo.role == 'admin'
               || menu.guard == '')">
-            <a class="dropdown-toggle" *ngIf="menu.submenus.length > 0"
+            <a class="dropdown-toggle" *ngIf="menu.submenus.length > 0" id="{{menu.e2eId || 'm1'}}"
                data-toggle="dropdown" href="javascript:void(0);">
               {{menu.name}}
             </a>
-            <a *ngIf="menu.submenus.length == 0" routerLink="{{menu.link}}">
+            <a *ngIf="menu.submenus.length == 0" routerLink="{{menu.link}}" id="{{menu.e2eId || 'm2'}}">
               {{menu.name}}
             </a>
             <ul class="dropdown-menu dropdown-menu-right" *ngIf="menu.submenus.length > 0">
-              <li *ngFor="let submenu of menu.submenus">
+              <li *ngFor="let submenu of menu.submenus" id="{{submenu.e2eId || 'm3'}}">
                 <a routerLink="{{submenu.link}}" routerLinkActive="active"
                    *ngIf="userInfo.role == submenu.guard || userInfo.role == 'admin' || submenu.guard == ''">
                   {{submenu.name}}
@@ -43,14 +43,16 @@
           <li [ngClass]="{'dropdown': menu.submenus.length > 0}"
               *ngIf="!menu.appendLeftStyles && (userInfo.role == menu.guard || userInfo.role == 'admin' || menu.guard == '')">
             <a class="dropdown-toggle" *ngIf="menu.submenus.length > 0"
+               id="{{menu.e2eId || 'm4'}}"
                data-toggle="dropdown" href="javascript:void(0);">
               {{menu.name}}
             </a>
-            <a class="dropdown-toggle" *ngIf="menu.submenus.length == 0" routerLink="{{menu.link}}" routerLinkActive="active">
+            <a class="dropdown-toggle" *ngIf="menu.submenus.length == 0" routerLink="{{menu.link}}" id="{{menu.e2eId || 'm5'}}"
+               routerLinkActive="active">
               {{menu.name}}
             </a>
             <ul class="dropdown-menu dropdown-menu-right" *ngIf="menu.submenus.length > 0">
-              <li *ngFor="let submenu of menu.submenus">
+              <li *ngFor="let submenu of menu.submenus" id="{{submenu.e2eId || 'm6'}}">
                 <a routerLink="{{submenu.link}}" routerLinkActive="active"
                    *ngIf="userInfo.role == submenu.guard || userInfo.role == 'admin' || submenu.guard == ''">
                   {{submenu.name}}
diff --git a/eform-client/src/app/components/navigation/navigation.component.ts b/eform-client/src/app/components/navigation/navigation.component.ts
@@ -25,69 +25,84 @@ export class NavigationComponent implements OnInit {
         this.navigationMenu = [
           {
             name: this.userInfo.firstName + ' ' + this.userInfo.lastName || 'name',
+            e2eId: 'sign-out-dropdown',
             appendLeftStyles: true,
             submenus: [
               {
                 name: 'User Management',
+                e2eId: 'user-management-menu',
                 link: '/account-management/users',
                 guard: 'admin'
               },
               {
                 name: 'Google Authenticator',
+                e2eId: '',
                 link: '/account-management/google-authenticator'
               },
               {
                 name: 'Change password',
+                e2eId: '',
                 link: '/account-management/change-password'
               },
               {
                 name: 'Sign out',
-                link: ''
+                e2eId: 'sign-out',
+                link: '/login/sign-out'
               }
             ]
           },
           {
             name: 'My eForms',
+            e2eId: '',
             link: '/',
             submenus: []
           },
           {
             name: 'Device users',
+            e2eId: '',
             link: '/simplesites',
             submenus: []
           },
           {
             name: 'Advanced',
+            e2eId: '',
             submenus: [
               {
                 name: 'Sites',
+                e2eId: '',
                 link: '/advanced/sites',
               },
               {
                 name: 'Workers',
+                e2eId: '',
                 link: '/advanced/workers',
               },
               {
                 name: 'Units',
+                e2eId: '',
                 link: '/advanced/units',
               },
               {
                 name: 'Searchable list',
+                e2eId: '',
                 link: '/advanced/entity-search',
               },
               {
                 name: 'Selectable list',
+                e2eId: '',
                 link: '/advanced/entity-select'
               },
               {
                 name: 'Settings',
+                e2eId: '',
                 link: '/settings',
                 guard: 'admin'
               }
             ]
           },
           {
             name: 'Example plugin',
+            e2eId: '',
             link: '/plugins/example-pn',
             submenus: []
           },
@@ -97,11 +112,4 @@ export class NavigationComponent implements OnInit {
 
 
   }
-
-  signOut() {
-    this.authService.logout().subscribe(() => {
-      localStorage.clear();
-      this.router.navigate(['/login']).then();
-    });
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import {RouterModule, Routes} from '@angular/router';`
`3`	`3`
`4`	`4`	`import {PreloadResolverConfig} from 'app/configs';`
`5`	`5`	`import {FullLayoutComponent, SimpleLayoutComponent} from 'app/layouts';`
`6`		`-import {RestorePasswordComponent, AuthComponent} from 'app/components';`
	`6`	`+import {RestorePasswordComponent, AuthComponent, SignOutComponent} from 'app/components';`
`7`	`7`	`import {AuthGuard} from 'app/guards';`
`8`	`8`
`9`	`9`	`export const routes: Routes = [`
`@@ -65,6 +65,10 @@ export const routes: Routes = [`
`65`	`65`	`{`
`66`	`66`	`path: 'restore-password',`
`67`	`67`	`component: RestorePasswordComponent`
	`68`	`+ },`
	`69`	`+ {`
	`70`	`+ path: 'sign-out',`
	`71`	`+ component: SignOutComponent`
`68`	`72`	`}`
`69`	`73`	`]`
`70`	`74`	`},`
Original file line number	Diff line number	Diff line change
`@@ -25,69 +25,84 @@ export class NavigationComponent implements OnInit {`
`25`	`25`	`this.navigationMenu = [`
`26`	`26`	`{`
`27`	`27`	`name: this.userInfo.firstName + ' ' + this.userInfo.lastName \|\| 'name',`
	`28`	`+ e2eId: 'sign-out-dropdown',`
`28`	`29`	`appendLeftStyles: true,`
`29`	`30`	`submenus: [`
`30`	`31`	`{`
`31`	`32`	`name: 'User Management',`
	`33`	`+ e2eId: 'user-management-menu',`
`32`	`34`	`link: '/account-management/users',`
`33`	`35`	`guard: 'admin'`
`34`	`36`	`},`
`35`	`37`	`{`
`36`	`38`	`name: 'Google Authenticator',`
	`39`	`+ e2eId: '',`
`37`	`40`	`link: '/account-management/google-authenticator'`
`38`	`41`	`},`
`39`	`42`	`{`
`40`	`43`	`name: 'Change password',`
	`44`	`+ e2eId: '',`
`41`	`45`	`link: '/account-management/change-password'`
`42`	`46`	`},`
`43`	`47`	`{`
`44`	`48`	`name: 'Sign out',`
`45`		`- link: ''`
	`49`	`+ e2eId: 'sign-out',`
	`50`	`+ link: '/login/sign-out'`
`46`	`51`	`}`
`47`	`52`	`]`
`48`	`53`	`},`
`49`	`54`	`{`
`50`	`55`	`name: 'My eForms',`
	`56`	`+ e2eId: '',`
`51`	`57`	`link: '/',`
`52`	`58`	`submenus: []`
`53`	`59`	`},`
`54`	`60`	`{`
`55`	`61`	`name: 'Device users',`
	`62`	`+ e2eId: '',`
`56`	`63`	`link: '/simplesites',`
`57`	`64`	`submenus: []`
`58`	`65`	`},`
`59`	`66`	`{`
`60`	`67`	`name: 'Advanced',`
	`68`	`+ e2eId: '',`
`61`	`69`	`submenus: [`
`62`	`70`	`{`
`63`	`71`	`name: 'Sites',`
	`72`	`+ e2eId: '',`
`64`	`73`	`link: '/advanced/sites',`
`65`	`74`	`},`
`66`	`75`	`{`
`67`	`76`	`name: 'Workers',`
	`77`	`+ e2eId: '',`
`68`	`78`	`link: '/advanced/workers',`
`69`	`79`	`},`
`70`	`80`	`{`
`71`	`81`	`name: 'Units',`
	`82`	`+ e2eId: '',`
`72`	`83`	`link: '/advanced/units',`
`73`	`84`	`},`
`74`	`85`	`{`
`75`	`86`	`name: 'Searchable list',`
	`87`	`+ e2eId: '',`
`76`	`88`	`link: '/advanced/entity-search',`
`77`	`89`	`},`
`78`	`90`	`{`
`79`	`91`	`name: 'Selectable list',`
	`92`	`+ e2eId: '',`
`80`	`93`	`link: '/advanced/entity-select'`
`81`	`94`	`},`
`82`	`95`	`{`
`83`	`96`	`name: 'Settings',`
	`97`	`+ e2eId: '',`
`84`	`98`	`link: '/settings',`
`85`	`99`	`guard: 'admin'`
`86`	`100`	`}`
`87`	`101`	`]`
`88`	`102`	`},`
`89`	`103`	`{`
`90`	`104`	`name: 'Example plugin',`
	`105`	`+ e2eId: '',`
`91`	`106`	`link: '/plugins/example-pn',`
`92`	`107`	`submenus: []`
`93`	`108`	`},`
`@@ -97,11 +112,4 @@ export class NavigationComponent implements OnInit {`
`97`	`112`
`98`	`113`
`99`	`114`	`}`
`100`		`-`
`101`		`- signOut() {`
`102`		`- this.authService.logout().subscribe(() => {`
`103`		`- localStorage.clear();`
`104`		`- this.router.navigate(['/login']).then();`
`105`		`- });`
`106`		`- }`
`107`	`115`	`}`