From 45ed53565c49f325c9f4374ddaf9529259b5b66f Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 12 Apr 2018 21:55:58 +0000 Subject: [PATCH] LP#1626157 More file name best practices Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/common.module.ts | 16 ++++++++-------- .../src/eg2/src/app/core/{auth.ts => auth.service.ts} | 8 ++++---- .../src/eg2/src/app/core/{event.ts => event.service.ts} | 0 Open-ILS/src/eg2/src/app/core/{idl.ts => idl.service.ts} | 0 Open-ILS/src/eg2/src/app/core/{net.ts => net.service.ts} | 2 +- Open-ILS/src/eg2/src/app/core/{org.ts => org.service.ts} | 8 ++++---- .../src/eg2/src/app/core/{pcrud.ts => pcrud.service.ts} | 6 +++--- .../src/eg2/src/app/core/{perm.ts => perm.service.ts} | 6 +++--- .../src/eg2/src/app/core/{store.ts => store.service.ts} | 0 Open-ILS/src/eg2/src/app/migration.module.ts | 16 ++++++++-------- Open-ILS/src/eg2/src/app/resolver.service.ts | 4 ++-- .../src/eg2/src/app/share/catalog/catalog-url.service.ts | 2 +- .../src/eg2/src/app/share/catalog/catalog.service.ts | 10 +++++----- Open-ILS/src/eg2/src/app/share/catalog/search-context.ts | 4 ++-- Open-ILS/src/eg2/src/app/share/org-select.component.ts | 8 ++++---- .../src/eg2/src/app/share/{unapi.ts => unapi.service.ts} | 2 +- .../workstation/workstations/workstations.component.ts | 14 +++++++------- Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts | 2 +- .../src/eg2/src/app/staff/catalog/catalog.service.ts | 4 ++-- .../eg2/src/app/staff/catalog/record/copies.component.ts | 4 ++-- .../eg2/src/app/staff/catalog/record/record.component.ts | 4 ++-- .../src/eg2/src/app/staff/catalog/resolver.service.ts | 10 +++++----- .../eg2/src/app/staff/catalog/result/record.component.ts | 4 ++-- .../src/app/staff/catalog/result/results.component.ts | 4 ++-- .../eg2/src/app/staff/catalog/search-form.component.ts | 4 ++-- .../app/staff/circ/patron/bcsearch/bcsearch.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/login.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/nav.component.ts | 2 +- Open-ILS/src/eg2/src/app/staff/resolver.service.ts | 6 +++--- .../src/eg2/src/app/staff/share/bib-summary.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/staff.component.ts | 4 ++-- 31 files changed, 83 insertions(+), 83 deletions(-) rename Open-ILS/src/eg2/src/app/core/{auth.ts => auth.service.ts} (97%) rename Open-ILS/src/eg2/src/app/core/{event.ts => event.service.ts} (100%) rename Open-ILS/src/eg2/src/app/core/{idl.ts => idl.service.ts} (100%) rename Open-ILS/src/eg2/src/app/core/{net.ts => net.service.ts} (99%) rename Open-ILS/src/eg2/src/app/core/{org.ts => org.service.ts} (97%) rename Open-ILS/src/eg2/src/app/core/{pcrud.ts => pcrud.service.ts} (98%) rename Open-ILS/src/eg2/src/app/core/{perm.ts => perm.service.ts} (92%) rename Open-ILS/src/eg2/src/app/core/{store.ts => store.service.ts} (100%) rename Open-ILS/src/eg2/src/app/share/{unapi.ts => unapi.service.ts} (97%) diff --git a/Open-ILS/src/eg2/src/app/common.module.ts b/Open-ILS/src/eg2/src/app/common.module.ts index ea68a75ac5..20a9b5e767 100644 --- a/Open-ILS/src/eg2/src/app/common.module.ts +++ b/Open-ILS/src/eg2/src/app/common.module.ts @@ -6,14 +6,14 @@ import {NgModule, ModuleWithProviders} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; -import {EgEventService} from '@eg/core/event'; -import {EgStoreService} from '@eg/core/store'; -import {EgIdlService} from '@eg/core/idl'; -import {EgNetService} from '@eg/core/net'; -import {EgAuthService} from '@eg/core/auth'; -import {EgPermService} from '@eg/core/perm'; -import {EgPcrudService} from '@eg/core/pcrud'; -import {EgOrgService} from '@eg/core/org'; +import {EgEventService} from '@eg/core/event.service'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgIdlService} from '@eg/core/idl.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgAuthService} from '@eg/core/auth.service'; +import {EgPermService} from '@eg/core/perm.service'; +import {EgPcrudService} from '@eg/core/pcrud.service'; +import {EgOrgService} from '@eg/core/org.service'; @NgModule({ declarations: [ diff --git a/Open-ILS/src/eg2/src/app/core/auth.ts b/Open-ILS/src/eg2/src/app/core/auth.service.ts similarity index 97% rename from Open-ILS/src/eg2/src/app/core/auth.ts rename to Open-ILS/src/eg2/src/app/core/auth.service.ts index ab4b133285..a14fd9f90d 100644 --- a/Open-ILS/src/eg2/src/app/core/auth.ts +++ b/Open-ILS/src/eg2/src/app/core/auth.service.ts @@ -1,8 +1,8 @@ import {Injectable, EventEmitter} from '@angular/core'; -import {EgNetService} from './net'; -import {EgEventService, EgEvent} from './event'; -import {EgIdlService, EgIdlObject} from './idl'; -import {EgStoreService} from './store'; +import {EgNetService} from './net.service'; +import {EgEventService, EgEvent} from './event.service'; +import {EgIdlService, EgIdlObject} from './idl.service'; +import {EgStoreService} from './store.service'; // Not universally available. declare var BroadcastChannel; diff --git a/Open-ILS/src/eg2/src/app/core/event.ts b/Open-ILS/src/eg2/src/app/core/event.service.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/core/event.ts rename to Open-ILS/src/eg2/src/app/core/event.service.ts diff --git a/Open-ILS/src/eg2/src/app/core/idl.ts b/Open-ILS/src/eg2/src/app/core/idl.service.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/core/idl.ts rename to Open-ILS/src/eg2/src/app/core/idl.service.ts diff --git a/Open-ILS/src/eg2/src/app/core/net.ts b/Open-ILS/src/eg2/src/app/core/net.service.ts similarity index 99% rename from Open-ILS/src/eg2/src/app/core/net.ts rename to Open-ILS/src/eg2/src/app/core/net.service.ts index f6ec6b258b..bcedfc7033 100644 --- a/Open-ILS/src/eg2/src/app/core/net.ts +++ b/Open-ILS/src/eg2/src/app/core/net.service.ts @@ -22,7 +22,7 @@ */ import {Injectable, EventEmitter} from '@angular/core'; import {Observable, Observer} from 'rxjs/Rx'; -import {EgEventService, EgEvent} from './event'; +import {EgEventService, EgEvent} from './event.service'; // Global vars from opensrf.js // These are availavble at runtime, but are not exported. diff --git a/Open-ILS/src/eg2/src/app/core/org.ts b/Open-ILS/src/eg2/src/app/core/org.service.ts similarity index 97% rename from Open-ILS/src/eg2/src/app/core/org.ts rename to Open-ILS/src/eg2/src/app/core/org.service.ts index 0cf87a4ab1..b2ad2505da 100644 --- a/Open-ILS/src/eg2/src/app/core/org.ts +++ b/Open-ILS/src/eg2/src/app/core/org.service.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs/Rx'; -import {EgIdlObject, EgIdlService} from './idl'; -import {EgNetService} from './net'; -import {EgAuthService} from './auth'; -import {EgPcrudService} from './pcrud'; +import {EgIdlObject, EgIdlService} from './idl.service'; +import {EgNetService} from './net.service'; +import {EgAuthService} from './auth.service'; +import {EgPcrudService} from './pcrud.service'; type EgOrgNodeOrId = number | EgIdlObject; diff --git a/Open-ILS/src/eg2/src/app/core/pcrud.ts b/Open-ILS/src/eg2/src/app/core/pcrud.service.ts similarity index 98% rename from Open-ILS/src/eg2/src/app/core/pcrud.ts rename to Open-ILS/src/eg2/src/app/core/pcrud.service.ts index 6a8dc7dcf9..614f0ca9ef 100644 --- a/Open-ILS/src/eg2/src/app/core/pcrud.ts +++ b/Open-ILS/src/eg2/src/app/core/pcrud.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; import {Observable, Observer} from 'rxjs/Rx'; -import {EgIdlService, EgIdlObject} from './idl'; -import {EgNetService, EgNetRequest} from './net'; -import {EgAuthService} from './auth'; +import {EgIdlService, EgIdlObject} from './idl.service'; +import {EgNetService, EgNetRequest} from './net.service'; +import {EgAuthService} from './auth.service'; // Externally defined. Used here for debugging. declare var js2JSON: (jsThing:any) => string; diff --git a/Open-ILS/src/eg2/src/app/core/perm.ts b/Open-ILS/src/eg2/src/app/core/perm.service.ts similarity index 92% rename from Open-ILS/src/eg2/src/app/core/perm.ts rename to Open-ILS/src/eg2/src/app/core/perm.service.ts index 6f7cd9faae..a2c439bbec 100644 --- a/Open-ILS/src/eg2/src/app/core/perm.ts +++ b/Open-ILS/src/eg2/src/app/core/perm.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; -import {EgNetService} from './net'; -import {EgOrgService} from './org'; -import {EgAuthService} from './auth'; +import {EgNetService} from './net.service'; +import {EgOrgService} from './org.service'; +import {EgAuthService} from './auth.service'; interface HasPermAtResult { [permName: string]: number[]; diff --git a/Open-ILS/src/eg2/src/app/core/store.ts b/Open-ILS/src/eg2/src/app/core/store.service.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/core/store.ts rename to Open-ILS/src/eg2/src/app/core/store.service.ts diff --git a/Open-ILS/src/eg2/src/app/migration.module.ts b/Open-ILS/src/eg2/src/app/migration.module.ts index 92cec105e6..88c84ae7d5 100644 --- a/Open-ILS/src/eg2/src/app/migration.module.ts +++ b/Open-ILS/src/eg2/src/app/migration.module.ts @@ -21,14 +21,14 @@ import {Title} from '@angular/platform-browser'; // Import service handles so we can downgrade them. import {EgCommonModule} from './common.module'; -import {EgEventService} from '@eg/core/event'; -import {EgStoreService} from '@eg/core/store'; -import {EgIdlService} from '@eg/core/idl'; -import {EgNetService} from '@eg/core/net'; -import {EgAuthService} from '@eg/core/auth'; -import {EgPermService} from '@eg/core/perm'; -import {EgPcrudService} from '@eg/core/pcrud'; -import {EgOrgService} from '@eg/core/org'; +import {EgEventService} from '@eg/core/event.service'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgIdlService} from '@eg/core/idl.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgAuthService} from '@eg/core/auth.service'; +import {EgPermService} from '@eg/core/perm.service'; +import {EgPcrudService} from '@eg/core/pcrud.service'; +import {EgOrgService} from '@eg/core/org.service'; // Downgraded components //import {EgDialogComponent} from '@eg/share/dialog/dialog.component'; diff --git a/Open-ILS/src/eg2/src/app/resolver.service.ts b/Open-ILS/src/eg2/src/app/resolver.service.ts index 8fd14d778d..0049c40452 100644 --- a/Open-ILS/src/eg2/src/app/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/resolver.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; import {Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot} from '@angular/router'; -import {EgIdlService} from '@eg/core/idl'; -import {EgOrgService} from '@eg/core/org'; +import {EgIdlService} from '@eg/core/idl.service'; +import {EgOrgService} from '@eg/core/org.service'; @Injectable() export class EgBaseResolver implements Resolve> { diff --git a/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts index 932416f2cf..707d44f91e 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; import {ParamMap} from '@angular/router'; -import {EgOrgService} from '@eg/core/org'; +import {EgOrgService} from '@eg/core/org.service'; import {CatalogSearchContext, FacetFilter} from './search-context'; import {CATALOG_CCVM_FILTERS} from './catalog.service'; diff --git a/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts index 34336957de..f59c6c12e1 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; -import {EgOrgService} from '@eg/core/org'; -import {EgUnapiService} from '@eg/share/unapi'; -import {EgIdlObject} from '@eg/core/idl'; -import {EgNetService} from '@eg/core/net'; -import {EgPcrudService} from '@eg/core/pcrud'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgUnapiService} from '@eg/share/unapi.service'; +import {EgIdlObject} from '@eg/core/idl.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgPcrudService} from '@eg/core/pcrud.service'; import {CatalogSearchContext, CatalogSearchState} from './search-context'; export const CATALOG_CCVM_FILTERS = [ diff --git a/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts b/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts index 6bd538039b..54224ff8c1 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts @@ -1,5 +1,5 @@ -import {EgOrgService} from '@eg/core/org'; -import {EgIdlObject} from '@eg/core/idl'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgIdlObject} from '@eg/core/idl.service'; import {Pager} from '@eg/share/util/pager'; import {Params} from '@angular/router'; diff --git a/Open-ILS/src/eg2/src/app/share/org-select.component.ts b/Open-ILS/src/eg2/src/app/share/org-select.component.ts index 7738215b4b..f502c9e7fd 100644 --- a/Open-ILS/src/eg2/src/app/share/org-select.component.ts +++ b/Open-ILS/src/eg2/src/app/share/org-select.component.ts @@ -1,10 +1,10 @@ import {Component, OnInit, Input, Output, EventEmitter} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import {map, debounceTime} from 'rxjs/operators'; -import {EgAuthService} from '@eg/core/auth'; -import {EgStoreService} from '@eg/core/store'; -import {EgOrgService} from '@eg/core/org'; -import {EgIdlObject} from '@eg/core/idl'; +import {EgAuthService} from '@eg/core/auth.service'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgIdlObject} from '@eg/core/idl.service'; import {NgbTypeaheadSelectItemEvent} from '@ng-bootstrap/ng-bootstrap'; // Use a unicode char for spacing instead of ASCII=32 so the browser diff --git a/Open-ILS/src/eg2/src/app/share/unapi.ts b/Open-ILS/src/eg2/src/app/share/unapi.service.ts similarity index 97% rename from Open-ILS/src/eg2/src/app/share/unapi.ts rename to Open-ILS/src/eg2/src/app/share/unapi.service.ts index 28c25896c0..9034ae43f0 100644 --- a/Open-ILS/src/eg2/src/app/share/unapi.ts +++ b/Open-ILS/src/eg2/src/app/share/unapi.service.ts @@ -1,5 +1,5 @@ import {Injectable, EventEmitter} from '@angular/core'; -import {EgOrgService} from '@eg/core/org'; +import {EgOrgService} from '@eg/core/org.service'; /* TODO: Add Display Fields to UNAPI diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts index 690a485e62..6ee04d2ad4 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts @@ -1,12 +1,12 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {Router, ActivatedRoute} from '@angular/router'; -import {EgStoreService} from '@eg/core/store'; -import {EgIdlObject} from '@eg/core/idl'; -import {EgNetService} from '@eg/core/net'; -import {EgPermService} from '@eg/core/perm'; -import {EgAuthService} from '@eg/core/auth'; -import {EgOrgService} from '@eg/core/org'; -import {EgEventService} from '@eg/core/event'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgIdlObject} from '@eg/core/idl.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgPermService} from '@eg/core/perm.service'; +import {EgAuthService} from '@eg/core/auth.service'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgEventService} from '@eg/core/event.service'; import {EgConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; // Slim version of the WS that's stored in the cache. diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts index 80a1499746..7438ec9bae 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {EgStaffCommonModule} from '@eg/staff/common.module'; -import {EgUnapiService} from '@eg/share/unapi'; +import {EgUnapiService} from '@eg/share/unapi.service'; import {EgCatalogRoutingModule} from './routing.module'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts index 0cf04ca7f2..6cfc715816 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {Router, ActivatedRoute} from '@angular/router'; -import {EgIdlObject} from '@eg/core/idl'; -import {EgOrgService} from '@eg/core/org'; +import {EgIdlObject} from '@eg/core/idl.service'; +import {EgOrgService} from '@eg/core/org.service'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; import {CatalogSearchContext} from '@eg/share/catalog/search-context'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts index cae7920175..d4b69571c3 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit, Input} from '@angular/core'; -import {EgNetService} from '@eg/core/net'; +import {EgNetService} from '@eg/core/net.service'; import {StaffCatalogService} from '../catalog.service'; import {Pager} from '@eg/share/util/pager'; -import {EgOrgService} from '@eg/core/org'; +import {EgOrgService} from '@eg/core/org.service'; @Component({ selector: 'eg-catalog-copies', diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts index 61e5759cd8..7df0e4a18b 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit, Input} from '@angular/core'; import {ActivatedRoute, ParamMap} from '@angular/router'; -import {EgPcrudService} from '@eg/core/pcrud'; -import {EgIdlObject} from '@eg/core/idl'; +import {EgPcrudService} from '@eg/core/pcrud.service'; +import {EgIdlObject} from '@eg/core/idl.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts index 8452323a94..f081fc2077 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts @@ -2,11 +2,11 @@ import {Injectable} from '@angular/core'; import {Observable, Observer} from 'rxjs/Rx'; import {Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot} from '@angular/router'; -import {EgStoreService} from '@eg/core/store'; -import {EgNetService} from '@eg/core/net'; -import {EgOrgService} from '@eg/core/org'; -import {EgAuthService} from '@eg/core/auth'; -import {EgPcrudService} from '@eg/core/pcrud'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgAuthService} from '@eg/core/auth.service'; +import {EgPcrudService} from '@eg/core/pcrud.service'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {StaffCatalogService} from './catalog.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts index cf903f56c2..14f33e2d79 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts @@ -1,9 +1,9 @@ import {Component, OnInit, Input} from '@angular/core'; import {Router} from '@angular/router'; -import {EgOrgService} from '@eg/core/org'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgNetService} from '@eg/core/net.service'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext} from '@eg/share/catalog/search-context'; -import {EgNetService} from '@eg/core/net'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; import {StaffCatalogService} from '../catalog.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts index ff9c259a25..a970154831 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts @@ -6,9 +6,9 @@ import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; -import {EgPcrudService} from '@eg/core/pcrud'; +import {EgPcrudService} from '@eg/core/pcrud.service'; import {StaffCatalogService} from '../catalog.service'; -import {EgIdlObject} from '@eg/core/idl'; +import {EgIdlObject} from '@eg/core/idl.service'; @Component({ selector: 'eg-catalog-results', diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts index 615e608f34..cf6d66dc6a 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, AfterViewInit, Renderer} from '@angular/core'; -import {EgIdlObject} from '@eg/core/idl'; -import {EgOrgService} from '@eg/core/org'; +import {EgIdlObject} from '@eg/core/idl.service'; +import {EgOrgService} from '@eg/core/org.service'; import {EgCatalogService,} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts index 35e9e85a78..86e85f3e7d 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit, Renderer} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; -import {EgNetService} from '@eg/core/net'; -import {EgAuthService} from '@eg/core/auth'; +import {EgNetService} from '@eg/core/net.service'; +import {EgAuthService} from '@eg/core/auth.service'; @Component({ templateUrl: 'bcsearch.component.html' diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts index 85d0490f25..d46bb749a1 100644 --- a/Open-ILS/src/eg2/src/app/staff/login.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit, Renderer} from '@angular/core'; import {Location} from '@angular/common'; import {Router, ActivatedRoute} from '@angular/router'; -import {EgAuthService, EgAuthWsState} from '@eg/core/auth'; -import {EgStoreService} from '@eg/core/store'; +import {EgAuthService, EgAuthWsState} from '@eg/core/auth.service'; +import {EgStoreService} from '@eg/core/store.service'; @Component({ templateUrl : './login.component.html' diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts index 7b87841e05..32577ad7dd 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {EgAuthService} from '@eg/core/auth'; +import {EgAuthService} from '@eg/core/auth.service'; @Component({ selector: 'eg-staff-nav-bar', 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 63a86f9b11..530aeb1b94 100644 --- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts @@ -3,9 +3,9 @@ import {Location} from '@angular/common'; import {Observable, Observer} from 'rxjs/Rx'; import {Router, Resolve, RouterStateSnapshot, ActivatedRoute, ActivatedRouteSnapshot} from '@angular/router'; -import {EgStoreService} from '@eg/core/store'; -import {EgNetService} from '@eg/core/net'; -import {EgAuthService} from '@eg/core/auth'; +import {EgStoreService} from '@eg/core/store.service'; +import {EgNetService} from '@eg/core/net.service'; +import {EgAuthService} from '@eg/core/auth.service'; /** * Load data used by all staff modules. diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-summary.component.ts b/Open-ILS/src/eg2/src/app/staff/share/bib-summary.component.ts index 877b18a4f5..c672adda2c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/bib-summary.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-summary.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, Input} from '@angular/core'; -import {EgNetService} from '@eg/core/net'; -import {EgPcrudService} from '@eg/core/pcrud'; +import {EgNetService} from '@eg/core/net.service'; +import {EgPcrudService} from '@eg/core/pcrud.service'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; @Component({ 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 864beab8eb..7bdce0b274 100644 --- a/Open-ILS/src/eg2/src/app/staff/staff.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/staff.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit, NgZone} from '@angular/core'; import {Router, ActivatedRoute, NavigationEnd} from '@angular/router'; -import {EgAuthService, EgAuthWsState} from '@eg/core/auth'; -import {EgNetService} from '@eg/core/net'; +import {EgAuthService, EgAuthWsState} from '@eg/core/auth.service'; +import {EgNetService} from '@eg/core/net.service'; @Component({ templateUrl: 'staff.component.html', -- 2.11.0