LP#1626157 Actor stat cat sip fields config UI

Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 f43cfc5..4398ab2 100644 (file)
--- 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 5fad4e4..8e1fc2a 100644 (file)
--- 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<Promise<void>> {
         route: ActivatedRouteSnapshot,
         state: RouterStateSnapshot): Promise<void> {
 
-        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 (file)
index a31826b..0000000
--- 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 b239b82..e469740 100644 (file)
--- 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 @@
 <div class="container">
   <eg-link-table columnCount="3">
     <eg-link-table-link i18n-label label="Actor Stat Cat Sip Fields"  
-      url="/eg/staff/admin/server/config/actor_sip_fields"></eg-link-table-link>
+      routerLink="/staff/admin/server/actor/stat_cat_sip_fields"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Age Hold Protect Rules"  
       routerLink="/staff/admin/server/config/rule_age_hold_protect"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Asset Stat Cat Sip Fields"  

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server.module.ts
index 4628b33..7af4194 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server.module.ts
@@ -1,6 +1,7 @@
 import {NgModule} from '@angular/core';
 import {EgStaffCommonModule} from '@eg/staff/common.module';
 import {EgAdminServerRoutingModule} from './routing.module';
+import {EgAdminCommonModule} from '@eg/staff/admin/common.module';
 import {AdminServerSplashComponent} from './admin-server-splash.component';
 
 @NgModule({
@@ -8,9 +9,11 @@ import {AdminServerSplashComponent} from './admin-server-splash.component';
       AdminServerSplashComponent
   ],
   imports: [
-    EgStaffCommonModule,
+    EgAdminCommonModule,
     EgAdminServerRoutingModule
   ],
+  exports: [
+  ],
   providers: [
   ]
 })

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/config/config.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/config/config.module.ts
index 132ee6a..0ccaa5a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/config/config.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/config/config.module.ts
@@ -1,8 +1,6 @@
 import {NgModule} from '@angular/core';
-import {EgStaffCommonModule} from '@eg/staff/common.module';
+import {EgAdminCommonModule} from '@eg/staff/admin/common.module';
 import {EgAdminServerConfigRoutingModule} from './routing.module';
-import {EgGridModule} from '@eg/share/grid/grid.module';
-import {EgAdminPageComponent} from '@eg/staff/share/admin-page/admin-page.component';
 import {BillingTypeComponent} from './billing_type.component';
 import {HardDueDateComponent} from './hard_due_date.component';
 import {SmsCarrierComponent} from './sms_carrier.component';
@@ -13,7 +11,6 @@ import {RuleAgeHoldProtectComponent} from './rule_age_hold_protect.component';
 
 @NgModule({
   declarations: [
-      EgAdminPageComponent,
       BillingTypeComponent,
       HardDueDateComponent,
       SmsCarrierComponent,
@@ -23,9 +20,8 @@ import {RuleAgeHoldProtectComponent} from './rule_age_hold_protect.component';
       RuleAgeHoldProtectComponent
   ],
   imports: [
-    EgStaffCommonModule,
-    EgAdminServerConfigRoutingModule,
-    EgGridModule
+    EgAdminCommonModule,
+    EgAdminServerConfigRoutingModule
   ],
   providers: [
   ]

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
index 88a68e9..9f9d214 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
@@ -6,6 +6,9 @@ const routes: Routes = [{
     path: 'splash',
     component: AdminServerSplashComponent
 }, {
+    path: 'actor',
+    loadChildren: '@eg/staff/admin/server/actor/actor.module#EgAdminServerActorModule'
+}, {
     path: 'config',
     loadChildren: '@eg/staff/admin/server/config/config.module#EgAdminServerConfigModule'
 }];

diff --git a/Open-ILS/src/eg2/src/app/staff/common.module.ts b/Open-ILS/src/eg2/src/app/staff/common.module.ts
index 09c26bc..7afd583 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts
@@ -16,7 +16,6 @@ import {EgStringComponent} from '@eg/share/string/string.component';
 import {EgStringService} from '@eg/share/string/string.service';
 import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component';
 import {EgDateSelectComponent} from '@eg/share/date-select/date-select.component';
-import {EgLinkTableComponent, EgLinkTableLinkComponent} from '@eg/staff/share/link-table/link-table.component';
 
 /**
  * Imports the EG common modules and adds modules common to all staff UI's.
@@ -36,9 +35,7 @@ import {EgLinkTableComponent, EgLinkTableLinkComponent} from '@eg/staff/share/li
     EgStringComponent,
     EgOpChangeComponent,
     FmRecordEditorComponent,
-    EgDateSelectComponent,
-    EgLinkTableComponent,
-    EgLinkTableLinkComponent
+    EgDateSelectComponent
   ],
   imports: [
     EgCommonModule
@@ -57,9 +54,7 @@ import {EgLinkTableComponent, EgLinkTableLinkComponent} from '@eg/staff/share/li
     EgStringComponent,
     EgOpChangeComponent,
     FmRecordEditorComponent,
-    EgDateSelectComponent,
-    EgLinkTableComponent,
-    EgLinkTableLinkComponent
+    EgDateSelectComponent
   ]
 })
 

diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
index a80a6cc..3f6f258 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
@@ -40,8 +40,6 @@ export class EgStaffResolver implements Resolve<Observable<any>> {
         route: ActivatedRouteSnapshot,
         state: RouterStateSnapshot): Observable<any> {
 
-        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<Observable<any>> {
 
         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<Observable<any>> {
      * Fetches data common to all staff interfaces.
      */
     loadStartupData(): Promise<void> {
-        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 3b6578f..92f3d0a 100644 (file)
--- 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 4b20130..eca48ae 100644 (file)
--- 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}`);