From 60b9f7174e407758623d66b62e3e653bc56f313f Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Sun, 27 May 2018 10:53:39 -0400 Subject: [PATCH] LP#1775466 Actor stat cat sip fields config UI Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/core/auth.service.ts | 6 +++++- Open-ILS/src/eg2/src/app/resolver.service.ts | 2 -- .../src/eg2/src/app/staff/admin/admin.module.ts | 21 --------------------- .../admin/server/admin-server-splash.component.html | 2 +- .../app/staff/admin/server/admin-server.module.ts | 5 ++++- .../app/staff/admin/server/config/config.module.ts | 10 +++------- .../src/app/staff/admin/server/routing.module.ts | 3 +++ Open-ILS/src/eg2/src/app/staff/common.module.ts | 9 ++------- Open-ILS/src/eg2/src/app/staff/resolver.service.ts | 4 ---- Open-ILS/src/eg2/src/app/staff/routing.module.ts | 2 +- Open-ILS/src/eg2/src/app/staff/staff.component.ts | 7 +++---- 11 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 Open-ILS/src/eg2/src/app/staff/admin/admin.module.ts diff --git a/Open-ILS/src/eg2/src/app/core/auth.service.ts b/Open-ILS/src/eg2/src/app/core/auth.service.ts index f43cfc55b4..4398ab252f 100644 --- a/Open-ILS/src/eg2/src/app/core/auth.service.ts +++ b/Open-ILS/src/eg2/src/app/core/auth.service.ts @@ -219,6 +219,7 @@ export class EgAuthService { console.debug('polling with timeout ' + pollTime); this.pollTimeout = setTimeout(() => { + console.debug('poll checking for auth session...'); this.net.request( 'open-ils.auth', 'open-ils.auth.session.retrieve', @@ -229,7 +230,10 @@ export class EgAuthService { // EgNetService intercepts NO_SESSION events. // If the promise resolves, the session is valid. ).subscribe( - user => this.sessionPoll(), + user => { + console.debug('auth poll returned: ' + user); + this.sessionPoll(); + }, err => console.warn('auth poll error: ' + err) ); diff --git a/Open-ILS/src/eg2/src/app/resolver.service.ts b/Open-ILS/src/eg2/src/app/resolver.service.ts index 5fad4e47a1..8e1fc2a074 100644 --- a/Open-ILS/src/eg2/src/app/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/resolver.service.ts @@ -22,8 +22,6 @@ export class EgBaseResolver implements Resolve> { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { - console.debug('EgBaseResolver:resolve()'); - this.idl.parseIdl(); return this.org.fetchOrgs(); // anonymous PCRUD. diff --git a/Open-ILS/src/eg2/src/app/staff/admin/admin.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/admin.module.ts deleted file mode 100644 index a31826b549..0000000000 --- a/Open-ILS/src/eg2/src/app/staff/admin/admin.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import {NgModule} from '@angular/core'; -import {EgStaffCommonModule} from '@eg/staff/common.module'; -import {EgAdminRoutingModule} from './routing.module'; - -@NgModule({ - declarations: [ - ], - imports: [ - EgStaffCommonModule, - EgAdminRoutingModule - ], - exports: [ - ], - providers: [ - ] -}) - -export class EgAdminModule { -} - - diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html index b239b8228a..e469740388 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html @@ -4,7 +4,7 @@
+ routerLink="/staff/admin/server/actor/stat_cat_sip_fields"> > { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - console.debug('EgStaffResolver:resolve()'); - // Staff cookies stay in /$base/staff/ // NOTE: storing session data at '/' so it can be shared by // Angularjs apps. @@ -59,7 +57,6 @@ export class EgStaffResolver implements Resolve> { this.auth.testAuthToken().then( tokenOk => { - console.debug('EgStaffResolver: authtoken verified'); this.confirmStaffPerms().then( hasPerms => { this.auth.verifyWorkstation().then( @@ -128,7 +125,6 @@ export class EgStaffResolver implements Resolve> { * Fetches data common to all staff interfaces. */ loadStartupData(): Promise { - console.debug('EgStaffResolver:loadStartupData()'); // Fetch settings needed globally. This will cache the values // in the org service. diff --git a/Open-ILS/src/eg2/src/app/staff/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/routing.module.ts index 3b6578fe78..92f3d0ae00 100644 --- a/Open-ILS/src/eg2/src/app/staff/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/routing.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [{ loadChildren : '@eg/staff/sandbox/sandbox.module#EgSandboxModule' }, { path: 'admin', - loadChildren : '@eg/staff/admin/admin.module#EgAdminModule' + loadChildren : '@eg/staff/admin/routing.module#EgAdminRoutingModule' }] }]; diff --git a/Open-ILS/src/eg2/src/app/staff/staff.component.ts b/Open-ILS/src/eg2/src/app/staff/staff.component.ts index 4b201309bd..eca48ae46c 100644 --- a/Open-ILS/src/eg2/src/app/staff/staff.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/staff.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, NgZone, HostListener/*, ViewChild*/} from '@angular/core'; +import {Component, OnInit, NgZone, HostListener} from '@angular/core'; import {Router, ActivatedRoute, NavigationEnd} from '@angular/router'; import {EgAuthService, EgAuthWsState} from '@eg/core/auth.service'; import {EgNetService} from '@eg/core/net.service'; @@ -27,9 +27,8 @@ export class EgStaffComponent implements OnInit { ngOnInit() { - console.debug('EgStaffComponent:ngOnInit()'); - - // Fires on all in-app router navigation, but not initial page load. + // Fires on all in-staff-app router navigation, but not initial + // page load. this.router.events.subscribe(routeEvent => { if (routeEvent instanceof NavigationEnd) { // console.debug(`EgStaffComponent routing to ${routeEvent.url}`); -- 2.11.0