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

Add tests and fix tests

Browse Source
This commit is contained in:
Yana De Pauw
2021-03-04 17:10:01 +01:00
parent d07f44ac41
commit b18f9c7c9f
47 changed files with 937 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/submission/import-external/submission-import-external.component.ts
View File

@@ -20,7 +20,6 @@ import { fadeIn } from '../../shared/animations/fade';
import { PageInfo } from '../../core/shared/page-info.model';
import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { getFinishedRemoteData } from '../../core/shared/operators';
import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
/**
* This component allows to submit a new workspaceitem importing the data from an external source.
@@ -46,7 +45,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
*/
public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
public reload$: BehaviorSubject<{query: string, source: string}>;
public reload$: BehaviorSubject<{query: string, source: string}> = new BehaviorSubject<{query: string; source: string}>({query: '', source: ''});
/**
* Configuration to use for the import buttons
*/
@@ -122,9 +121,10 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
]).pipe(
take(1)
).subscribe(([source, query]: [string, string]) => {
this.reload$ = new BehaviorSubject<{query: string; source: string}>({query: query, source: source});
this.retrieveExternalSources(source, query);
this.reload$.next({query: query, source: source});
this.retrieveExternalSources();
}));
this.reload$.subscribe((v) => console.log('this.reload$', v));
}
/**
@@ -167,8 +167,9 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
* @param source The source tupe
* @param query The query string to search
*/
private retrieveExternalSources(sourcesss: string, querysss: string): void {
private retrieveExternalSources(): void {
this.reload$.subscribe((sourceQueryObject: {source: string, query: string}) => {
console.log('ping?', sourceQueryObject);
const source = sourceQueryObject.source;
const query = sourceQueryObject.query;
if (isNotEmpty(source) && isNotEmpty(query)) {
@@ -177,6 +178,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
this.isLoading$.next(true);
this.subs.push(
this.searchConfigService.paginatedSearchOptions.pipe(
tap((v) => console.log('searchpag?', v)),
filter((searchOptions) => searchOptions.query === query),
mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
getFinishedRemoteData(),