From 4174e903b12f7d71b269f2e659e82abc221e6c83 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 8 Jul 2019 12:02:31 -0400 Subject: [PATCH] LP1830973 Ang8 migration Signed-off-by: Bill Erickson --- .../src/app/share/combobox/combobox.component.ts | 2 +- .../eg2/src/app/share/dialog/dialog.component.ts | 2 +- .../src/app/share/fm-editor/fm-editor.component.ts | 2 +- .../eg2/src/app/share/grid/grid-print.component.ts | 4 ++-- .../app/share/org-select/org-select.component.ts | 2 +- .../src/eg2/src/app/share/title/title.component.ts | 2 +- .../eg2/src/app/share/util/bool.component.spec.ts | 2 +- .../staff/admin/server/org-unit-type.component.ts | 10 ++++----- .../workstations/workstations.component.ts | 2 +- .../src/app/staff/cat/vandelay/export.component.ts | 4 ++-- .../src/app/staff/cat/vandelay/import.component.ts | 24 ++++++++++---------- .../cat/vandelay/match-set-expression.component.ts | 2 +- .../staff/cat/vandelay/match-set-list.component.ts | 4 ++-- .../cat/vandelay/match-set-quality.component.ts | 4 ++-- .../staff/cat/vandelay/queue-items.component.ts | 2 +- .../app/staff/cat/vandelay/queue-list.component.ts | 4 ++-- .../src/app/staff/cat/vandelay/queue.component.ts | 6 ++--- .../vandelay/queued-record-matches.component.ts | 4 ++-- .../staff/cat/vandelay/record-items.component.ts | 2 +- .../app/staff/catalog/basket-actions.component.ts | 2 +- .../eg2/src/app/staff/catalog/browse.component.ts | 2 +- .../src/app/staff/catalog/cnbrowse.component.ts | 2 +- .../staff/catalog/record/conjoined.component.ts | 6 ++--- .../app/staff/catalog/record/copies.component.ts | 2 +- .../app/staff/catalog/record/holdings.component.ts | 26 +++++++++++----------- .../app/staff/catalog/record/parts.component.ts | 6 ++--- .../app/staff/catalog/record/record.component.ts | 2 +- .../eg2/src/app/staff/sandbox/sandbox.component.ts | 8 +++---- .../staff/share/admin-page/admin-page.component.ts | 14 ++++++------ .../booking/make-bookable-dialog.component.ts | 4 ++-- .../holdings/conjoined-items-dialog.component.ts | 4 ++-- .../share/holdings/copy-alerts-dialog.component.ts | 4 ++-- .../holdings/delete-volcopy-dialog.component.ts | 4 ++-- .../holdings/mark-damaged-dialog.component.ts | 4 ++-- .../holdings/mark-missing-dialog.component.ts | 4 ++-- .../holdings/replace-barcode-dialog.component.ts | 4 ++-- .../staff/share/holds/cancel-dialog.component.ts | 4 ++-- .../src/app/staff/share/holds/grid.component.ts | 16 ++++++------- .../staff/share/holds/retarget-dialog.component.ts | 4 ++-- .../staff/share/holds/transfer-dialog.component.ts | 6 ++--- 40 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 63f964ef81..1adaae826b 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -30,7 +30,7 @@ export class ComboboxComponent implements OnInit { click$: Subject; entrylist: ComboboxEntry[]; - @ViewChild('instance') instance: NgbTypeahead; + @ViewChild('instance', { static: true }) instance: NgbTypeahead; // Applies a name attribute to the input. // Useful in forms. diff --git a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts index 79a5c8605d..1532a1fc78 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts @@ -37,7 +37,7 @@ export class DialogComponent implements OnInit { @Input() public dialogTitle: string; // Pointer to the dialog content template. - @ViewChild('dialogContent') + @ViewChild('dialogContent', {static: false}) private dialogContent: TemplateRef; // Emitted after open() is called on the ngbModal. 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 f25839b1f1..86fec5e5c6 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 @@ -131,7 +131,7 @@ export class FmRecordEditorComponent // Emit an error message when the save action fails. @Output() onError$ = new EventEmitter(); - @ViewChild('translator') private translator: TranslateComponent; + @ViewChild('translator', { static: true }) private translator: TranslateComponent; // IDL info for the the selected IDL class idlDef: any; diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-print.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-print.component.ts index f73e26b460..f7c857a4ab 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-print.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-print.component.ts @@ -13,8 +13,8 @@ import {GridContext} from '@eg/share/grid/grid'; export class GridPrintComponent { @Input() gridContext: GridContext; - @ViewChild('printTemplate') private printTemplate: TemplateRef; - @ViewChild('progressDialog') + @ViewChild('printTemplate', { static: true }) private printTemplate: TemplateRef; + @ViewChild('progressDialog', { static: true }) private progressDialog: ProgressDialogComponent; constructor(private printer: PrintService) {} diff --git a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts index f455c36bf3..233aa54df1 100644 --- a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts +++ b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts @@ -33,7 +33,7 @@ export class OrgSelectComponent implements OnInit { // Disable the entire input @Input() disabled: boolean; - @ViewChild('instance') instance: NgbTypeahead; + @ViewChild('instance', { static: false }) instance: NgbTypeahead; // Placeholder text for selector input @Input() placeholder = ''; diff --git a/Open-ILS/src/eg2/src/app/share/title/title.component.ts b/Open-ILS/src/eg2/src/app/share/title/title.component.ts index 8dc18718e9..d1ff7eb6ae 100644 --- a/Open-ILS/src/eg2/src/app/share/title/title.component.ts +++ b/Open-ILS/src/eg2/src/app/share/title/title.component.ts @@ -32,7 +32,7 @@ export class TitleComponent implements AfterViewInit { this.setTitle(); } - @ViewChild('titleString') titleString: StringComponent; + @ViewChild('titleString', { static: true }) titleString: StringComponent; constructor(private title: Title) {} diff --git a/Open-ILS/src/eg2/src/app/share/util/bool.component.spec.ts b/Open-ILS/src/eg2/src/app/share/util/bool.component.spec.ts index 3279a98ae3..8bdddace7e 100644 --- a/Open-ILS/src/eg2/src/app/share/util/bool.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/share/util/bool.component.spec.ts @@ -9,7 +9,7 @@ describe('BoolDisplayComponent', () => { template: `` }) class TestHostComponent { - @ViewChild(BoolDisplayComponent, /* TODO: add static flag */ {}) + @ViewChild(BoolDisplayComponent, {static: false}) public boolDisplayComponent: BoolDisplayComponent; } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.ts index 20938c459d..f73557d8e7 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.ts @@ -17,11 +17,11 @@ export class OrgUnitTypeComponent implements OnInit { tree: Tree; selected: TreeNode; - @ViewChild('editDialog') editDialog: FmRecordEditorComponent; - @ViewChild('editString') editString: StringComponent; - @ViewChild('createString') createString: StringComponent; - @ViewChild('errorString') errorString: StringComponent; - @ViewChild('delConfirm') delConfirm: ConfirmDialogComponent; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; + @ViewChild('editString', { static: true }) editString: StringComponent; + @ViewChild('createString', { static: true }) createString: StringComponent; + @ViewChild('errorString', { static: true }) errorString: StringComponent; + @ViewChild('delConfirm', { static: true }) delConfirm: ConfirmDialogComponent; constructor( private idl: IdlService, 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 5ce77d42c1..457fb94299 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 @@ -28,7 +28,7 @@ export class WorkstationsComponent implements OnInit { newName: string; defaultName: string; - @ViewChild('workstationExistsDialog') + @ViewChild('workstationExistsDialog', { static: true }) private wsExistsDialog: ConfirmDialogComponent; // Org selector options. diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.ts index 648f4d58b6..cb302780ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.ts @@ -29,8 +29,8 @@ export class ExportComponent implements AfterViewInit, OnInit { exportingBasket: boolean; basketRecords: number[]; - @ViewChild('fileSelector') private fileSelector; - @ViewChild('exportProgress') + @ViewChild('fileSelector', { static: false }) private fileSelector; + @ViewChild('exportProgress', { static: true }) private exportProgress: ProgressInlineComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index 15b5640fff..98ea54ab4c 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -104,31 +104,31 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { formTemplates: {[name: string]: any}; newTemplateName: string; - @ViewChild('fileSelector') private fileSelector; - @ViewChild('uploadProgress') + @ViewChild('fileSelector', { static: false }) private fileSelector; + @ViewChild('uploadProgress', { static: true }) private uploadProgress: ProgressInlineComponent; - @ViewChild('enqueueProgress') + @ViewChild('enqueueProgress', { static: true }) private enqueueProgress: ProgressInlineComponent; - @ViewChild('importProgress') + @ViewChild('importProgress', { static: true }) private importProgress: ProgressInlineComponent; // Need these refs so values can be applied via external stimuli - @ViewChild('formTemplateSelector') + @ViewChild('formTemplateSelector', { static: true }) private formTemplateSelector: ComboboxComponent; - @ViewChild('recordTypeSelector') + @ViewChild('recordTypeSelector', { static: true }) private recordTypeSelector: ComboboxComponent; - @ViewChild('bibSourceSelector') + @ViewChild('bibSourceSelector', { static: true }) private bibSourceSelector: ComboboxComponent; - @ViewChild('matchSetSelector') + @ViewChild('matchSetSelector', { static: true }) private matchSetSelector: ComboboxComponent; - @ViewChild('holdingsProfileSelector') + @ViewChild('holdingsProfileSelector', { static: true }) private holdingsProfileSelector: ComboboxComponent; - @ViewChild('mergeProfileSelector') + @ViewChild('mergeProfileSelector', { static: true }) private mergeProfileSelector: ComboboxComponent; - @ViewChild('fallThruMergeProfileSelector') + @ViewChild('fallThruMergeProfileSelector', { static: true }) private fallThruMergeProfileSelector: ComboboxComponent; - @ViewChild('dupeQueueAlert') + @ViewChild('dupeQueueAlert', { static: true }) private dupeQueueAlert: AlertDialogComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.ts index f93c1e7d41..891b01a5ff 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.ts @@ -35,7 +35,7 @@ export class MatchSetExpressionComponent implements OnInit { newPointType: string; newId: number; - @ViewChild('newPoint') newPoint: MatchSetNewPointComponent; + @ViewChild('newPoint', { static: true }) newPoint: MatchSetNewPointComponent; constructor( private idl: IdlService, diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.ts index c33999a282..bd8da8d973 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.ts @@ -18,8 +18,8 @@ export class MatchSetListComponent implements AfterViewInit { gridSource: GridDataSource; deleteSelected: (rows: IdlObject[]) => void; createNew: () => void; - @ViewChild('grid') grid: GridComponent; - @ViewChild('editDialog') editDialog: FmRecordEditorComponent; + @ViewChild('grid', { static: true }) grid: GridComponent; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; constructor( private router: Router, diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.ts index 7409ef9dd9..5abd71e38e 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.ts @@ -31,8 +31,8 @@ export class MatchSetQualityComponent implements OnInit { newPointType: string; matchSetType: string; dataSource: GridDataSource; - @ViewChild('newPoint') newPoint: MatchSetNewPointComponent; - @ViewChild('grid') grid: GridComponent; + @ViewChild('newPoint', { static: true }) newPoint: MatchSetNewPointComponent; + @ViewChild('grid', { static: true }) grid: GridComponent; deleteSelected: (rows: IdlObject[]) => void; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.ts index cae7c54a8e..4139a1fa6f 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.ts @@ -20,7 +20,7 @@ export class QueueItemsComponent { filterImportErrors: boolean; gridSource: GridDataSource; - @ViewChild('itemsGrid') itemsGrid: GridComponent; + @ViewChild('itemsGrid', { static: true }) itemsGrid: GridComponent; constructor( private router: Router, diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.ts index 5edde1e026..b090b7ce34 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.ts @@ -22,8 +22,8 @@ export class QueueListComponent { // points to the currently active grid. queueGrid: GridComponent; - @ViewChild('bibQueueGrid') bibQueueGrid: GridComponent; - @ViewChild('authQueueGrid') authQueueGrid: GridComponent; + @ViewChild('bibQueueGrid', { static: false }) bibQueueGrid: GridComponent; + @ViewChild('authQueueGrid', { static: false }) authQueueGrid: GridComponent; constructor( private router: Router, diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts index 19f08ad6ad..6e6fca24dc 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts @@ -34,9 +34,9 @@ export class QueueComponent implements OnInit, AfterViewInit { // keep a local copy for convenience attrDefs: IdlObject[]; - @ViewChild('queueGrid') queueGrid: GridComponent; - @ViewChild('confirmDelDlg') confirmDelDlg: ConfirmDialogComponent; - @ViewChild('progressDlg') progressDlg: ProgressDialogComponent; + @ViewChild('queueGrid', { static: true }) queueGrid: GridComponent; + @ViewChild('confirmDelDlg', { static: false }) confirmDelDlg: ConfirmDialogComponent; + @ViewChild('progressDlg', { static: true }) progressDlg: ProgressDialogComponent; constructor( private router: Router, diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queued-record-matches.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queued-record-matches.component.ts index f50c48266d..a4ac067535 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queued-record-matches.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queued-record-matches.component.ts @@ -21,8 +21,8 @@ export class QueuedRecordMatchesComponent implements OnInit { @Input() queueType: string; @Input() recordId: number; - @ViewChild('bibGrid') bibGrid: GridComponent; - @ViewChild('authGrid') authGrid: GridComponent; + @ViewChild('bibGrid', { static: false }) bibGrid: GridComponent; + @ViewChild('authGrid', { static: false }) authGrid: GridComponent; queuedRecord: IdlObject; bibDataSource: GridDataSource; diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/record-items.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/record-items.component.ts index d42f55d56d..6651197608 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/record-items.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/record-items.component.ts @@ -17,7 +17,7 @@ export class RecordItemsComponent { @Input() recordId: number; gridSource: GridDataSource; - @ViewChild('itemsGrid') itemsGrid: GridComponent; + @ViewChild('itemsGrid', { static: true }) itemsGrid: GridComponent; constructor( private net: NetService, diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.ts index c42b7ddc75..5efbd432bf 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.ts @@ -15,7 +15,7 @@ export class BasketActionsComponent implements OnInit { basketAction: string; - @ViewChild('addBasketToBucketDialog') + @ViewChild('addBasketToBucketDialog', { static: true }) addToBucketDialog: BucketDialogComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/browse.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/browse.component.ts index bf46a4e115..507a7c0162 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/browse.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/browse.component.ts @@ -7,7 +7,7 @@ import {SearchFormComponent} from './search-form.component'; }) export class BrowseComponent implements OnInit { - @ViewChild('searchForm') searchForm: SearchFormComponent; + @ViewChild('searchForm', { static: true }) searchForm: SearchFormComponent; constructor( private staffCat: StaffCatalogService diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse.component.ts index e0f7bf73fe..e3ab141e75 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse.component.ts @@ -7,7 +7,7 @@ import {SearchFormComponent} from './search-form.component'; }) export class CnBrowseComponent implements OnInit { - @ViewChild('searchForm') searchForm: SearchFormComponent; + @ViewChild('searchForm', { static: true }) searchForm: SearchFormComponent; constructor( private staffCat: StaffCatalogService, diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/conjoined.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/conjoined.component.ts index bf6e682428..635f76e170 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/conjoined.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/conjoined.component.ts @@ -24,12 +24,12 @@ export class ConjoinedComponent implements OnInit { gridDataSource: GridDataSource; idsToUnlink: number[]; - @ViewChild('conjoinedGrid') private grid: GridComponent; + @ViewChild('conjoinedGrid', { static: true }) private grid: GridComponent; - @ViewChild('conjoinedDialog') + @ViewChild('conjoinedDialog', { static: true }) private conjoinedDialog: ConjoinedItemsDialogComponent; - @ViewChild('confirmUnlink') + @ViewChild('confirmUnlink', { static: true }) private confirmUnlink: ConfirmDialogComponent; constructor( 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 a478777a9e..24350d8afc 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 @@ -18,7 +18,7 @@ export class CopiesComponent implements OnInit { initDone = false; gridDataSource: GridDataSource; copyContext: any; // grid context - @ViewChild('copyGrid') copyGrid: GridComponent; + @ViewChild('copyGrid', { static: true }) copyGrid: GridComponent; @Input() set recordId(id: number) { this.recId = id; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts index a89444b868..303a46bc11 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts @@ -80,32 +80,32 @@ export class HoldingsMaintenanceComponent implements OnInit { initDone = false; gridDataSource: GridDataSource; gridTemplateContext: any; - @ViewChild('holdingsGrid') holdingsGrid: GridComponent; + @ViewChild('holdingsGrid', { static: true }) holdingsGrid: GridComponent; // Manage visibility of various sub-sections - @ViewChild('volsCheckbox') + @ViewChild('volsCheckbox', { static: true }) private volsCheckbox: GridToolbarCheckboxComponent; - @ViewChild('copiesCheckbox') + @ViewChild('copiesCheckbox', { static: true }) private copiesCheckbox: GridToolbarCheckboxComponent; - @ViewChild('emptyVolsCheckbox') + @ViewChild('emptyVolsCheckbox', { static: true }) private emptyVolsCheckbox: GridToolbarCheckboxComponent; - @ViewChild('emptyLibsCheckbox') + @ViewChild('emptyLibsCheckbox', { static: true }) private emptyLibsCheckbox: GridToolbarCheckboxComponent; - @ViewChild('markDamagedDialog') + @ViewChild('markDamagedDialog', { static: true }) private markDamagedDialog: MarkDamagedDialogComponent; - @ViewChild('markMissingDialog') + @ViewChild('markMissingDialog', { static: true }) private markMissingDialog: MarkMissingDialogComponent; - @ViewChild('copyAlertsDialog') + @ViewChild('copyAlertsDialog', { static: true }) private copyAlertsDialog: CopyAlertsDialogComponent; - @ViewChild('replaceBarcode') + @ViewChild('replaceBarcode', { static: true }) private replaceBarcode: ReplaceBarcodeDialogComponent; - @ViewChild('deleteVolcopy') + @ViewChild('deleteVolcopy', { static: true }) private deleteVolcopy: DeleteVolcopyDialogComponent; - @ViewChild('bucketDialog') + @ViewChild('bucketDialog', { static: true }) private bucketDialog: BucketDialogComponent; - @ViewChild('conjoinedDialog') + @ViewChild('conjoinedDialog', { static: true }) private conjoinedDialog: ConjoinedItemsDialogComponent; - @ViewChild('makeBookableDialog') + @ViewChild('makeBookableDialog', { static: true }) private makeBookableDialog: MakeBookableDialogComponent; holdingsTree: HoldingsTree; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/parts.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/parts.component.ts index 2f59374084..236e1fe77a 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/parts.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/parts.component.ts @@ -18,9 +18,9 @@ export class PartsComponent implements OnInit { recId: number; gridDataSource: GridDataSource; initDone: boolean; - @ViewChild('partsGrid') partsGrid: GridComponent; - @ViewChild('editDialog') editDialog: FmRecordEditorComponent; - @ViewChild('mergeDialog') mergeDialog: PartMergeDialogComponent; + @ViewChild('partsGrid', { static: true }) partsGrid: GridComponent; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; + @ViewChild('mergeDialog', { static: true }) mergeDialog: PartMergeDialogComponent; canCreate: boolean; canDelete: boolean; 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 c70b5658be..8c1da95775 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 @@ -20,7 +20,7 @@ export class RecordComponent implements OnInit { recordTab: string; summary: BibRecordSummary; searchContext: CatalogSearchContext; - @ViewChild('recordTabs') recordTabs: NgbTabset; + @ViewChild('recordTabs', { static: true }) recordTabs: NgbTabset; defaultTab: string; // eg.cat.default_record_tab constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts index de94b5ef74..b955ac26de 100644 --- a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts @@ -21,16 +21,16 @@ import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; }) export class SandboxComponent implements OnInit { - @ViewChild('progressDialog') + @ViewChild('progressDialog', { static: true }) private progressDialog: ProgressDialogComponent; - @ViewChild('dateSelect') + @ViewChild('dateSelect', { static: false }) private dateSelector: DateSelectComponent; - @ViewChild('printTemplate') + @ViewChild('printTemplate', { static: true }) private printTemplate: TemplateRef; - @ViewChild('fmRecordEditor') + @ViewChild('fmRecordEditor', { static: true }) private fmRecordEditor: FmRecordEditorComponent; // @ViewChild('helloStr') private helloStr: StringComponent; 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 a1dc1c61aa..ae7c546b01 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 @@ -66,13 +66,13 @@ export class AdminPageComponent implements OnInit { // Optional comma-separated list of read-only fields @Input() readonlyFields: string; - @ViewChild('grid') grid: GridComponent; - @ViewChild('editDialog') editDialog: FmRecordEditorComponent; - @ViewChild('successString') successString: StringComponent; - @ViewChild('createString') createString: StringComponent; - @ViewChild('createErrString') createErrString: StringComponent; - @ViewChild('updateFailedString') updateFailedString: StringComponent; - @ViewChild('translator') translator: TranslateComponent; + @ViewChild('grid', { static: true }) grid: GridComponent; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; + @ViewChild('successString', { static: true }) successString: StringComponent; + @ViewChild('createString', { static: true }) createString: StringComponent; + @ViewChild('createErrString', { static: true }) createErrString: StringComponent; + @ViewChild('updateFailedString', { static: true }) updateFailedString: StringComponent; + @ViewChild('translator', { static: true }) translator: TranslateComponent; idlClassDef: any; pkeyField: string; diff --git a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.ts index 9df3f9f668..4a66cbce75 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.ts @@ -34,8 +34,8 @@ export class MakeBookableDialogComponent onOpenSub: Subscription; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( private modal: NgbModal, // required for passing to parent diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.ts index 98bd462bf1..5747f7c899 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.ts @@ -38,8 +38,8 @@ export class ConjoinedItemsDialogComponent existingMaps: any; onOpenSub: Subscription; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( private modal: NgbModal, // required for passing to parent diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts index 16fd66cff7..439c5468c5 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts @@ -49,8 +49,8 @@ export class CopyAlertsDialogComponent newAlert: IdlObject; changesMade: boolean; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( private modal: NgbModal, // required for passing to parent diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts index dc86d9b437..3e4f3c94d0 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts @@ -39,10 +39,10 @@ export class DeleteVolcopyDialogComponent numSucceeded: number; numFailed: number; - @ViewChild('successMsg') + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; - @ViewChild('errorMsg') + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts index 346b3f0500..9b63441004 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts @@ -37,8 +37,8 @@ export class MarkDamagedDialogComponent newNote: string; newBtype: number; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; // Charge data returned from the server requesting additional charge info. diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts index 14e8ceb7a7..f68d31fd3a 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts @@ -25,10 +25,10 @@ export class MarkMissingDialogComponent numSucceeded: number; numFailed: number; - @ViewChild('successMsg') + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; - @ViewChild('errorMsg') + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts index 2b85d38931..b5288db2c5 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts @@ -34,10 +34,10 @@ export class ReplaceBarcodeDialogComponent numSucceeded: number; numFailed: number; - @ViewChild('successMsg') + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; - @ViewChild('errorMsg') + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; constructor( diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts index d9c9295486..23200810e3 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts @@ -23,8 +23,8 @@ export class HoldCancelDialogComponent extends DialogComponent implements OnInit { @Input() holdIds: number[]; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; changesApplied: boolean; numSucceeded: number; diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts index bdecd41afb..2e95fa4460 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts @@ -54,20 +54,20 @@ export class HoldsGridComponent implements OnInit { editHolds: number[]; transferTarget: number; - @ViewChild('holdsGrid') private holdsGrid: GridComponent; - @ViewChild('progressDialog') + @ViewChild('holdsGrid', { static: false }) private holdsGrid: GridComponent; + @ViewChild('progressDialog', { static: true }) private progressDialog: ProgressDialogComponent; - @ViewChild('transferDialog') + @ViewChild('transferDialog', { static: true }) private transferDialog: HoldTransferDialogComponent; - @ViewChild('markDamagedDialog') + @ViewChild('markDamagedDialog', { static: true }) private markDamagedDialog: MarkDamagedDialogComponent; - @ViewChild('markMissingDialog') + @ViewChild('markMissingDialog', { static: true }) private markMissingDialog: MarkMissingDialogComponent; - @ViewChild('retargetDialog') + @ViewChild('retargetDialog', { static: true }) private retargetDialog: HoldRetargetDialogComponent; - @ViewChild('cancelDialog') + @ViewChild('cancelDialog', { static: true }) private cancelDialog: HoldCancelDialogComponent; - @ViewChild('manageDialog') + @ViewChild('manageDialog', { static: true }) private manageDialog: HoldManageDialogComponent; // Bib record ID. diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts index bb31a48602..25ff656f70 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts @@ -22,8 +22,8 @@ export class HoldRetargetDialogComponent extends DialogComponent implements OnInit { @Input() holdIds: number | number[]; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; changesApplied: boolean; numSucceeded: number; diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts index 796aa107a6..163aaadade 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts @@ -24,9 +24,9 @@ export class HoldTransferDialogComponent @Input() holdIds: number | number[]; - @ViewChild('successMsg') private successMsg: StringComponent; - @ViewChild('errorMsg') private errorMsg: StringComponent; - @ViewChild('targetNeeded') private targetNeeded: StringComponent; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; + @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; + @ViewChild('targetNeeded', { static: true }) private targetNeeded: StringComponent; transferTarget: number; changesApplied: boolean; -- 2.11.0