Commits
Kuno Vercammen authored a7cdf2e97a0
17 17 | ActivatedRoute, |
18 18 | Data, |
19 19 | } from '@angular/router'; |
20 20 | import { |
21 21 | TranslateModule, |
22 22 | TranslateService, |
23 23 | } from '@ngx-translate/core'; |
24 24 | import { |
25 25 | BehaviorSubject, |
26 26 | combineLatest as observableCombineLatest, |
27 - | EMPTY, |
28 27 | Observable, |
29 28 | Subscription, |
29 + | of, |
30 30 | } from 'rxjs'; |
31 31 | import { |
32 32 | map, |
33 33 | mergeMap, |
34 34 | tap, |
35 35 | } from 'rxjs/operators'; |
36 36 | |
37 37 | import { |
38 38 | APP_DATA_SERVICES_MAP, |
39 39 | LazyDataServicesMap, |
181 181 | } |
182 182 | |
183 183 | /** |
184 184 | * Resolve the data-service for the current DSpaceObject and retrieve its instance |
185 185 | */ |
186 186 | retrieveDataService(): Observable<UpdateDataService<DSpaceObject>> { |
187 187 | if (hasNoValue(this.updateDataService)) { |
188 188 | const lazyProvider$: Observable<UpdateDataService<DSpaceObject>> = lazyDataService(this.dataServiceMap, this.dsoType, this.parentInjector); |
189 189 | return lazyProvider$; |
190 190 | } else { |
191 - | return EMPTY; |
191 + | return of(this.updateDataService); |
192 192 | } |
193 193 | } |
194 194 | |
195 195 | /** |
196 196 | * Initialise the current DSpaceObject |
197 197 | */ |
198 198 | initDSO(object: DSpaceObject) { |
199 199 | this.dso = object; |
200 200 | this.initDSOType(object); |
201 201 | } |