diff --git a/src/app/+my-dspace-page/my-dspace-page.component.html b/src/app/+my-dspace-page/my-dspace-page.component.html
index 4c691028fc..e6d1a5c80d 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.html
+++ b/src/app/+my-dspace-page/my-dspace-page.component.html
@@ -39,7 +39,8 @@
+ [searchConfig]="searchOptions$ | async"
+ [context]="context$ | async">
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/+my-dspace-page/my-dspace-page.component.ts
index 1bad29f0d5..c8217f9ba8 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -8,7 +8,7 @@ import {
} from '@angular/core';
import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { switchMap, tap, } from 'rxjs/operators';
+import { map, switchMap, tap, } from 'rxjs/operators';
import { PaginatedList } from '../core/data/paginated-list';
import { RemoteData } from '../core/data/remote-data';
@@ -28,6 +28,7 @@ import { MyDSpaceConfigurationService } from './my-dspace-configuration.service'
import { ViewMode } from '../core/shared/view-mode.model';
import { MyDSpaceRequest } from '../core/data/request.models';
import { SearchResult } from '../+search-page/search-result.model';
+import { Context } from '../core/shared/context.model';
export const MYDSPACE_ROUTE = '/mydspace';
export const SEARCH_CONFIG_SERVICE: InjectionToken = new InjectionToken('searchConfigurationService');
@@ -95,6 +96,8 @@ export class MyDSpacePageComponent implements OnInit {
*/
viewModeList = [ViewMode.ListElement, ViewMode.DetailedListElement];
+ context$: Observable;
+
constructor(private service: SearchService,
private sidebarService: SearchSidebarService,
private windowService: HostWindowService,
@@ -126,6 +129,17 @@ export class MyDSpacePageComponent implements OnInit {
switchMap((scopeId) => this.service.getScopes(scopeId))
);
+ this.context$ = this.searchConfigService.getCurrentConfiguration('workspace')
+ .pipe(
+ map((configuration: string) => {
+ if (configuration === 'workspace') {
+ return Context.Workspace
+ } else {
+ return Context.Workflow
+ }
+ })
+ );
+
}
/**
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 61669277cf..96f11e7dba 100644
--- a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -37,7 +37,7 @@ export class MyDSpaceResultsComponent {
*/
@Input() viewMode: ViewMode;
- context = Context.Submission;
+ @Input() context: Context;
/**
* A boolean representing if search results entry are separated by a line
*/
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index a0e7f6a967..7bfd613b65 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -6,7 +6,8 @@ export enum Context {
Undefined = 'undefined',
ItemPage = 'itemPage',
Search = 'search',
- Submission = 'submission',
+ Workflow = 'workflow',
+ Workspace = 'workspace',
AdminMenu = 'adminMenu',
SubmissionModal = 'submissionModal',
}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index 6a3cc3befb..3ef45d1c47 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -17,7 +17,8 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
templateUrl: './item-search-result-list-element-submission.component.html'
})
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Submission)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Workspace)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Workflow)
export class ItemSearchResultListElementSubmissionComponent extends SearchResultListElementComponent implements OnInit {
/**
* Represent item's status