From 614d43583bfa1f7917ed589f4247c0384fd1fa35 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 14 Aug 2019 15:15:29 -0400 Subject: [PATCH] LP1840050 Modularize more components Signed-off-by: Bill Erickson --- Open-ILS/examples/fm_IDL.xml | 24 ++++++++-------- .../src/app/share/fm-editor/fm-editor.component.ts | 2 +- .../src/app/share/fm-editor/fm-editor.module.ts | 27 ++++++++++++++++++ .../org-family-select/org-family-select.module.ts | 26 +++++++++++++++++ .../src/eg2/src/app/share/string/string.module.ts | 25 ++++++++++++++++ .../share/translate/translate.component.html | 0 .../share/translate/translate.component.ts | 0 .../src/app/share/translate/translate.module.ts | 23 +++++++++++++++ .../src/eg2/src/app/staff/admin/common.module.ts | 11 +++++++- .../src/app/staff/cat/vandelay/vandelay.module.ts | 4 +++ .../eg2/src/app/staff/catalog/catalog.module.ts | 2 ++ Open-ILS/src/eg2/src/app/staff/common.module.ts | 20 ++----------- .../eg2/src/app/staff/sandbox/sandbox.module.ts | 6 ++++ .../staff/share/admin-page/admin-page.component.ts | 2 +- .../staff/share/admin-page/admin-page.module.ts | 33 ++++++++++++++++++++++ 15 files changed, 173 insertions(+), 32 deletions(-) create mode 100644 Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts create mode 100644 Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.module.ts create mode 100644 Open-ILS/src/eg2/src/app/share/string/string.module.ts rename Open-ILS/src/eg2/src/app/{staff => }/share/translate/translate.component.html (100%) rename Open-ILS/src/eg2/src/app/{staff => }/share/translate/translate.component.ts (100%) create mode 100644 Open-ILS/src/eg2/src/app/share/translate/translate.module.ts create mode 100644 Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.module.ts diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index cb2b8bf157..3ffaffd569 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -6205,18 +6205,18 @@ SELECT usr, - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 33da1f49ff..674d348737 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -10,7 +10,7 @@ import {ToastService} from '@eg/share/toast/toast.service'; import {StringComponent} from '@eg/share/string/string.component'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; -import {TranslateComponent} from '@eg/staff/share/translate/translate.component'; +import {TranslateComponent} from '@eg/share/translate/translate.component'; interface CustomFieldTemplate { diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts new file mode 100644 index 0000000000..7be4cf8525 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts @@ -0,0 +1,27 @@ +import {NgModule} from '@angular/core'; +import {EgCommonModule} from '@eg/common.module'; +import {CommonWidgetsModule} from '@eg/share/common-widgets.module'; +import {StringModule} from '@eg/share/string/string.module'; +import {TranslateModule} from '@eg/share/translate/translate.module'; +import {FmRecordEditorComponent} from './fm-editor.component'; + + +@NgModule({ + declarations: [ + FmRecordEditorComponent + ], + imports: [ + EgCommonModule, + StringModule, + TranslateModule, + CommonWidgetsModule + ], + exports: [ + FmRecordEditorComponent + ], + providers: [ + ] +}) + +export class FmRecordEditorModule { } + diff --git a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.module.ts b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.module.ts new file mode 100644 index 0000000000..ea5fc2f4c7 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.module.ts @@ -0,0 +1,26 @@ +import {NgModule} from '@angular/core'; +import {EgCommonModule} from '@eg/common.module'; +import {EgCoreModule} from '@eg/core/core.module'; +import {CommonWidgetsModule} from '@eg/share/common-widgets.module'; +import {OrgFamilySelectComponent} from './org-family-select.component'; +import {ReactiveFormsModule} from '@angular/forms'; + +@NgModule({ + declarations: [ + OrgFamilySelectComponent + ], + imports: [ + EgCommonModule, + EgCoreModule, + CommonWidgetsModule, + ReactiveFormsModule + ], + exports: [ + OrgFamilySelectComponent + ], + providers: [ + ] +}) + +export class OrgFamilySelectModule { } + diff --git a/Open-ILS/src/eg2/src/app/share/string/string.module.ts b/Open-ILS/src/eg2/src/app/share/string/string.module.ts new file mode 100644 index 0000000000..185ede1eff --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/string/string.module.ts @@ -0,0 +1,25 @@ +import {NgModule} from '@angular/core'; +import {EgCommonModule} from '@eg/common.module'; +import {EgCoreModule} from '@eg/core/core.module'; +import {StringComponent} from '@eg/share/string/string.component'; +import {StringService} from '@eg/share/string/string.service'; + + +@NgModule({ + declarations: [ + StringComponent + ], + imports: [ + EgCommonModule, + EgCoreModule + ], + exports: [ + StringComponent + ], + providers: [ + StringService + ] +}) + +export class StringModule { } + diff --git a/Open-ILS/src/eg2/src/app/staff/share/translate/translate.component.html b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/share/translate/translate.component.html rename to Open-ILS/src/eg2/src/app/share/translate/translate.component.html diff --git a/Open-ILS/src/eg2/src/app/staff/share/translate/translate.component.ts b/Open-ILS/src/eg2/src/app/share/translate/translate.component.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/share/translate/translate.component.ts rename to Open-ILS/src/eg2/src/app/share/translate/translate.component.ts diff --git a/Open-ILS/src/eg2/src/app/share/translate/translate.module.ts b/Open-ILS/src/eg2/src/app/share/translate/translate.module.ts new file mode 100644 index 0000000000..41dbd5db7b --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/translate/translate.module.ts @@ -0,0 +1,23 @@ +import {NgModule} from '@angular/core'; +import {EgCommonModule} from '@eg/common.module'; +import {EgCoreModule} from '@eg/core/core.module'; +import {TranslateComponent} from './translate.component'; + + +@NgModule({ + declarations: [ + TranslateComponent + ], + imports: [ + EgCommonModule, + EgCoreModule + ], + exports: [ + TranslateComponent + ], + providers: [ + ] +}) + +export class TranslateModule { } + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts index 5bd71d3efb..4bb5b30278 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts @@ -1,6 +1,9 @@ import {NgModule} from '@angular/core'; import {StaffCommonModule} from '@eg/staff/common.module'; import {LinkTableComponent, LinkTableLinkComponent} from '@eg/staff/share/link-table/link-table.component'; +import {TranslateModule} from '@eg/share/translate/translate.module'; +import {FmRecordEditorModule} from '@eg/share/fm-editor/fm-editor.module'; +import {AdminPageModule} from '@eg/staff/share/admin-page/admin-page.module'; import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component'; @NgModule({ @@ -10,10 +13,16 @@ import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.componen BasicAdminPageComponent ], imports: [ - StaffCommonModule + StaffCommonModule, + TranslateModule, + FmRecordEditorModule, + AdminPageModule ], exports: [ StaffCommonModule, + TranslateModule, + FmRecordEditorModule, + AdminPageModule, LinkTableComponent, LinkTableLinkComponent, BasicAdminPageComponent diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts index 9bbfd46a26..0f394285e3 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts @@ -1,8 +1,10 @@ import {NgModule} from '@angular/core'; +import {FmRecordEditorModule} from '@eg/share/fm-editor/fm-editor.module'; import {StaffCommonModule} from '@eg/staff/common.module'; import {CatalogCommonModule} from '@eg/share/catalog/catalog-common.module'; import {HttpClientModule} from '@angular/common/http'; import {TreeModule} from '@eg/share/tree/tree.module'; +import {AdminPageModule} from '@eg/staff/share/admin-page/admin-page.module'; import {VandelayRoutingModule} from './routing.module'; import {VandelayService} from './vandelay.service'; import {VandelayComponent} from './vandelay.component'; @@ -48,6 +50,8 @@ import {RecentImportsComponent} from './recent-imports.component'; imports: [ TreeModule, StaffCommonModule, + FmRecordEditorModule, + AdminPageModule, CatalogCommonModule, VandelayRoutingModule, HttpClientModule, 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 e0fbff851d..4fc82a2ce0 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,4 +1,5 @@ import {NgModule} from '@angular/core'; +import {FmRecordEditorModule} from '@eg/share/fm-editor/fm-editor.module'; import {StaffCommonModule} from '@eg/staff/common.module'; import {CatalogCommonModule} from '@eg/share/catalog/catalog-common.module'; import {CatalogRoutingModule} from './routing.module'; @@ -54,6 +55,7 @@ import {SearchTemplatesComponent} from './search-templates.component'; ], imports: [ StaffCommonModule, + FmRecordEditorModule, CatalogCommonModule, CatalogRoutingModule, HoldsModule, 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 66c62c32eb..a22df8056d 100644 --- a/Open-ILS/src/eg2/src/app/staff/common.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts @@ -4,21 +4,16 @@ import {CommonWidgetsModule} from '@eg/share/common-widgets.module'; import {AudioService} from '@eg/share/util/audio.service'; import {GridModule} from '@eg/share/grid/grid.module'; import {StaffBannerComponent} from './share/staff-banner.component'; -import {OrgFamilySelectComponent} from '@eg/share/org-family-select/org-family-select.component'; import {AccessKeyDirective} from '@eg/share/accesskey/accesskey.directive'; import {AccessKeyService} from '@eg/share/accesskey/accesskey.service'; import {AccessKeyInfoComponent} from '@eg/share/accesskey/accesskey-info.component'; import {OpChangeComponent} from '@eg/staff/share/op-change/op-change.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {ToastComponent} from '@eg/share/toast/toast.component'; -import {StringComponent} from '@eg/share/string/string.component'; -import {StringService} from '@eg/share/string/string.service'; +import {StringModule} from '@eg/share/string/string.module'; import {TitleComponent} from '@eg/share/title/title.component'; -import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; import {BucketDialogComponent} from '@eg/staff/share/buckets/bucket-dialog.component'; import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.component'; -import {TranslateComponent} from '@eg/staff/share/translate/translate.component'; -import {AdminPageComponent} from '@eg/staff/share/admin-page/admin-page.component'; import {EgHelpPopoverComponent} from '@eg/share/eg-help-popover/eg-help-popover.component'; import {ReactiveFormsModule} from '@angular/forms'; @@ -29,22 +24,18 @@ import {ReactiveFormsModule} from '@angular/forms'; @NgModule({ declarations: [ StaffBannerComponent, - OrgFamilySelectComponent, AccessKeyDirective, AccessKeyInfoComponent, ToastComponent, - StringComponent, TitleComponent, OpChangeComponent, - FmRecordEditorComponent, BucketDialogComponent, BibSummaryComponent, - TranslateComponent, - AdminPageComponent, EgHelpPopoverComponent ], imports: [ EgCommonModule, + StringModule, ReactiveFormsModule, CommonWidgetsModule, GridModule @@ -54,18 +45,14 @@ import {ReactiveFormsModule} from '@angular/forms'; CommonWidgetsModule, GridModule, StaffBannerComponent, - OrgFamilySelectComponent, AccessKeyDirective, AccessKeyInfoComponent, ToastComponent, - StringComponent, + StringModule, TitleComponent, OpChangeComponent, - FmRecordEditorComponent, BucketDialogComponent, BibSummaryComponent, - TranslateComponent, - AdminPageComponent, EgHelpPopoverComponent ] }) @@ -77,7 +64,6 @@ export class StaffCommonModule { providers: [ // Export staff-wide services AccessKeyService, AudioService, - StringService, ToastService ] }; diff --git a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts index 0937ab0ee3..a8db49ad5f 100644 --- a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts @@ -1,8 +1,11 @@ import {NgModule} from '@angular/core'; +import {FmRecordEditorModule} from '@eg/share/fm-editor/fm-editor.module'; import {StaffCommonModule} from '@eg/staff/common.module'; +import {TranslateModule} from '@eg/share/translate/translate.module'; import {SandboxRoutingModule} from './routing.module'; import {SandboxComponent} from './sandbox.component'; import {ReactiveFormsModule} from '@angular/forms'; +import {OrgFamilySelectModule} from '@eg/share/org-family-select/org-family-select.module'; @NgModule({ declarations: [ @@ -10,6 +13,9 @@ import {ReactiveFormsModule} from '@angular/forms'; ], imports: [ StaffCommonModule, + TranslateModule, + FmRecordEditorModule, + OrgFamilySelectModule, SandboxRoutingModule, ReactiveFormsModule ], diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts index c7798c4f5a..23d65200f7 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts @@ -3,7 +3,7 @@ import {ActivatedRoute} from '@angular/router'; import {IdlService, IdlObject} from '@eg/core/idl.service'; import {GridDataSource} from '@eg/share/grid/grid'; import {GridComponent} from '@eg/share/grid/grid.component'; -import {TranslateComponent} from '@eg/staff/share/translate/translate.component'; +import {TranslateComponent} from '@eg/share/translate/translate.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {Pager} from '@eg/share/util/pager'; import {PcrudService} from '@eg/core/pcrud.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.module.ts b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.module.ts new file mode 100644 index 0000000000..ae94c9f452 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.module.ts @@ -0,0 +1,33 @@ +import {NgModule} from '@angular/core'; +import {EgCommonModule} from '@eg/common.module'; +import {EgCoreModule} from '@eg/core/core.module'; +import {GridModule} from '@eg/share/grid/grid.module'; +import {StringModule} from '@eg/share/string/string.module'; +import {TranslateModule} from '@eg/share/translate/translate.module'; +import {FmRecordEditorModule} from '@eg/share/fm-editor/fm-editor.module'; +import {AdminPageComponent} from './admin-page.component'; +import {OrgFamilySelectModule} from '@eg/share/org-family-select/org-family-select.module'; + + +@NgModule({ + declarations: [ + AdminPageComponent + ], + imports: [ + EgCommonModule, + EgCoreModule, + StringModule, + OrgFamilySelectModule, + TranslateModule, + FmRecordEditorModule, + GridModule + ], + exports: [ + AdminPageComponent + ], + providers: [ + ] +}) + +export class AdminPageModule { } + -- 2.11.0