From 9a677906cc200db4c6f8f0fa5a326334d5da4a72 Mon Sep 17 00:00:00 2001 From: Shula Link Date: Fri, 30 Sep 2022 09:22:54 -0400 Subject: [PATCH] LP1991344 rxjs empty() function deprecated Futureproofing for rxjs 8 and the deprecation of the empty() function. All the references to empty() have been replaced with the EMPTY constant. Places where empty() was imported without being used have been removed. Signed-off-by: Shula Link Signed-off-by: Jane Sandberg --- Open-ILS/src/eg2/src/app/share/util/broadcast.service.ts | 1 - Open-ILS/src/eg2/src/app/share/util/file-export.service.ts | 1 - .../eg2/src/app/staff/acq/provider/acq-provider-search.service.ts | 4 ++-- .../src/app/staff/acq/provider/provider-addresses.component.ts | 4 ++-- .../src/app/staff/acq/provider/provider-attributes.component.ts | 4 ++-- .../staff/acq/provider/provider-contact-addresses.component.ts | 4 ++-- .../eg2/src/app/staff/acq/provider/provider-contacts.component.ts | 4 ++-- .../eg2/src/app/staff/acq/provider/provider-details.component.ts | 2 +- .../src/app/staff/acq/provider/provider-edi-accounts.component.ts | 4 ++-- .../eg2/src/app/staff/acq/provider/provider-holdings.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/acq/search/attr-defs.service.ts | 2 +- .../src/app/staff/acq/search/picklist-create-dialog.component.ts | 2 +- .../src/app/staff/admin/local/negative-balances/list.component.ts | 4 ++-- .../admin/local/staff_portal_page/staff-portal-page.component.ts | 4 ++-- .../src/app/staff/admin/server/perm-group-map-dialog.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/cat/authority/browse.service.ts | 4 ++-- Open-ILS/src/eg2/src/app/staff/cat/authority/manage.component.ts | 2 +- .../src/eg2/src/app/staff/catalog/record/holdings.component.ts | 4 ++-- .../src/eg2/src/app/staff/share/bib-list/bib-list.component.ts | 8 ++++---- .../src/app/staff/share/holdings/copy-tags-dialog.component.ts | 4 ++-- 22 files changed, 38 insertions(+), 40 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/util/broadcast.service.ts b/Open-ILS/src/eg2/src/app/share/util/broadcast.service.ts index ccbb573a66..76c1292917 100644 --- a/Open-ILS/src/eg2/src/app/share/util/broadcast.service.ts +++ b/Open-ILS/src/eg2/src/app/share/util/broadcast.service.ts @@ -2,7 +2,6 @@ * Create and consume BroadcastChannel broadcasts */ import {Injectable, EventEmitter} from '@angular/core'; -import {empty} from 'rxjs'; interface BroadcastSub { channel: any; // BroadcastChannel diff --git a/Open-ILS/src/eg2/src/app/share/util/file-export.service.ts b/Open-ILS/src/eg2/src/app/share/util/file-export.service.ts index c2a8ef24b2..2ea18173f4 100644 --- a/Open-ILS/src/eg2/src/app/share/util/file-export.service.ts +++ b/Open-ILS/src/eg2/src/app/share/util/file-export.service.ts @@ -3,7 +3,6 @@ */ import {Injectable, EventEmitter} from '@angular/core'; import {DomSanitizer, SafeUrl} from '@angular/platform-browser'; -import {empty} from 'rxjs'; @Injectable() export class FileExportService { diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts index 38b61d3814..90eb0c7b90 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {empty, throwError} from 'rxjs'; +import {EMPTY, throwError} from 'rxjs'; import {map} from 'rxjs/operators'; import {AuthService} from '@eg/core/auth.service'; import {GridDataSource} from '@eg/share/grid/grid'; @@ -164,7 +164,7 @@ export class AcqProviderSearchService { // to submit a search if (this.firstRun) { this.firstRun = false; - return empty(); + return EMPTY; } const joins = this.generateSearchJoins(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.ts index 08eb4b264d..ed7e3138bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, AfterViewInit, OnDestroy, Input, ViewChild} from '@angular/core'; -import {empty, throwError, Observable, from, Subscription} from 'rxjs'; +import {EMPTY, throwError, Observable, from, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -117,7 +117,7 @@ export class ProviderAddressesComponent implements OnInit, AfterViewInit, OnDest gridSource.getRows = (pager: Pager, sort: any[]) => { this.provider = this.providerRecord.current(); if (!this.provider) { - return empty(); + return EMPTY; } let addresses = this.provider.addresses(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.ts index c02955b117..23974ea631 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, AfterViewInit, OnDestroy, Input, ViewChild} from '@angular/core'; -import {empty, throwError, Observable, from, Subscription} from 'rxjs'; +import {EMPTY, throwError, Observable, from, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -106,7 +106,7 @@ export class ProviderAttributesComponent implements OnInit, AfterViewInit, OnDes gridSource.getRows = (pager: Pager, sort: any[]) => { this.provider = this.providerRecord.current(); if (!this.provider) { - return empty(); + return EMPTY; } let attributes = this.provider.attributes(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.ts index 06d81e21aa..684952ab63 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, AfterViewInit, Input, ViewChild} from '@angular/core'; -import {empty, throwError, Observable, from} from 'rxjs'; +import {EMPTY, throwError, Observable, from} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -108,7 +108,7 @@ export class ProviderContactAddressesComponent implements OnInit, AfterViewInit gridSource.getRows = (pager: Pager, sort: any[]) => { if (!this.contactId) { - return empty(); + return EMPTY; } const cid = this.contactId; const contact = this.providerRecord.current().contacts().filter( c => c.id() === cid)[0]; diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.ts index 7fd53c26b3..0957b25cde 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, AfterViewInit, OnDestroy, Input, Output, ViewChild, EventEmitter, ChangeDetectorRef} from '@angular/core'; -import {empty, throwError, Observable, from, Subscription} from 'rxjs'; +import {EMPTY, throwError, Observable, from, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -150,7 +150,7 @@ export class ProviderContactsComponent implements OnInit, AfterViewInit, OnDestr gridSource.getRows = (pager: Pager, sort: any[]) => { this.provider = this.providerRecord.current(); if (!this.provider) { - return empty(); + return EMPTY; } let contacts = this.provider.contacts(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-details.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-details.component.ts index 4e537265a7..b8639305dd 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-details.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-details.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, Output, EventEmitter, ViewChild} from '@angular/core'; -import {empty, throwError, Observable, from} from 'rxjs'; +import {throwError, Observable, from} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {IdlService, IdlObject} from '@eg/core/idl.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.ts index 9ecf4f2db3..8d65ee9e61 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, AfterViewInit, OnDestroy, Input, Output, EventEmitter, ViewChild, ChangeDetectorRef} from '@angular/core'; -import {empty, throwError, Observable, from, Subscription} from 'rxjs'; +import {EMPTY, throwError, Observable, from, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -124,7 +124,7 @@ export class ProviderEdiAccountsComponent implements OnInit, AfterViewInit, OnDe gridSource.getRows = (pager: Pager, sort: any[]) => { this.provider = this.providerRecord.current(); if (!this.provider) { - return empty(); + return EMPTY; } let edi_accounts = this.provider.edi_accounts(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts index 2c1c2b2311..ffac89222a 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, AfterViewInit, OnDestroy, Input, ViewChild} from '@angular/core'; import {NgForm} from '@angular/forms'; -import {empty, throwError, Observable, from, Subscription} from 'rxjs'; +import {EMPTY, throwError, Observable, from, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; @@ -136,7 +136,7 @@ export class ProviderHoldingsComponent implements OnInit, AfterViewInit, OnDestr gridSource.getRows = (pager: Pager, sort: any[]) => { this.provider = this.providerRecord.current(); if (!this.provider) { - return empty(); + return EMPTY; } let holdings = this.provider.holdings_subfields(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts index 577f6ba1dc..b8caa3bccc 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {empty, throwError} from 'rxjs'; +import {EMPTY, throwError} from 'rxjs'; import {map} from 'rxjs/operators'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; @@ -230,7 +230,7 @@ export class AcqSearchService { // to submit a search if (this.firstRun) { this.firstRun = false; - return empty(); + return EMPTY; } const currentSearch = this.generateAcqSearch(searchType, gridSource.filters); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/attr-defs.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/attr-defs.service.ts index 4a040dae38..9e423a927f 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/attr-defs.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/attr-defs.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {empty, throwError} from 'rxjs'; +import {throwError} from 'rxjs'; import {map} from 'rxjs/operators'; import {PcrudService} from '@eg/core/pcrud.service'; import {IdlObject} from '@eg/core/idl.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.ts index f4f81b3585..e096babad0 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, Input, ViewChild, TemplateRef, OnInit, Renderer2} from '@angular/core'; -import {Observable, from, empty, throwError} from 'rxjs'; +import {Observable, from, throwError} from 'rxjs'; import {DialogComponent} from '@eg/share/dialog/dialog.component'; import {AlertDialogComponent} from '@eg/share/dialog/alert.component'; import {IdlService, IdlObject} from '@eg/core/idl.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/negative-balances/list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/negative-balances/list.component.ts index 4d8967502b..2317ab92a5 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/negative-balances/list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/negative-balances/list.component.ts @@ -1,5 +1,5 @@ import {Component, Input, ViewChild, OnInit} from '@angular/core'; -import {empty} from 'rxjs'; +import {EMPTY} from 'rxjs'; import {map, tap, concatMap} from 'rxjs/operators'; import {IdlService, IdlObject} from '@eg/core/idl.service'; import {NgbTabset, NgbTabChangeEvent} from '@ng-bootstrap/ng-bootstrap'; @@ -45,7 +45,7 @@ export class NegativeBalancesComponent implements OnInit { if (!this.contextOrgLoaded) { // Still determining the default context org unit. - return empty(); + return EMPTY; } return this.net.request( diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/staff-portal-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/staff-portal-page.component.ts index 13d285f5d8..f365b1315f 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/staff-portal-page.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/staff-portal-page.component.ts @@ -15,7 +15,7 @@ import {StringComponent} from '@eg/share/string/string.component'; import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; import {ClonePortalEntriesDialogComponent} from './clone-portal-entries-dialog.component'; import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; -import {merge, Observable, empty} from 'rxjs'; +import {merge, Observable, EMPTY} from 'rxjs'; @Component({ templateUrl: './staff-portal-page.component.html' @@ -80,7 +80,7 @@ export class AdminStaffPortalPageComponent extends AdminPageComponent implements const delObs = (overwrite) ? this.pcrud.search('cusppe', { owner: tgt }, {}, {}) : - empty(); + EMPTY; const newObs = this.pcrud.search('cusppe', { owner: src }, {}, {}); merge(delObs, newObs).subscribe( entry => { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts index c71f25f3b0..8095a65443 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; -import {Observable, from, empty, throwError} from 'rxjs'; +import {Observable, from, EMPTY, throwError} from 'rxjs'; import {DialogComponent} from '@eg/share/dialog/dialog.component'; import {IdlService, IdlObject} from '@eg/core/idl.service'; import {PcrudService} from '@eg/core/pcrud.service'; @@ -56,7 +56,7 @@ export class PermGroupMapDialogComponent this.permEntries = (term: string) => { - if (term === null || term === undefined) { return empty(); } + if (term === null || term === undefined) { return EMPTY; } term = ('' + term).toLowerCase(); // Find entries whose code or description match the search term diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts index 8f6dc1e22f..748aff8ca5 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {Observable, empty} from 'rxjs'; +import {Observable, EMPTY} from 'rxjs'; import {map, switchMap} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; import {Pager} from '@eg/share/util/pager'; @@ -61,7 +61,7 @@ export class BrowseAuthorityComponent implements OnInit { this.axisCbox.selectedId = this.browse.authorityAxis; this.authorityAxis = this.axisCbox.selected; } else { - return empty(); + return EMPTY; } } diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.service.ts b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.service.ts index 848fb51dc0..d04073b8fc 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {Observable, empty} from 'rxjs'; +import {Observable, EMPTY} from 'rxjs'; import {map, switchMap} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; import {Pager} from '@eg/share/util/pager'; @@ -46,7 +46,7 @@ export class BrowseService { loadAuthorities(): Observable { if (!this.searchTerm || !this.authorityAxis) { - return empty(); + return EMPTY; } return this.net.request( diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/manage.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/authority/manage.component.ts index 2f626ed1bc..95c0193f75 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/authority/manage.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/manage.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {Observable, empty} from 'rxjs'; +import {Observable} from 'rxjs'; import {map, switchMap} from 'rxjs/operators'; import {NgbTabset, NgbTabChangeEvent} from '@ng-bootstrap/ng-bootstrap'; import {IdlObject} from '@eg/core/idl.service'; 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 d946bb45ef..4c13a6c0c3 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 @@ -1,7 +1,7 @@ import {Component, OnInit, Input, ViewChild, ViewEncapsulation } from '@angular/core'; import {Router} from '@angular/router'; -import {Observable, Observer, of, empty} from 'rxjs'; +import {Observable, Observer, of, EMPTY} from 'rxjs'; import {map, tap, concatMap} from 'rxjs/operators'; import {Pager} from '@eg/share/util/pager'; import {IdlObject, IdlService} from '@eg/core/idl.service'; @@ -289,7 +289,7 @@ export class HoldingsMaintenanceComponent implements OnInit { this.emptyLibsCheckbox.checked(settings['cat.holdings_show_empty_org']); this.gridDataSource.getRows = (pager: Pager, sort: any[]) => { - if (!this.contextOrgLoaded) { return empty(); } + if (!this.contextOrgLoaded) { return EMPTY; } return this.fetchHoldings(pager); }; diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-list/bib-list.component.ts b/Open-ILS/src/eg2/src/app/staff/share/bib-list/bib-list.component.ts index 49fe1d8fd8..9f6fd8dfde 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/bib-list/bib-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-list/bib-list.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core'; -import {Observable, empty, from} from 'rxjs'; +import {Observable, EMPTY, from} from 'rxjs'; import {map, tap, switchMap} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; import {Pager} from '@eg/share/util/pager'; @@ -46,7 +46,7 @@ export class BibListComponent implements OnInit { return this.loadIds(pager, sort); } - return empty(); + return EMPTY; }; this.cellTextGenerator = { @@ -66,7 +66,7 @@ export class BibListComponent implements OnInit { this.bibIds.slice(pager.offset, pager.offset + pager.limit)); } else { - return empty(); + return EMPTY; } // ID is the currently only supported sort column. If other @@ -79,7 +79,7 @@ export class BibListComponent implements OnInit { return from(promise).pipe(switchMap(bibIds => { - if (bibIds.length === 0) { return empty(); } + if (bibIds.length === 0) { return EMPTY; } return this.pcrud.search('rmsr', {id: bibIds}, { order_by: orderBy, diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.ts index 820691de3b..7c14f16dcb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, Input, ViewChild} from '@angular/core'; -import {Observable, throwError, from, empty} from 'rxjs'; +import {Observable, throwError, from, EMPTY} from 'rxjs'; import {tap, map, switchMap} from 'rxjs/operators'; import {NetService} from '@eg/core/net.service'; import {IdlService, IdlObject} from '@eg/core/idl.service'; @@ -74,7 +74,7 @@ export class CopyTagsDialogComponent ngOnInit() { this.tagDataSource = term => { - if (!this.curTagType) { return empty(); } + if (!this.curTagType) { return EMPTY; } return this.pcrud.search( 'acpt', { -- 2.11.0