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

fixed after merge

Browse Source
This commit is contained in:
Giuseppe Digilio
2019-03-27 16:01:49 +01:00
parent 60f9df901e
commit 237100a9cf
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+my-dspace-page/my-dspace-page.component.ts
View File

@@ -67,7 +67,7 @@ export class MyDSpacePageComponent implements OnInit {
/** /**
* The current relevant scopes * The current relevant scopes
*/ */
scopeListRD$: Observable<DSpaceObject[]>; scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject([]);
/** /**
* Emits true if were on a small screen * Emits true if were on a small screen

6
src/app/+search-page/search-page.component.ts
View File

@@ -53,7 +53,7 @@ export class SearchPageComponent implements OnInit {
/** /**
* The current relevant scopes * The current relevant scopes
*/ */
scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject(null); scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject([]);
/** /**
* Emits true if were on a small screen * Emits true if were on a small screen
@@ -86,9 +86,9 @@ export class SearchPageComponent implements OnInit {
.subscribe((results) => { .subscribe((results) => {
this.resultsRD$.next(results); this.resultsRD$.next(results);
}); });
/* this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
switchMap((scopeId) => this.service.getScopes(scopeId)) switchMap((scopeId) => this.service.getScopes(scopeId))
);*/ );
} }
/** /**

2
src/app/core/data/request.service.spec.ts
View File

@@ -1,7 +1,7 @@
import * as ngrx from '@ngrx/store'; import * as ngrx from '@ngrx/store';
import { ActionsSubject, Store } from '@ngrx/store'; import { ActionsSubject, Store } from '@ngrx/store';
import { cold, getTestScheduler, hot } from 'jasmine-marbles'; import { cold, getTestScheduler, hot } from 'jasmine-marbles';
import { EMPTY, of as observableOf } from 'rxjs'; import { BehaviorSubject, EMPTY, of as observableOf } from 'rxjs';
import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service'; import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service';
import { defaultUUID, getMockUUIDService } from '../../shared/mocks/mock-uuid.service'; import { defaultUUID, getMockUUIDService } from '../../shared/mocks/mock-uuid.service';
import { ObjectCacheService } from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';

2
src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
View File

@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model'; import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
import { MyDSpaceActionsComponent } from '../mydspace-actions'; import { MyDSpaceActionsComponent } from '../mydspace-actions';
import { SubmissionRestService } from '../../../submission/submission-rest.service'; import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
import { ResourceType } from '../../../core/shared/resource-type'; import { ResourceType } from '../../../core/shared/resource-type';
import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsService } from '../../notifications/notifications.service';