hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

w2p-86403 Changed to subscribe and unsubscribe on destory

Browse Source
This commit is contained in:
Nathan Buckingham
2022-04-28 15:51:21 -04:00
parent 90f1fc186c
commit 8785270363
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/shared/rss-feed/rss.component.ts
View File

@@ -5,7 +5,7 @@ import {
OnInit, OnInit,
ViewEncapsulation ViewEncapsulation
} from '@angular/core'; } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs'; import { BehaviorSubject, Observable, Subscription } from 'rxjs';
import { GroupDataService } from '../../core/eperson/group-data.service'; import { GroupDataService } from '../../core/eperson/group-data.service';
import { LinkHeadService } from '../../core/services/link-head.service'; import { LinkHeadService } from '../../core/services/link-head.service';
import { ConfigurationDataService } from '../../core/data/configuration-data.service'; import { ConfigurationDataService } from '../../core/data/configuration-data.service';
@@ -15,6 +15,9 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf
import { SortOptions } from '../../core/cache/models/sort-options.model'; import { SortOptions } from '../../core/cache/models/sort-options.model';
import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationService } from '../../core/pagination/pagination.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { map, switchMap } from 'rxjs/operators';
import { RemoteData } from '../../core/data/remote-data';
import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
/** /**
@@ -32,12 +35,14 @@ export class RSSComponent implements OnInit, OnDestroy {
route$: BehaviorSubject<string>; route$: BehaviorSubject<string>;
isEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false); isEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
uuid: string; uuid: string;
configuration$: Observable<string>; configuration$: Observable<string>;
sortOption$: Observable<SortOptions>; sortOption$: Observable<SortOptions>;
subs: Subscription[] = [];
constructor(private groupDataService: GroupDataService, constructor(private groupDataService: GroupDataService,
private linkHeadService: LinkHeadService, private linkHeadService: LinkHeadService,
private configurationService: ConfigurationDataService, private configurationService: ConfigurationDataService,
@@ -50,6 +55,9 @@ export class RSSComponent implements OnInit, OnDestroy {
*/ */
ngOnDestroy(): void { ngOnDestroy(): void {
this.linkHeadService.removeTag("rel='alternate'"); this.linkHeadService.removeTag("rel='alternate'");
this.subs.forEach(sub => {
sub.unsubscribe();
});
} }
@@ -59,31 +67,32 @@ export class RSSComponent implements OnInit, OnDestroy {
ngOnInit(): void { ngOnInit(): void {
this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default'); this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default');
this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe( this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe(
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
).subscribe((result) => { ).subscribe((result) => {
const enabled = (result.payload.values[0] === 'true'); const enabled = (result.payload.values[0] === 'true');
this.isEnabled$.next(enabled); this.isEnabled$.next(enabled);
}); }));
this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe( this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe(
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
).subscribe((url) => { map((response: RemoteData<any>) => response.payload.values[0]),
this.searchConfigurationService.getCurrentQuery('').subscribe((query) => { switchMap((openSearchUri: string) =>
this.sortOption$ = this.paginationService.getCurrentSort(this.searchConfigurationService.paginationID, null, true); this.searchConfigurationService.paginatedSearchOptions.pipe(
this.sortOption$.subscribe((sort) => { map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri, searchOptions }))
)
),
).subscribe(({ openSearchUri, searchOptions }) => {
this.uuid = this.groupDataService.getUUIDFromString(this.router.url); this.uuid = this.groupDataService.getUUIDFromString(this.router.url);
const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, url.payload.values[0], sort, query); const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query);
this.addLinks(route); this.addLinks(route);
this.linkHeadService.addTag({ this.linkHeadService.addTag({
href: environment.rest.baseUrl + '/' + url.payload.values[0] + '/service', href: environment.rest.baseUrl + '/' + openSearchUri + '/service',
type: 'application/atom+xml', type: 'application/atom+xml',
rel: 'search', rel: 'search',
title: 'Dspace' title: 'Dspace'
}); });
this.route$ = new BehaviorSubject<string>(route); this.route$ = new BehaviorSubject<string>(route);
}); }));
});
});
} }
/** /**
@@ -99,7 +108,7 @@ export class RSSComponent implements OnInit, OnDestroy {
if (uuid) { if (uuid) {
route += `&scope=${uuid}`; route += `&scope=${uuid}`;
} }
if (sort.direction && sort.field) { if (sort && sort.direction && sort.field) {
route += `&sort=${sort.field}&sort_direction=${sort.direction}`; route += `&sort=${sort.field}&sort_direction=${sort.direction}`;
} }
if (query) { if (query) {