diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts
index c739efe500..66c6488b8e 100644
--- a/src/app/item-page/full/full-item-page.component.spec.ts
+++ b/src/app/item-page/full/full-item-page.component.spec.ts
@@ -112,7 +112,7 @@ describe('FullItemPageComponent', () => {
});
it('should show simple view button when not originated from workflow item', () => {
- expect(comp.fromWfi).toBe(false);
+ expect(comp.fromSubmissionObject).toBe(false);
const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
expect(simpleViewBtn).toBeTruthy();
});
@@ -122,7 +122,7 @@ describe('FullItemPageComponent', () => {
comp.ngOnInit();
fixture.detectChanges();
fixture.whenStable().then(() => {
- expect(comp.fromWfi).toBe(true);
+ expect(comp.fromSubmissionObject).toBe(true);
const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
expect(simpleViewBtn).toBeFalsy();
});
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 369769c77d..118e436004 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -2,7 +2,7 @@ import { filter, map } from 'rxjs/operators';
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, Data, Router } from '@angular/router';
-import { Observable , BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
import { ItemPageComponent } from '../simple/item-page.component';
import { MetadataMap } from '../../core/shared/metadata.models';
@@ -37,9 +37,9 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
metadata$: Observable
;
/**
- * True when the itemRD has been originated from its workflowitem, false otherwise.
+ * True when the itemRD has been originated from its workspaceite/workflowitem, false otherwise.
*/
- fromWfi = false;
+ fromSubmissionObject = false;
subs = [];
@@ -61,7 +61,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
map((item: Item) => item.metadata),);
this.subs.push(this.route.data.subscribe((data: Data) => {
- this.fromWfi = hasValue(data.wfi);
+ this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
})
);
}
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 1013cad44b..4f310204e3 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -5,8 +5,9 @@ import { FormGroup } from '@angular/forms';
import { hasValue, isEmpty } from '../../shared/empty.util';
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { debounceTime, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
import { Subscription } from 'rxjs';
+import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators';
@Component({
selector: 'ds-profile-page-security-form',
diff --git a/src/app/root/root.component.spec.ts b/src/app/root/root.component.spec.ts
index 81b22592d6..64a15a3087 100644
--- a/src/app/root/root.component.spec.ts
+++ b/src/app/root/root.component.spec.ts
@@ -9,7 +9,7 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
import { MetadataService } from '../core/metadata/metadata.service';
import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
import { AuthService } from '../core/auth/auth.service';
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 2633874c1a..aae991dca3 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
import { MetadataService } from '../core/metadata/metadata.service';
import { HostWindowState } from '../shared/search/host-window.reducer';
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index d71d100ca5..8bda44b11c 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -38,6 +38,13 @@ import { HostWindowService } from '../host-window.service';
import { RouteService } from '../../core/services/route.service';
import { routeServiceStub } from '../testing/route-service.stub';
import SpyObj = jasmine.SpyObj;
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { createPaginatedList } from '../testing/utils.test';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
@Component({
@@ -73,6 +80,25 @@ describe('BrowseByComponent', () => {
];
const mockItemsRD$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockItems));
+ const groupDataService = jasmine.createSpyObj('groupsDataService', {
+ findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ getGroupRegistryRouterLink: '',
+ getUUIDFromString: '',
+ });
+
+ const linkHeadService = jasmine.createSpyObj('linkHeadService', {
+ addTag: ''
+ });
+
+ const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+ findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+ name: 'test',
+ values: [
+ 'org.dspace.ctask.general.ProfileFormats = test'
+ ]
+ }))
+ });
+
const paginationConfig = Object.assign(new PaginationComponentOptions(), {
id: 'test-pagination',
currentPage: 1,
@@ -103,6 +129,10 @@ describe('BrowseByComponent', () => {
],
declarations: [],
providers: [
+ { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+ { provide: ConfigurationDataService, useValue: configurationDataService },
+ { provide: LinkHeadService, useValue: linkHeadService },
+ { provide: GroupDataService, useValue: groupDataService },
{ provide: PaginationService, useValue: paginationService },
{ provide: MockThemedBrowseEntryListElementComponent },
{ provide: ThemeService, useValue: themeService },
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 6438c0eac4..0c799369ef 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -143,7 +143,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
this.typesString = this.types.map((type: string) => type.toString().toLowerCase()).join(', ');
// Create an observable searching for the current DSO (return empty list if there's no current DSO)
- let currentDSOResult$;
+ let currentDSOResult$: Observable>>;
if (isNotEmpty(this.currentDSOId)) {
currentDSOResult$ = this.search(this.getCurrentDSOQuery(), 1).pipe(getFirstSucceededRemoteDataPayload());
} else {
diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts
index 8bb5554b77..088e7200d7 100644
--- a/src/app/shared/item/item-versions/item-versions.component.spec.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts
@@ -100,7 +100,9 @@ describe('ItemVersionsComponent', () => {
isAuthenticated: observableOf(true),
setRedirectUrl: {}
});
- const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+ const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', {
+ isAuthorized: observableOf(true)
+ });
const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', {
findByItem: EMPTY,
});
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 4ad6665cf8..47ae8cdb8e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -1,22 +1,16 @@
-
+
-
-
-
+
-
+
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index 5e6938853a..6f7970d71f 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -161,25 +161,22 @@ describe('ClaimedTaskActionsComponent', () => {
});
}));
- describe('when edit options is not available', () => {
- it('should display a view button', waitForAsync(() => {
- component.object = null;
- component.initObjects(mockObject);
- fixture.detectChanges();
+ it('should display a view button', waitForAsync(() => {
+ component.object = null;
+ component.initObjects(mockObject);
+ fixture.detectChanges();
- fixture.whenStable().then(() => {
- const debugElement = fixture.debugElement.query(By.css('.workflow-view'));
- expect(debugElement).toBeTruthy();
- expect(debugElement.nativeElement.innerText.trim()).toBe('submission.workflow.generic.view');
- });
+ fixture.whenStable().then(() => {
+ const debugElement = fixture.debugElement.query(By.css('.workflow-view'));
+ expect(debugElement).toBeTruthy();
+ expect(debugElement.nativeElement.innerText.trim()).toBe('submission.workflow.generic.view');
+ });
- }));
-
- it('getWorkflowItemViewRoute should return the combined uri to show a workspaceitem', waitForAsync(() => {
- const href = component.getWorkflowItemViewRoute(workflowitem);
- expect(href).toEqual('/workflowitems/333/view');
- }));
- });
+ }));
+ it('getWorkflowItemViewRoute should return the combined uri to show a workspaceitem', waitForAsync(() => {
+ const href = component.getWorkflowItemViewRoute(workflowitem);
+ expect(href).toEqual('/workflowitems/333/view');
+ }));
});
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index 65ddd76bc4..386d2c2805 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -102,14 +102,6 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent
- {{'submission.workflow.tasks.generic.processing' | translate}}
- {{'submission.workflow.tasks.pool.claim' | translate}}
+
+
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
index bce1f1a467..5686030510 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { Router } from '@angular/router';
import { By } from '@angular/platform-browser';
@@ -133,6 +133,12 @@ describe('PoolTaskActionsComponent', () => {
expect(btn).toBeDefined();
});
+ it('should display view button', () => {
+ const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+ expect(btn).toBeDefined();
+ });
+
it('should call claim task with href of getPoolTaskEndpointById', ((done) => {
const poolTaskHref = 'poolTaskHref';
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 92086ac817..45f51a5d4a 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -2,7 +2,7 @@ import { Component, Injector, Input, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs';
-import {filter, map, switchMap, take} from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
@@ -19,6 +19,7 @@ import { Item } from '../../../core/shared/item.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
/**
* This component represents mydspace actions related to PoolTask object.
@@ -58,12 +59,12 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
* @param {RequestService} requestService
*/
constructor(protected injector: Injector,
- protected router: Router,
- protected notificationsService: NotificationsService,
- protected claimedTaskService: ClaimedTaskDataService,
- protected translate: TranslateService,
- protected searchService: SearchService,
- protected requestService: RequestService) {
+ protected router: Router,
+ protected notificationsService: NotificationsService,
+ protected claimedTaskService: ClaimedTaskDataService,
+ protected translate: TranslateService,
+ protected searchService: SearchService,
+ protected requestService: RequestService) {
super(PoolTask.type, injector, router, notificationsService, translate, searchService, requestService);
}
@@ -91,7 +92,7 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
return this.objectDataService.getPoolTaskEndpointById(this.object.id)
.pipe(switchMap((poolTaskHref) => {
return this.claimedTaskService.claimTask(this.object.id, poolTaskHref);
- }));
+ }));
}
reloadObjectExecution(): Observable | DSpaceObject> {
@@ -107,12 +108,19 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
switchMap((workflowItem: WorkflowItem) => workflowItem.item.pipe(getFirstSucceededRemoteDataPayload())
))
.subscribe((item: Item) => {
- this.itemUuid = item.uuid;
- });
+ this.itemUuid = item.uuid;
+ });
}
ngOnDestroy() {
this.subs.forEach((sub) => sub.unsubscribe());
}
+ /**
+ * Get the workflowitem view route.
+ */
+ getWorkflowItemViewRoute(workflowitem: WorkflowItem): string {
+ return getWorkflowItemViewRoute(workflowitem?.id);
+ }
+
}
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
index e69de29bb2..f6e5fecb50 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
@@ -0,0 +1,5 @@
+
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
index 046eb2f018..79aece892e 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
@@ -18,6 +18,7 @@ import { getMockRequestService } from '../../mocks/request.service.mock';
import { RequestService } from '../../../core/data/request.service';
import { getMockSearchService } from '../../mocks/search-service.mock';
import { SearchService } from '../../../core/shared/search/search.service';
+import { By } from '@angular/platform-browser';
let component: WorkflowitemActionsComponent;
let fixture: ComponentFixture;
@@ -105,4 +106,10 @@ describe('WorkflowitemActionsComponent', () => {
expect(component.object).toEqual(mockObject);
});
+ it('should display view button', () => {
+ const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+ expect(btn).toBeDefined();
+ });
+
});
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
index 62a23ba66e..3587356642 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
@@ -9,6 +9,7 @@ import { WorkflowItemDataService } from '../../../core/submission/workflowitem-d
import { NotificationsService } from '../../notifications/notifications.service';
import { RequestService } from '../../../core/data/request.service';
import { SearchService } from '../../../core/shared/search/search.service';
+import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
/**
* This component represents actions related to WorkflowItem object.
@@ -44,6 +45,13 @@ export class WorkflowitemActionsComponent extends MyDSpaceActionsComponent
-
+
+
+
+
{{'submission.workflow.generic.edit' | translate}}
-
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
index f5f98a26ce..7299c28df2 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -132,6 +132,12 @@ describe('WorkspaceitemActionsComponent', () => {
expect(btn).toBeDefined();
});
+ it('should display view button', () => {
+ const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+ expect(btn).toBeDefined();
+ });
+
describe('on discard confirmation', () => {
beforeEach((done) => {
mockDataService.delete.and.returnValue(observableOf(true));
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index a25ce335e3..a6d30728ac 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -14,6 +14,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { RemoteData } from '../../../core/data/remote-data';
import { NoContent } from '../../../core/shared/NoContent.model';
+import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths';
/**
* This component represents actions related to WorkspaceItem object.
@@ -48,12 +49,12 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent