From 752cb4d4b04b0ee89cd4e4b74b8b98f449e17907 Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:19:44 +0100 Subject: [PATCH 01/38] [CST-11178] show allowed correction types --- src/app/app-routing-paths.ts | 10 ++ src/app/core/core.module.ts | 4 + .../submission/correctiontype-data.service.ts | 89 ++++++++++++++ .../models/correction-type-mode.model.ts | 35 ++++++ .../correction-type-menu.component.html | 7 ++ .../correction-type-menu.component.spec.ts | 116 ++++++++++++++++++ .../correction-type-menu.component.ts | 105 ++++++++++++++++ 7 files changed, 366 insertions(+) create mode 100644 src/app/core/submission/correctiontype-data.service.ts create mode 100644 src/app/core/submission/models/correction-type-mode.model.ts create mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html create mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts create mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index fe2837c6e3f..8430454d630 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -132,3 +132,13 @@ export const SUBSCRIPTIONS_MODULE_PATH = 'subscriptions'; export function getSubscriptionsModuleRoute() { return `/${SUBSCRIPTIONS_MODULE_PATH}`; } + +export const EDIT_ITEM_PATH = 'edit-items'; +export function getEditItemPageRoute() { + return `/${EDIT_ITEM_PATH}`; +} +export const CORRECTION_TYPE_PATH = 'corrections'; +export function getCorrectionTypePageRoute(itemUuid: string, typeId: string) { + return `/items/${itemUuid}/${CORRECTION_TYPE_PATH}/${typeId}`; +} + diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index e176af7d550..0eeb476d69d 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -185,6 +185,8 @@ import { FlatBrowseDefinition } from './shared/flat-browse-definition.model'; import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model'; import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition'; import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model'; +import { CorrectionTypeMode } from './submission/models/correction-type-mode.model'; +import { CorrectionTypeDataService } from './submission/correctiontype-data.service'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -308,6 +310,7 @@ const PROVIDERS = [ OrcidQueueDataService, OrcidHistoryDataService, SupervisionOrderDataService + CorrectionTypeDataService, ]; /** @@ -387,6 +390,7 @@ export const models = Subscription, ItemRequest, BulkAccessConditionOptions + CorrectionTypeMode ]; @NgModule({ diff --git a/src/app/core/submission/correctiontype-data.service.ts b/src/app/core/submission/correctiontype-data.service.ts new file mode 100644 index 00000000000..4d293558f7f --- /dev/null +++ b/src/app/core/submission/correctiontype-data.service.ts @@ -0,0 +1,89 @@ +import { Injectable } from '@angular/core'; + +import { dataService } from '../data/base/data-service.decorator'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { RequestService } from '../data/request.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { IdentifiableDataService } from '../data/base/identifiable-data.service'; +import { SearchDataImpl } from '../data/base/search-data'; +import { CorrectionTypeMode } from './models/correction-type-mode.model'; +import { Observable, map } from 'rxjs'; +import { RemoteData } from '../data/remote-data'; +import { PaginatedList } from '../data/paginated-list.model'; +import { FindListOptions } from '../data/find-list-options.model'; +import { RequestParam } from '../cache/models/request-param.model'; +import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../shared/operators'; + +/** + * A service that provides methods to make REST requests with correctiontypes endpoint. + */ +@Injectable() +@dataService(CorrectionTypeMode.type) +export class CorrectionTypeDataService extends IdentifiableDataService { + protected linkPath = 'correctiontypes'; + protected searchByTopic = 'findByTopic'; + protected searchFindByItem = 'findByItem'; + private searchData: SearchDataImpl; + + constructor( + protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected objectCache: ObjectCacheService, + protected halService: HALEndpointService, + protected notificationsService: NotificationsService, + ) { + super('correctiontypes', requestService, rdbService, objectCache, halService); + + this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive); + } + + /** + * Get the correction type by id + * @param id the id of the correction type + * @param useCachedVersionIfAvailable use the cached version if available + * @param reRequestOnStale re-request on stale + * @returns {Observable>} the correction type + */ + getCorrectionTypeById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable> { + return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale); + } + + /** + * Search for the correction types for the item + * @param itemUuid the uuid of the item + * @param useCachedVersionIfAvailable use the cached version if available + * @returns the list of correction types for the item + */ + findByItem(itemUuid: string, useCachedVersionIfAvailable): Observable>> { + const options = new FindListOptions(); + options.searchParams = [new RequestParam('uuid', itemUuid)]; + return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable); + } + + /** + * Find the correction type for the topic + * @param topic the topic of the correction type to search for + * @param useCachedVersionIfAvailable use the cached version if available + * @param reRequestOnStale re-request on stale + * @returns the correction type for the topic + */ + findByTopic(topic: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable { + const options = new FindListOptions(); + options.searchParams = [ + { + fieldName: 'topic', + fieldValue: topic, + }, + ]; + + return this.searchData.searchBy(this.searchByTopic, options, useCachedVersionIfAvailable, reRequestOnStale).pipe( + getAllSucceededRemoteDataPayload(), + getPaginatedListPayload(), + map((list: CorrectionTypeMode[]) => { + return list[0]; + }) + ); + } +} diff --git a/src/app/core/submission/models/correction-type-mode.model.ts b/src/app/core/submission/models/correction-type-mode.model.ts new file mode 100644 index 00000000000..b9bb033d867 --- /dev/null +++ b/src/app/core/submission/models/correction-type-mode.model.ts @@ -0,0 +1,35 @@ +import { autoserialize, deserialize } from 'cerialize'; +import { typedObject } from '../../cache/builders/build-decorators'; +import { CacheableObject } from '../../cache/cacheable-object.model'; +import { ResourceType } from '../../shared/resource-type'; +import { excludeFromEquals } from '../../utilities/equals.decorators'; +import { HALLink } from '../../shared/hal-link.model'; + +@typedObject +export class CorrectionTypeMode extends CacheableObject { + static type = new ResourceType('correctiontype'); + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + @autoserialize + id: string; + + @autoserialize + topic: string; + + @autoserialize + discoveryConfiguration: string; + + @autoserialize + creationForm: string; + + @deserialize + _links: { + self: HALLink; + }; +} diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html new file mode 100644 index 00000000000..6504d6ecaf4 --- /dev/null +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html @@ -0,0 +1,7 @@ + + + diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts new file mode 100644 index 00000000000..0f2eb02f601 --- /dev/null +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts @@ -0,0 +1,116 @@ +import { Item } from './../../../core/shared/item.model'; +import { DSpaceObject } from './../../../core/shared/dspace-object.model'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CorrectionTypeMenuComponent } from './correction-type-menu.component'; +import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { createPaginatedList } from '../../testing/utils.test'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; +import { RouterTestingModule } from '@angular/router/testing'; +import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { By } from '@angular/platform-browser'; +import { CorrectionTypeMode } from '../../../core/submission/models/correction-type-mode.model'; + +describe('CorrectionTypeMenuComponent', () => { + let component: CorrectionTypeMenuComponent; + let fixture: ComponentFixture; + let componentAsAny: any; + + let correctionTypeService: any; + let dso: DSpaceObject; + const notificationService = new NotificationsServiceStub(); + const correctionType: CorrectionTypeMode = Object.assign(new CorrectionTypeMode(), { + id: 'addpersonalpath', + creationForm:'manageRelation', + discoveryConfiguration: 'RELATION.PersonPath.Items', + topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH' + }); + + const correctionTypeObjRDList$ = createSuccessfulRemoteDataObject$(createPaginatedList([correctionType])); + + beforeEach(async () => { + dso = Object.assign(new Item(), { + id: 'test-item', + _links: { + self: { href: 'test-item-selflink' } + } + }); + + correctionTypeService = jasmine.createSpyObj('CorrectionTypeDataService', { + findByItem: jasmine.createSpy('findByItem') + }); + + await TestBed.configureTestingModule({ + declarations: [ CorrectionTypeMenuComponent ], + imports: [ + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + RouterTestingModule.withRoutes([])], + providers: [ + { provide: CorrectionTypeDataService, useValue: correctionTypeService }, + { provide: 'contextMenuObjectProvider', useValue: dso }, + { provide: 'contextMenuObjectTypeProvider', useValue: DSpaceObjectType.ITEM }, + { provide: NotificationsService, useValue: notificationService } + ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CorrectionTypeMenuComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + describe('when correction types are available', () => { + beforeEach(() => { + correctionTypeService.findByItem.and.returnValue(correctionTypeObjRDList$); + fixture = TestBed.createComponent(CorrectionTypeMenuComponent); + component = fixture.componentInstance; + componentAsAny = fixture.componentInstance; + component.contextMenuObject = dso; + fixture.detectChanges(); + }); + + it('should init properly', () => { + expect(componentAsAny.correctionTypes$.value).toEqual([correctionType]); + }); + + it('should render a button', () => { + const link = fixture.debugElement.query(By.css('button')); + expect(link).not.toBeNull(); + }); + }); + + describe('when is no data are available', () => { + beforeEach(() => { + correctionTypeService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([]))); + fixture = TestBed.createComponent(CorrectionTypeMenuComponent); + component = fixture.componentInstance; + componentAsAny = fixture.componentInstance; + component.contextMenuObject = dso; + fixture.detectChanges(); + }); + + it('should init edit mode properly', () => { + expect(componentAsAny.correctionTypes$.value).toEqual([]); + }); + + it('should render a button', () => { + const link = fixture.debugElement.query(By.css('button')); + expect(link).toBeNull(); + }); + }); +}); diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts new file mode 100644 index 00000000000..2f1b341b9fe --- /dev/null +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts @@ -0,0 +1,105 @@ +import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from './../../../core/shared/operators'; +import { CorrectionTypeDataService } from './../../../core/submission/correctiontype-data.service'; +import { DSpaceObject } from './../../../core/shared/dspace-object.model'; +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { ContextMenuEntryComponent } from '../context-menu-entry.component'; +import { ContextMenuEntryType } from '../context-menu-entry-type'; +import { BehaviorSubject, Observable, Subscription, map, startWith, tap } from 'rxjs'; +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { CorrectionTypeMode } from '../../../core/submission/models/correction-type-mode.model'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { hasValue, isNotEmpty } from '../../empty.util'; +import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; +import { getCorrectionTypePageRoute } from '../../../app-routing-paths'; + +@Component({ + selector: 'ds-correction-type-menu', + templateUrl: './correction-type-menu.component.html', +}) +@rendersContextMenuEntriesForType(DSpaceObjectType.ITEM) +export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent implements OnInit, OnDestroy { + + /** + * The menu entry type + */ + public static menuEntryType: ContextMenuEntryType = ContextMenuEntryType.CorrectionType; + + /** + * A boolean representing if a request operation is pending + * @type {BehaviorSubject} + */ + public processing$ = new BehaviorSubject(false); + + /** + * Reference to NgbModal + */ + public modalRef: NgbModalRef; + + /** + * List of Edit Modes available on this item + * for the current user + */ + private correctionTypes$: BehaviorSubject = new BehaviorSubject([]); + + /** + * Variable to track subscription and unsubscribe it onDestroy + */ + private sub: Subscription; + + constructor( + @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject, + @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, + private correctionTypeService: CorrectionTypeDataService, + public notificationService: NotificationsService + ) { + super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.EditSubmission); + } + + ngOnInit(): void { + this.notificationService.claimedProfile.subscribe(() => { + this.getData(); + }); + } + + /** + * Check if edit mode is available + */ + getCorrectionTypes(): Observable { + return this.correctionTypes$; + } + + /** + * Check if edit mode is available + */ + isAvailable(): Observable { + return this.correctionTypes$.asObservable().pipe( + map((type) => isNotEmpty(type) && type.length > 0) + ); + } + + getData(): void { + this.sub = this.correctionTypeService.findByItem(this.contextMenuObject.id, true).pipe( + tap((types) => console.log(types)), + getAllSucceededRemoteDataPayload(), + getPaginatedListPayload(), + startWith([]) + ).subscribe((types: CorrectionTypeMode[]) => { + console.log(types); + this.correctionTypes$.next(types); + }); + } + + getTypeRoute(id: string) { + return getCorrectionTypePageRoute(this.contextMenuObject.id, id); + } + + /** + * Make sure the subscription is unsubscribed from when this component is destroyed + */ + ngOnDestroy(): void { + if (hasValue(this.sub)) { + this.sub.unsubscribe(); + } + } +} From bf67fee89b1d72f65d1f80f50f0cf8dca728dd52 Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:21:38 +0100 Subject: [PATCH 02/38] [CST-11178][CST-11179] page to select the target item for "relation" correction suggestion --- src/app/app-routing.module.ts | 5 + .../quality-assurance-event-data.service.ts | 23 +- .../correction-type-menu.component.ts | 33 +-- .../correction-suggestion-page.decorator.ts | 15 ++ .../correction-suggestion-routing.module.ts | 23 ++ .../correction-suggestion.component.html | 3 + .../correction-suggestion.component.scss | 0 .../correction-suggestion.component.spec.ts | 25 ++ .../correction-suggestion.component.ts | 94 +++++++ .../correction-suggestion.module.ts | 39 +++ .../correction-types/correction-type-forms.ts | 3 + ...ge-relation-correction-type.component.html | 54 ++++ ...ge-relation-correction-type.component.scss | 0 ...relation-correction-type.component.spec.ts | 25 ++ ...nage-relation-correction-type.component.ts | 252 ++++++++++++++++++ src/themes/custom/lazy-theme.module.ts | 2 + 16 files changed, 576 insertions(+), 20 deletions(-) create mode 100644 src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts create mode 100644 src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts create mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.html create mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.scss create mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts create mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.ts create mode 100644 src/app/shared/correction-suggestion/correction-suggestion.module.ts create mode 100644 src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts create mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html create mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss create mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts create mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index deb68f1ea92..28623e3ce66 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -238,6 +238,11 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone canActivate: [AuthenticatedGuard] }, { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent }, + { + path: 'items', + loadChildren: () => import('./shared/correction-suggestion/correction-suggestion.module') + .then((m) => m.CorrectionSuggestionModule) + }, ] } ], { diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index 7f7e68afaab..c2acc7490a3 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { find, take } from 'rxjs/operators'; +import { find, switchMap, take } from 'rxjs/operators'; import { ReplaceOperation } from 'fast-json-patch'; import { HALEndpointService } from '../../../shared/hal-endpoint.service'; @@ -200,4 +200,25 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService(requestId); } + + /** + * Perform a post on an endpoint related to correction type + * @param data the data to post + * @returns the RestResponse as an Observable + */ + postData(data: string): Observable> { + const requestId = this.requestService.generateRequestId(); + const href$ = this.getBrowseEndpoint(); + + return href$.pipe( + switchMap((href: string) => { + const request = new PostRequest(requestId, href, data); + if (hasValue(this.responseMsToLive)) { + request.responseMsToLive = this.responseMsToLive; + } + this.requestService.send(request); + return this.rdbService.buildFromRequestUUID(requestId); + }) + ); + } } diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts index 2f1b341b9fe..51aaafb7e42 100644 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts @@ -4,8 +4,7 @@ import { DSpaceObject } from './../../../core/shared/dspace-object.model'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { ContextMenuEntryComponent } from '../context-menu-entry.component'; import { ContextMenuEntryType } from '../context-menu-entry-type'; -import { BehaviorSubject, Observable, Subscription, map, startWith, tap } from 'rxjs'; -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { BehaviorSubject, Observable, Subscription, map, startWith} from 'rxjs'; import { CorrectionTypeMode } from '../../../core/submission/models/correction-type-mode.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { NotificationsService } from '../../notifications/notifications.service'; @@ -25,17 +24,6 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple */ public static menuEntryType: ContextMenuEntryType = ContextMenuEntryType.CorrectionType; - /** - * A boolean representing if a request operation is pending - * @type {BehaviorSubject} - */ - public processing$ = new BehaviorSubject(false); - - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - /** * List of Edit Modes available on this item * for the current user @@ -51,9 +39,9 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject, @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, private correctionTypeService: CorrectionTypeDataService, - public notificationService: NotificationsService + public notificationService: NotificationsService, ) { - super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.EditSubmission); + super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.CorrectionType); } ngOnInit(): void { @@ -78,19 +66,26 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple ); } + /** + * Get correction types + * useCachedVersionIfAvailable = false to force refreshing the list + */ getData(): void { - this.sub = this.correctionTypeService.findByItem(this.contextMenuObject.id, true).pipe( - tap((types) => console.log(types)), + this.sub = this.correctionTypeService.findByItem(this.contextMenuObject.id, false).pipe( getAllSucceededRemoteDataPayload(), getPaginatedListPayload(), startWith([]) ).subscribe((types: CorrectionTypeMode[]) => { - console.log(types); this.correctionTypes$.next(types); }); } - getTypeRoute(id: string) { + /** + * Get the route to the correction type page + * @param id correction type id + * @returns the route to the correction type page + */ + getTypeRoute(id: string): string { return getCorrectionTypePageRoute(this.contextMenuObject.id, id); } diff --git a/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts b/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts new file mode 100644 index 00000000000..88f1c9f8025 --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts @@ -0,0 +1,15 @@ +const pageMap = new Map(); + +export function renderCorrectionFor(creationMode: string) { + return function decorator(component: any) { + if (!component) { + return; + } + pageMap.set(creationMode, component); + }; +} + +export function getCorrectionComponent(creationMode: string) { + return pageMap.get(creationMode); +} + diff --git a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts new file mode 100644 index 00000000000..e07e4749bbc --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts @@ -0,0 +1,23 @@ +import { ItemBreadcrumbResolver } from './../../core/breadcrumbs/item-breadcrumb.resolver'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { CorrectionSuggestionComponent } from './correction-suggestion.component'; + +const routes: Routes = [ + { + path: ':uuid/corrections/:correctionType', + component: CorrectionSuggestionComponent, + resolve: { + breadcrumb: ItemBreadcrumbResolver, + }, + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], + providers: [ + ItemBreadcrumbResolver + ] +}) +export class CorrectionSuggestionRoutingModule { } diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.html b/src/app/shared/correction-suggestion/correction-suggestion.component.html new file mode 100644 index 00000000000..7cc498504ee --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.scss b/src/app/shared/correction-suggestion/correction-suggestion.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts new file mode 100644 index 00000000000..c5876712a90 --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CorrectionSuggestionComponent } from './correction-suggestion.component'; + +describe('CorrectionSuggestionComponent', () => { + let component: CorrectionSuggestionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CorrectionSuggestionComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CorrectionSuggestionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.ts new file mode 100644 index 00000000000..2a2772a21dd --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.ts @@ -0,0 +1,94 @@ +import { getRemoteDataPayload } from './../../core/shared/operators'; +import { CorrectionTypeDataService } from './../../core/submission/correctiontype-data.service'; +import { Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; +import { CorrectionTypeMode } from '../../core/submission/models/correction-type-mode.model'; +import { GenericConstructor } from '../../core/shared/generic-constructor'; +import { getCorrectionComponent } from './correction-suggestion-page.decorator'; +import { ActivatedRoute, Params } from '@angular/router'; +import { hasValue } from '../empty.util'; +import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; + +@Component({ + selector: 'ds-correction-suggestion', + templateUrl: './correction-suggestion.component.html', + styleUrls: ['./correction-suggestion.component.scss'] +}) +export class CorrectionSuggestionComponent implements OnInit { + + /** + * The correction type object + */ + public correctionTypeObject: CorrectionTypeMode; + + /** + * The correction type id + */ + private correctionTypeId: string; + + /** + * The creation form + */ + private creationForm: string; + + /** + * The injector for the component + */ + public objectInjector: Injector; + + constructor( + private componentFactoryResolver: ComponentFactoryResolver, + private aroute: ActivatedRoute, + private correctionTypeDataService: CorrectionTypeDataService, + private injector: Injector, + ) { + this.aroute.params.subscribe((params: Params) => { + this.correctionTypeId = params.correctionType; + }); + } + + ngOnInit(): void { + this.initComponent(); + } + + /** + * Initialize the component by fetching the correction type object + * and rendering the correct component based on the creation form + */ + initComponent(): void { + if (hasValue(this.correctionTypeId)) { + this.correctionTypeDataService.getCorrectionTypeById(this.correctionTypeId) + .pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + ) + .subscribe((correctionType: CorrectionTypeMode) => { + if (hasValue(correctionType)) { + this.correctionTypeObject = correctionType; + this.creationForm = correctionType.creationForm; + this.componentFactoryResolver.resolveComponentFactory(this.getComponent()); + this.injectData(); + } + }); + } + } + + /** + * Inject the data into the component + */ + private injectData(): void { + this.objectInjector = Injector.create({ + providers: [ + { provide: 'correctionTypeObjectProvider', useValue: this.correctionTypeObject, deps: [] }, + ], + parent: this.injector, + }); + } + + /** + * Fetch the component depending on the creation form + * @returns {GenericConstructor} + */ + getComponent(): GenericConstructor { + return getCorrectionComponent(this.creationForm); + } +} diff --git a/src/app/shared/correction-suggestion/correction-suggestion.module.ts b/src/app/shared/correction-suggestion/correction-suggestion.module.ts new file mode 100644 index 00000000000..37204b441e6 --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-suggestion.module.ts @@ -0,0 +1,39 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { CorrectionSuggestionComponent } from './correction-suggestion.component'; +import { SharedModule } from '../shared.module'; +import { CorrectionSuggestionRoutingModule } from './correction-suggestion-routing.module'; +import { ManageRelationCorrectionTypeComponent } from './correction-types/manage-relation-correction-type/manage-relation-correction-type.component'; +import { SearchModule } from '../search/search.module'; + +const COMPONENTS = [ + CorrectionSuggestionComponent, + ManageRelationCorrectionTypeComponent, +]; + +const ENTRY_COMPONENTS = [ + ManageRelationCorrectionTypeComponent, +]; + +@NgModule({ + declarations: [ + COMPONENTS, + ], + imports: [ + CommonModule, + CorrectionSuggestionRoutingModule, + SharedModule, + SearchModule + ], + exports: [ + COMPONENTS, + ] +}) +export class CorrectionSuggestionModule { + static withEntryComponents() { + return { + ngModule: CorrectionSuggestionModule, + providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })) + }; + } + } diff --git a/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts b/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts new file mode 100644 index 00000000000..9faf8ca18be --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts @@ -0,0 +1,3 @@ +export enum CorrectionTypeForms { + MANAGE_RELATION = 'manageRelation', +} diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html new file mode 100644 index 00000000000..fe3f64e8db7 --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html @@ -0,0 +1,54 @@ +
+

+ {{ ( 'correction-type.manage-relation.' + (correctionType.topic | lowercase) + '.searchHeader' | translate) }} +

+
+
+
+ + + + + + + +
+ +

{{( 'correction-type.manage-relation.search.notFound' | translate)}}

+ +
+ +
+
+
+ +
+
+ +
+
+
diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts new file mode 100644 index 00000000000..d012163f7b3 --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ManageRelationCorrectionTypeComponent } from './manage-relation-correction-type.component'; + +describe('ManageRelationCorrectionTypeComponent', () => { + let component: ManageRelationCorrectionTypeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ManageRelationCorrectionTypeComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ManageRelationCorrectionTypeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts new file mode 100644 index 00000000000..5f5d5b9c45e --- /dev/null +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -0,0 +1,252 @@ +import { NotificationsService } from './../../../notifications/notifications.service'; +import { OpenaireBrokerEventObject } from './../../../../core/openaire/broker/models/openaire-broker-event.model'; +import { getFirstSucceededRemoteDataPayload } from './../../../../core/shared/operators'; +import { ItemDataService } from './../../../../core/data/item-data.service'; +import { OpenaireBrokerEventRestService } from './../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; +import { Context } from './../../../../core/shared/context.model'; +import { CollectionElementLinkType } from './../../../object-collection/collection-element-link.type'; +import { DSpaceObject } from './../../../../core/shared/dspace-object.model'; +import { SearchResult } from './../../../search/models/search-result.model'; +import { RemoteData } from './../../../../core/data/remote-data'; +import { PaginatedList } from './../../../../core/data/paginated-list.model'; +import { PaginatedSearchOptions } from './../../../search/models/paginated-search-options.model'; +import { SelectableListService } from './../../../object-list/selectable-list/selectable-list.service'; +import { SearchService } from './../../../../core/shared/search/search.service'; +import { PaginationComponentOptions } from './../../../pagination/pagination-component-options.model'; +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { renderCorrectionFor } from '../../correction-suggestion-page.decorator'; +import { CorrectionTypeMode } from '../../../../core/submission/models/correction-type-mode.model'; +import { CorrectionTypeForms } from './../correction-type-forms'; +import { ActivatedRoute, Params, Router } from '@angular/router'; +import { Observable, Subscription, of as observableOf, switchMap } from 'rxjs'; +import { hasValue, isNotEmpty } from '../../../../shared/empty.util'; +import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model'; +import { Item } from '../../../../core/shared/item.model'; +import { ImportType } from '../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; + +@Component({ + selector: 'ds-manage-relation-correction-type', + templateUrl: './manage-relation-correction-type.component.html', + styleUrls: ['./manage-relation-correction-type.component.scss'] +}) +@renderCorrectionFor(CorrectionTypeForms.MANAGE_RELATION) +export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy { + + /** + * The correction type object + */ + correctionType: CorrectionTypeMode; + + /** + * The item uuid from the parent object + */ + itemUuid: string; + + /** + * The project title from the parent object + */ + projectTitle = ''; + + /** + * Pagination options + */ + pagination: PaginationComponentOptions; + + /** + * The number of results per page + */ + pageSize = 3; + + /** + * Entities to show in the list + */ + localEntitiesRD$: Observable>>>; + + /** + * Search options to use for fetching projects + */ + searchOptions: PaginatedSearchOptions; + + /** + * The list of subscriptions + */ + protected subs: Subscription[] = []; + + /** + * Information about the data loading status + */ + isLoading$ = observableOf(true); + + /** + * The selected local entity + */ + selectedEntity: ListableObject; + + /** + * The type of link to render in listable elements + */ + linkTypes = CollectionElementLinkType; + + /** + * The context we're currently in (submission) + */ + context = Context.Search; + + /** + * List ID for selecting local entities + */ + entityListId = 'correction-suggestion-manage-relation'; + /** + * List ID for selecting local authorities + */ + authorityListId = 'correction-suggestion-manage-relation-authority'; + + /** + * ImportType enum + */ + importType = ImportType; + + /** + * The type of import the user currently has selected + */ + selectedImportType = ImportType.None; + + constructor( + @Inject('correctionTypeObjectProvider') private correctionTypeObject: CorrectionTypeMode, + public searchService: SearchService, + private selectService: SelectableListService, + private aroute: ActivatedRoute, + private openaireBrokerEventRestService: OpenaireBrokerEventRestService, + private itemService: ItemDataService, + private notificationsService: NotificationsService, + private router: Router + ) { + this.correctionType = correctionTypeObject; + this.aroute.params.subscribe((params: Params) => { + this.itemUuid = params.uuid; + }); + } + + /** + * Get the search results + */ + ngOnInit(): void { + this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'correction-suggestion-manage-relation', pageSize: this.pageSize }); + this.searchOptions = Object.assign(new PaginatedSearchOptions( + { + configuration: this.correctionType.discoveryConfiguration, + scope: this.itemUuid, + pagination: this.pagination + } + )); + + this.localEntitiesRD$ = this.searchService.search(this.searchOptions); + this.subs.push( + this.localEntitiesRD$.subscribe( + () => this.isLoading$ = observableOf(false) + ) + ); + } + + + /** + * Perform a project search by title. + */ + public search(searchTitle): void { + if (isNotEmpty(searchTitle)) { + const filterRegEx = /[:]/g; + this.isLoading$ = observableOf(true); + this.searchOptions = Object.assign(new PaginatedSearchOptions( + { + configuration: this.correctionType.discoveryConfiguration, + query: (searchTitle) ? searchTitle.replace(filterRegEx, '') : searchTitle, + scope: this.itemUuid, + pagination: this.pagination + } + )); + this.localEntitiesRD$ = this.searchService.search(this.searchOptions); + this.subs.push( + this.localEntitiesRD$.subscribe( + () => this.isLoading$ = observableOf(false) + ) + ); + } + } + + /** + * Deselected a local entity + */ + public deselectEntity(): void { + this.selectedEntity = undefined; + if (this.selectedImportType === ImportType.LocalEntity) { + this.selectedImportType = ImportType.None; + } + } + + /** + * Selected a local entity + * @param entity + */ + public selectEntity(entity): void { + this.selectedEntity = entity; + this.selectedImportType = ImportType.LocalEntity; + } + + /** + * Deselect every element from both entity and authority lists + */ + public deselectAllLists(): void { + this.selectService.deselectAll(this.entityListId); + this.selectService.deselectAll(this.authorityListId); + } + + /** + * Perform the action based on the correction type + * by posting the data to the OpenAIRE Broker Event API. + * Data is formatted as follows, in the exact order: + * + * + * + */ + performAction() { + if (hasValue(this.selectedEntity)) { + const selectedItemLink = (this.selectedEntity as SearchResult).indexableObject._links.self.href; + + this.itemService.findById(this.itemUuid).pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((item: Item) => { + console.log(item); + const data: string = item._links.self.href + '\n' + selectedItemLink + '\n' + this.correctionTypeObject._links.self.href; + return this.openaireBrokerEventRestService.postData(data); + }) + ).subscribe((res: RemoteData) => { + if (res.hasSucceeded) { + this.selectedImportType = ImportType.None; + // TODO: show success message based on the type of correction + this.notificationsService.success('Correction suggestion submitted', 'The correction suggestion has been submitted'); + this.deselectAllLists(); + this.back(); + } else { + this.notificationsService.error('Error submitting correction suggestion', 'The correction suggestion could not be submitted'); + } + }); + } + } + + /** + * Navigate back to the previous page + */ + back() { + this.router.navigate(['../'], { relativeTo: this.aroute }); + } + + /** + * Unsubscribe from all subscriptions. + */ + ngOnDestroy(): void { + this.deselectAllLists(); + this.subs + .filter((sub) => hasValue(sub)) + .forEach((sub) => sub.unsubscribe()); + } +} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index edb3f5478c9..bff10cdd5a3 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -1,3 +1,4 @@ +import { CorrectionSuggestionModule } from './../../app/shared/correction-suggestion/correction-suggestion.module'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; @@ -299,6 +300,7 @@ const DECLARATIONS = [ NgxGalleryModule, FormModule, RequestCopyModule, + CorrectionSuggestionModule, ], declarations: DECLARATIONS, exports: [ From d49185e449faeacf32723330a488d4300737873a Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:23:01 +0100 Subject: [PATCH 03/38] [CST-11178][CST-11179] POST action of correction suggestion --- .../quality-assurance-event-data.service.ts | 3 ++- .../correction-suggestion.component.ts | 2 +- ...nage-relation-correction-type.component.ts | 23 ++++++++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index c2acc7490a3..ae1538f7bb2 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -25,6 +25,7 @@ import { SearchData, SearchDataImpl } from '../../../data/base/search-data'; import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; import { hasValue } from '../../../../shared/empty.util'; import { DeleteByIDRequest, PostRequest } from '../../../data/request.models'; +import { HttpHeaders } from '@angular/common/http'; /** * The service handling all Quality Assurance topic REST requests. @@ -212,7 +213,7 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService { - const request = new PostRequest(requestId, href, data); + const request = new PostRequest(requestId, href, data, { headers: new HttpHeaders().set('Content-Type', 'text/uri-list') }); if (hasValue(this.responseMsToLive)) { request.responseMsToLive = this.responseMsToLive; } diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.ts index 2a2772a21dd..dcf379bd771 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.ts @@ -6,7 +6,7 @@ import { GenericConstructor } from '../../core/shared/generic-constructor'; import { getCorrectionComponent } from './correction-suggestion-page.decorator'; import { ActivatedRoute, Params } from '@angular/router'; import { hasValue } from '../empty.util'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; @Component({ selector: 'ds-correction-suggestion', diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 5f5d5b9c45e..3ad300a2a65 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -1,6 +1,6 @@ import { NotificationsService } from './../../../notifications/notifications.service'; import { OpenaireBrokerEventObject } from './../../../../core/openaire/broker/models/openaire-broker-event.model'; -import { getFirstSucceededRemoteDataPayload } from './../../../../core/shared/operators'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from './../../../../core/shared/operators'; import { ItemDataService } from './../../../../core/data/item-data.service'; import { OpenaireBrokerEventRestService } from './../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; import { Context } from './../../../../core/shared/context.model'; @@ -23,6 +23,7 @@ import { hasValue, isNotEmpty } from '../../../../shared/empty.util'; import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model'; import { Item } from '../../../../core/shared/item.model'; import { ImportType } from '../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'ds-manage-relation-correction-type', @@ -119,7 +120,8 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy private openaireBrokerEventRestService: OpenaireBrokerEventRestService, private itemService: ItemDataService, private notificationsService: NotificationsService, - private router: Router + private router: Router, + private translate: TranslateService ) { this.correctionType = correctionTypeObject; this.aroute.params.subscribe((params: Params) => { @@ -134,8 +136,8 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'correction-suggestion-manage-relation', pageSize: this.pageSize }); this.searchOptions = Object.assign(new PaginatedSearchOptions( { - configuration: this.correctionType.discoveryConfiguration, - scope: this.itemUuid, + configuration: 'default', //this.correctionType.discoveryConfiguration, + scope: null, pagination: this.pagination } )); @@ -148,7 +150,6 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy ); } - /** * Perform a project search by title. */ @@ -215,19 +216,19 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy this.itemService.findById(this.itemUuid).pipe( getFirstSucceededRemoteDataPayload(), switchMap((item: Item) => { - console.log(item); - const data: string = item._links.self.href + '\n' + selectedItemLink + '\n' + this.correctionTypeObject._links.self.href; + const data: string = this.correctionTypeObject._links.self.href + '\n' + item._links.self.href + '\n' + selectedItemLink; return this.openaireBrokerEventRestService.postData(data); - }) + }), + getFirstCompletedRemoteData() ).subscribe((res: RemoteData) => { if (res.hasSucceeded) { this.selectedImportType = ImportType.None; - // TODO: show success message based on the type of correction - this.notificationsService.success('Correction suggestion submitted', 'The correction suggestion has been submitted'); + const message = 'correction-type.manage-relation.' + this.correctionTypeObject.id + '.notification.success'; + this.notificationsService.success(this.translate.instant(message)); this.deselectAllLists(); this.back(); } else { - this.notificationsService.error('Error submitting correction suggestion', 'The correction suggestion could not be submitted'); + this.notificationsService.error(this.translate.instant('correction-type.manage-relation.action.notification.error')); } }); } From eeefd867d471e1b1d7750695e208c4ec4eb0a1b9 Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:24:10 +0100 Subject: [PATCH 04/38] [CST-11179][CST-11178] Fixes --- .../submission/correctiontype-data.service.ts | 18 +- .../models/correction-type-mode.model.ts | 2 +- .../correction-type-menu.component.spec.ts | 4 +- .../correction-type-menu.component.ts | 8 +- .../correction-suggestion.component.spec.ts | 59 ++++++- .../correction-suggestion.component.ts | 12 +- ...ge-relation-correction-type.component.html | 4 +- ...relation-correction-type.component.spec.ts | 154 +++++++++++++++++- ...nage-relation-correction-type.component.ts | 20 +-- 9 files changed, 240 insertions(+), 41 deletions(-) diff --git a/src/app/core/submission/correctiontype-data.service.ts b/src/app/core/submission/correctiontype-data.service.ts index 4d293558f7f..d9675894d32 100644 --- a/src/app/core/submission/correctiontype-data.service.ts +++ b/src/app/core/submission/correctiontype-data.service.ts @@ -8,7 +8,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv import { ObjectCacheService } from '../cache/object-cache.service'; import { IdentifiableDataService } from '../data/base/identifiable-data.service'; import { SearchDataImpl } from '../data/base/search-data'; -import { CorrectionTypeMode } from './models/correction-type-mode.model'; +import { CorrectionType } from './models/correction-type-mode.model'; import { Observable, map } from 'rxjs'; import { RemoteData } from '../data/remote-data'; import { PaginatedList } from '../data/paginated-list.model'; @@ -20,12 +20,12 @@ import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../sh * A service that provides methods to make REST requests with correctiontypes endpoint. */ @Injectable() -@dataService(CorrectionTypeMode.type) -export class CorrectionTypeDataService extends IdentifiableDataService { +@dataService(CorrectionType.type) +export class CorrectionTypeDataService extends IdentifiableDataService { protected linkPath = 'correctiontypes'; protected searchByTopic = 'findByTopic'; protected searchFindByItem = 'findByItem'; - private searchData: SearchDataImpl; + private searchData: SearchDataImpl; constructor( protected requestService: RequestService, @@ -44,9 +44,9 @@ export class CorrectionTypeDataService extends IdentifiableDataService>} the correction type + * @returns {Observable>} the correction type */ - getCorrectionTypeById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable> { + getCorrectionTypeById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable> { return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale); } @@ -56,7 +56,7 @@ export class CorrectionTypeDataService extends IdentifiableDataService>> { + findByItem(itemUuid: string, useCachedVersionIfAvailable): Observable>> { const options = new FindListOptions(); options.searchParams = [new RequestParam('uuid', itemUuid)]; return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable); @@ -69,7 +69,7 @@ export class CorrectionTypeDataService extends IdentifiableDataService { + findByTopic(topic: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable { const options = new FindListOptions(); options.searchParams = [ { @@ -81,7 +81,7 @@ export class CorrectionTypeDataService extends IdentifiableDataService { + map((list: CorrectionType[]) => { return list[0]; }) ); diff --git a/src/app/core/submission/models/correction-type-mode.model.ts b/src/app/core/submission/models/correction-type-mode.model.ts index b9bb033d867..4daac538933 100644 --- a/src/app/core/submission/models/correction-type-mode.model.ts +++ b/src/app/core/submission/models/correction-type-mode.model.ts @@ -6,7 +6,7 @@ import { excludeFromEquals } from '../../utilities/equals.decorators'; import { HALLink } from '../../shared/hal-link.model'; @typedObject -export class CorrectionTypeMode extends CacheableObject { +export class CorrectionType extends CacheableObject { static type = new ResourceType('correctiontype'); /** diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts index 0f2eb02f601..a6713a12a8c 100644 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts @@ -13,7 +13,7 @@ import { CorrectionTypeDataService } from '../../../core/submission/correctionty import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { NotificationsService } from '../../notifications/notifications.service'; import { By } from '@angular/platform-browser'; -import { CorrectionTypeMode } from '../../../core/submission/models/correction-type-mode.model'; +import { CorrectionType } from '../../../core/submission/models/correction-type-mode.model'; describe('CorrectionTypeMenuComponent', () => { let component: CorrectionTypeMenuComponent; @@ -23,7 +23,7 @@ describe('CorrectionTypeMenuComponent', () => { let correctionTypeService: any; let dso: DSpaceObject; const notificationService = new NotificationsServiceStub(); - const correctionType: CorrectionTypeMode = Object.assign(new CorrectionTypeMode(), { + const correctionType: CorrectionType = Object.assign(new CorrectionType(), { id: 'addpersonalpath', creationForm:'manageRelation', discoveryConfiguration: 'RELATION.PersonPath.Items', diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts index 51aaafb7e42..ac209757b7a 100644 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts @@ -5,7 +5,7 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { ContextMenuEntryComponent } from '../context-menu-entry.component'; import { ContextMenuEntryType } from '../context-menu-entry-type'; import { BehaviorSubject, Observable, Subscription, map, startWith} from 'rxjs'; -import { CorrectionTypeMode } from '../../../core/submission/models/correction-type-mode.model'; +import { CorrectionType } from '../../../core/submission/models/correction-type-mode.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { NotificationsService } from '../../notifications/notifications.service'; import { hasValue, isNotEmpty } from '../../empty.util'; @@ -28,7 +28,7 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple * List of Edit Modes available on this item * for the current user */ - private correctionTypes$: BehaviorSubject = new BehaviorSubject([]); + private correctionTypes$: BehaviorSubject = new BehaviorSubject([]); /** * Variable to track subscription and unsubscribe it onDestroy @@ -53,7 +53,7 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple /** * Check if edit mode is available */ - getCorrectionTypes(): Observable { + getCorrectionTypes(): Observable { return this.correctionTypes$; } @@ -75,7 +75,7 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple getAllSucceededRemoteDataPayload(), getPaginatedListPayload(), startWith([]) - ).subscribe((types: CorrectionTypeMode[]) => { + ).subscribe((types: CorrectionType[]) => { this.correctionTypes$.next(types); }); } diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts index c5876712a90..cdb793f7ea8 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts @@ -1,14 +1,61 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { CorrectionSuggestionComponent } from './correction-suggestion.component'; +import { ActivatedRoute } from '@angular/router'; +import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { CommonModule } from '@angular/common'; +import { BrowserModule } from '@angular/platform-browser'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('CorrectionSuggestionComponent', () => { let component: CorrectionSuggestionComponent; let fixture: ComponentFixture; + const correctionTypeMock = { + id: 'addpersonalpath', + topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH', + discoveryConfiguration: 'RELATION.PersonPath.Items', + creationForm: 'manageRelation', + type: 'correctiontype', + _links: { + self: { + href: 'https://rest.api/discover/configurations/addpersonalpath', + }, + }, + }; + + const correctionTypeMockRD$ = createSuccessfulRemoteDataObject$(correctionTypeMock); + + const mockActivatedRoute = { + snapshot:{ + params: { + correctionType: 'addpersonalpath' + } + } + }; + + let correctionTypeDataService: any; + beforeEach(async () => { + correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService', { + getCorrectionTypeById: jasmine.createSpy('getCorrectionTypeById') + }); + await TestBed.configureTestingModule({ - declarations: [ CorrectionSuggestionComponent ] + declarations: [ CorrectionSuggestionComponent ], + imports: [ + CommonModule, + BrowserModule, + TranslateModule.forRoot(), + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: CorrectionTypeDataService, useValue: correctionTypeDataService }, + ], + schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); }); @@ -16,10 +63,18 @@ describe('CorrectionSuggestionComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(CorrectionSuggestionComponent); component = fixture.componentInstance; + correctionTypeDataService.getCorrectionTypeById.and.returnValue(correctionTypeMockRD$); + spyOn(component, 'initComponent'); + fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should subscribe to route params and set correctionTypeId & initialize component', () => { + expect((component as any).correctionTypeId).toEqual('addpersonalpath'); + expect(component.initComponent).toHaveBeenCalled(); + }); }); diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.ts index dcf379bd771..5cd23e9b32f 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.ts @@ -1,10 +1,10 @@ import { getRemoteDataPayload } from './../../core/shared/operators'; import { CorrectionTypeDataService } from './../../core/submission/correctiontype-data.service'; import { Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; -import { CorrectionTypeMode } from '../../core/submission/models/correction-type-mode.model'; +import { CorrectionType } from '../../core/submission/models/correction-type-mode.model'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { getCorrectionComponent } from './correction-suggestion-page.decorator'; -import { ActivatedRoute, Params } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { hasValue } from '../empty.util'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; @@ -18,7 +18,7 @@ export class CorrectionSuggestionComponent implements OnInit { /** * The correction type object */ - public correctionTypeObject: CorrectionTypeMode; + public correctionTypeObject: CorrectionType; /** * The correction type id @@ -41,9 +41,7 @@ export class CorrectionSuggestionComponent implements OnInit { private correctionTypeDataService: CorrectionTypeDataService, private injector: Injector, ) { - this.aroute.params.subscribe((params: Params) => { - this.correctionTypeId = params.correctionType; - }); + this.correctionTypeId = this.aroute.snapshot.params.correctionType; } ngOnInit(): void { @@ -61,7 +59,7 @@ export class CorrectionSuggestionComponent implements OnInit { getFirstCompletedRemoteData(), getRemoteDataPayload(), ) - .subscribe((correctionType: CorrectionTypeMode) => { + .subscribe((correctionType: CorrectionType) => { if (hasValue(correctionType)) { this.correctionTypeObject = correctionType; this.creationForm = correctionType.creationForm; diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html index fe3f64e8db7..f7e62857dfc 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html @@ -11,9 +11,9 @@

[placeholder]="'correction-type.manage-relation.search.placeholder' | translate" aria-label="" aria-describedby="">
+ (click)="projectTitle = ''">{{('correction-type.manage-relation.search.btn.clear' | translate)}} + (click)="search(projectTitle)">{{('correction-type.manage-relation.search.btn.search' | translate)}}
diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts index d012163f7b3..a329138c06b 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts @@ -1,25 +1,173 @@ +import { ThemeService } from './../../../theme-support/theme.service'; + +import { SearchModule } from './../../../search/search.module'; +import { RouterMock } from './../../../mocks/router.mock'; +import { NotificationsService } from './../../../notifications/notifications.service'; +import { ItemDataService } from './../../../../core/data/item-data.service'; +import { OpenaireBrokerEventRestService } from './../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; +import { Item } from './../../../../core/shared/item.model'; +import { SelectableListService } from './../../../object-list/selectable-list/selectable-list.service'; +import { OpenaireMockDspaceObject, getMockOpenaireBrokerEventRestService } from './../../../mocks/openaire.mock'; +import { PaginatedSearchOptions } from './../../../search/models/paginated-search-options.model'; +import { PaginationComponentOptions } from './../../../pagination/pagination-component-options.model'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ManageRelationCorrectionTypeComponent } from './manage-relation-correction-type.component'; +import { PageInfo } from './../../../../core/shared/page-info.model'; +import { buildPaginatedList } from './../../../../core/data/paginated-list.model'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from './../../../../shared/remote-data.utils'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { CommonModule } from '@angular/common'; +import { RouterTestingModule } from '@angular/router/testing'; +import { Component, NO_ERRORS_SCHEMA } from '@angular/core'; +import { SearchService } from './../../../../core/shared/search/search.service'; +import { of } from 'rxjs'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MockActivatedRoute } from './../../../../shared/mocks/active-router.mock'; +import { NotificationsServiceStub } from './../../../../shared/testing/notifications-service.stub'; +import { getMockTranslateService } from './../../../../shared/mocks/translate.service.mock'; +import { TranslateLoaderMock } from './../../../../shared/mocks/translate-loader.mock'; +import { SearchServiceStub } from './../../../../shared/testing/search-service.stub'; +import { BrowserModule } from '@angular/platform-browser'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { getMockThemeService } from './../../../../shared/mocks/theme-service.mock'; +import { ImportType } from './../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; describe('ManageRelationCorrectionTypeComponent', () => { let component: ManageRelationCorrectionTypeComponent; + let compAsAny: any; let fixture: ComponentFixture; + const correctionTypeMock = { + id: 'addpersonalpath', + topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH', + discoveryConfiguration: 'RELATION.PersonPath.Items', + creationForm: 'manageRelation', + type: 'correctiontype', + _links: { + self: { + href: 'https://rest.api/discover/configurations/addpersonalpath', + }, + }, + }; + + const pagination = Object.assign( + new PaginationComponentOptions(), { + id: 'correction-suggestion-manage-relation', + pageSize: 3 + } + ); + + const uuid = '123e4567-e89b-12d3-a456-426614174003'; + + const searchOptions = Object.assign(new PaginatedSearchOptions( + { + configuration: 'RELATION.PersonPath.Items', + scope: '123e4567-e89b-12d3-a456-426614174013', + pagination: pagination + } + )); + + const pageInfo = new PageInfo({ + elementsPerPage: 3, + totalElements: 1, + totalPages: 1, + currentPage: 1 + }); + + const array = [ + OpenaireMockDspaceObject, + ]; + const paginatedList = buildPaginatedList(pageInfo, array); + const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + + const searchServiceStub = Object.assign(new SearchServiceStub(), { + search: () => of(paginatedListRD), + }); + + const openaireBrokerEventRestServiceStub: any = getMockOpenaireBrokerEventRestService(); + + const itemDataService = { + findById: (id: string) => createSuccessfulRemoteDataObject$(new Item()) + }; + beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ManageRelationCorrectionTypeComponent ] - }) - .compileComponents(); + declarations: [ManageRelationCorrectionTypeComponent, TestComponent ], + imports: [ + CommonModule, + BrowserModule, + NoopAnimationsModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + RouterTestingModule.withRoutes([]), + SearchModule + ], + providers: [ + { provide: 'correctionTypeObjectProvider', useValue: correctionTypeMock }, + { provide: SearchService, useValue: searchServiceStub }, + { provide: OpenaireBrokerEventRestService, useValue: openaireBrokerEventRestServiceStub }, + { provide: SelectableListService, useValue: jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']) }, + { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, + { provide: ItemDataService, useValue: itemDataService }, + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: Router, useValue: new RouterMock() }, + { provide: TranslateService, useValue: getMockTranslateService() }, + { provide: ThemeService, useValue: getMockThemeService() }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ManageRelationCorrectionTypeComponent); component = fixture.componentInstance; + compAsAny = component as any; + component.localEntitiesRD$ = createSuccessfulRemoteDataObject$(paginatedList); fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + describe('search', () => { + it('should call SearchService.search', () => { + (searchServiceStub as any).search.and.returnValue(of(paginatedListRD)); + component.pagination = pagination; + component.search(''); + expect(compAsAny.searchService.search).toHaveBeenCalledWith(searchOptions); + }); + }); + + describe('selectEntity', () => { + const entity = Object.assign(new Item(), { uuid: uuid }); + beforeEach(() => { + component.selectEntity(entity); + }); + it('should set selected entity', () => { + expect(component.selectedEntity).toBe(entity); + }); + it('should set the import type to local entity', () => { + expect(component.selectedImportType).toEqual(ImportType.LocalEntity); + }); + }); + + afterEach(() => { + fixture.destroy(); + component = null; + compAsAny = null; + }); }); + +@Component({ + selector: 'ds-test-cmp', + template: `` +}) +class TestComponent { + +} diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 3ad300a2a65..9275101125e 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -15,9 +15,9 @@ import { SearchService } from './../../../../core/shared/search/search.service'; import { PaginationComponentOptions } from './../../../pagination/pagination-component-options.model'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { renderCorrectionFor } from '../../correction-suggestion-page.decorator'; -import { CorrectionTypeMode } from '../../../../core/submission/models/correction-type-mode.model'; +import { CorrectionType } from '../../../../core/submission/models/correction-type-mode.model'; import { CorrectionTypeForms } from './../correction-type-forms'; -import { ActivatedRoute, Params, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { Observable, Subscription, of as observableOf, switchMap } from 'rxjs'; import { hasValue, isNotEmpty } from '../../../../shared/empty.util'; import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model'; @@ -36,7 +36,7 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy /** * The correction type object */ - correctionType: CorrectionTypeMode; + correctionType: CorrectionType; /** * The item uuid from the parent object @@ -113,20 +113,18 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy selectedImportType = ImportType.None; constructor( - @Inject('correctionTypeObjectProvider') private correctionTypeObject: CorrectionTypeMode, - public searchService: SearchService, + @Inject('correctionTypeObjectProvider') private correctionTypeObject: CorrectionType, + private searchService: SearchService, private selectService: SelectableListService, private aroute: ActivatedRoute, private openaireBrokerEventRestService: OpenaireBrokerEventRestService, private itemService: ItemDataService, private notificationsService: NotificationsService, private router: Router, - private translate: TranslateService + private translateService: TranslateService ) { this.correctionType = correctionTypeObject; - this.aroute.params.subscribe((params: Params) => { - this.itemUuid = params.uuid; - }); + this.itemUuid = this.aroute.snapshot.params.uuid; } /** @@ -224,11 +222,11 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy if (res.hasSucceeded) { this.selectedImportType = ImportType.None; const message = 'correction-type.manage-relation.' + this.correctionTypeObject.id + '.notification.success'; - this.notificationsService.success(this.translate.instant(message)); + this.notificationsService.success(this.translateService.get(message)); this.deselectAllLists(); this.back(); } else { - this.notificationsService.error(this.translate.instant('correction-type.manage-relation.action.notification.error')); + this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); } }); } From d7857a6036c9bf08df3e1b3c7d7c3a17b87b82b5 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 9 Aug 2023 18:28:54 +0200 Subject: [PATCH 05/38] [CST-11179][CST-11178] fix --- .../manage-relation-correction-type.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 9275101125e..eee2053e8d3 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -134,8 +134,8 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'correction-suggestion-manage-relation', pageSize: this.pageSize }); this.searchOptions = Object.assign(new PaginatedSearchOptions( { - configuration: 'default', //this.correctionType.discoveryConfiguration, - scope: null, + configuration: this.correctionType.discoveryConfiguration, + scope: this.itemUuid, pagination: this.pagination } )); From c50dd72d9228fbfcc6d3deee9babf8d1fa876dab Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 10 Aug 2023 09:29:25 +0200 Subject: [PATCH 06/38] [CST-11178][CST-11179] allow access for authorized user only --- .../correction-type-menu.component.html | 2 +- .../correction-type-menu.component.ts | 17 +++++++++++++---- .../correction-suggestion-routing.module.ts | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html index 6504d6ecaf4..2f3b46279db 100644 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html @@ -1,4 +1,4 @@ - + From ac7cf5b4bac18baf236b3b3517702d9d3037f392 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 29 Aug 2023 11:30:29 +0200 Subject: [PATCH 11/38] [CST-11178] Fix issue while retrieving the id --- .../manage-relation-correction-type.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 4db0aff5283..3f8ebec197b 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -128,7 +128,7 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy private translateService: TranslateService ) { this.correctionType = correctionTypeObject; - this.itemUuid = this.aroute.snapshot.params.uuid; + this.itemUuid = this.aroute.snapshot.params.id; } /** From 1a525dfbe7bde36567a65e374d39202b2c23ff98 Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:28:40 +0100 Subject: [PATCH 12/38] [CST-11179] Fixed breadcrumb & refresh & labels & redirection from /full page --- src/app/item-page/item-page-routing.module.ts | 6 +++++ .../correction-suggestion-routing.module.ts | 9 ++++--- .../correction-suggestion.component.ts | 4 ++- ...nage-relation-correction-type.component.ts | 26 +++++++++++-------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 1d683201f0b..04e4ba21797 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -48,6 +48,12 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; .then((m) => m.CorrectionSuggestionModule), canActivate: [AuthenticatedGuard] }, + { + path: `full/${CORRECTION_TYPE_PATH}` , + loadChildren: () => import('../shared/correction-suggestion/correction-suggestion.module') + .then((m) => m.CorrectionSuggestionModule), + canActivate: [AuthenticatedGuard] + }, { path: ITEM_EDIT_PATH, loadChildren: () => import('./edit-item-page/edit-item-page.module') diff --git a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts index 07b1066e6be..b562785f860 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts @@ -1,15 +1,16 @@ -import { ItemBreadcrumbResolver } from './../../core/breadcrumbs/item-breadcrumb.resolver'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { CorrectionSuggestionComponent } from './correction-suggestion.component'; +import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; const routes: Routes = [ { path: ':correctionType', component: CorrectionSuggestionComponent, resolve: { - breadcrumb: ItemBreadcrumbResolver, - } + breadcrumb: I18nBreadcrumbResolver + }, + data: { title: 'item-correction-suggestion.correction-type', breadcrumbKey: 'item-correction-suggestion.correction-type' }, } ]; @@ -17,7 +18,7 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], providers: [ - ItemBreadcrumbResolver + I18nBreadcrumbResolver ] }) export class CorrectionSuggestionRoutingModule { } diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.ts index 5cd23e9b32f..df70a1756fb 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion.component.ts @@ -1,6 +1,6 @@ import { getRemoteDataPayload } from './../../core/shared/operators'; import { CorrectionTypeDataService } from './../../core/submission/correctiontype-data.service'; -import { Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; import { CorrectionType } from '../../core/submission/models/correction-type-mode.model'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { getCorrectionComponent } from './correction-suggestion-page.decorator'; @@ -40,6 +40,7 @@ export class CorrectionSuggestionComponent implements OnInit { private aroute: ActivatedRoute, private correctionTypeDataService: CorrectionTypeDataService, private injector: Injector, + private chd: ChangeDetectorRef, ) { this.correctionTypeId = this.aroute.snapshot.params.correctionType; } @@ -65,6 +66,7 @@ export class CorrectionSuggestionComponent implements OnInit { this.creationForm = correctionType.creationForm; this.componentFactoryResolver.resolveComponentFactory(this.getComponent()); this.injectData(); + this.chd.detectChanges(); } }); } diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 3f8ebec197b..63e388bf7fc 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -55,12 +55,11 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy /** * Pagination options */ - pagination: PaginationComponentOptions; - - /** - * The number of results per page - */ - pageSize = 3; + pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'csmr', + pageSize: 3, + currentPage: 1 + }); /** * Entities to show in the list @@ -125,7 +124,7 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy private itemService: ItemDataService, private notificationsService: NotificationsService, private router: Router, - private translateService: TranslateService + private translateService: TranslateService, ) { this.correctionType = correctionTypeObject; this.itemUuid = this.aroute.snapshot.params.id; @@ -135,7 +134,6 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy * Get the search results */ ngOnInit(): void { - this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'correction-suggestion-manage-relation', pageSize: this.pageSize }); this.searchOptions = Object.assign(new PaginatedSearchOptions( { configuration: this.correctionType.discoveryConfiguration, @@ -146,8 +144,12 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy this.localEntitiesRD$ = this.searchService.search(this.searchOptions); this.subs.push( - this.localEntitiesRD$.subscribe( - () => this.isLoading$ = observableOf(false) + this.localEntitiesRD$.pipe( + getFirstCompletedRemoteData(), + ).subscribe( + () => { + this.isLoading$ = observableOf(false); + } ) ); } @@ -169,7 +171,9 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy )); this.localEntitiesRD$ = this.searchService.search(this.searchOptions); this.subs.push( - this.localEntitiesRD$.subscribe( + this.localEntitiesRD$.pipe( + getFirstCompletedRemoteData(), + ).subscribe( () => this.isLoading$ = observableOf(false) ) ); From 143916c6049b1a13caa7bccc8edc06bb2263e3ed Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 6 Sep 2023 15:54:39 +0200 Subject: [PATCH 13/38] [CST-11178][CST-11179] fixed pagination for relationship management --- ...ge-relation-correction-type.component.html | 30 ++++---- ...nage-relation-correction-type.component.ts | 75 ++++++++++++------- 2 files changed, 63 insertions(+), 42 deletions(-) diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html index f7e62857dfc..32824cf6350 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html @@ -11,26 +11,28 @@

[placeholder]="'correction-type.manage-relation.search.placeholder' | translate" aria-label="" aria-describedby="">
+ (click)="projectTitle = ''; search('')">{{('correction-type.manage-relation.search.btn.clear' | translate)}}
- - + + +
diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index 63e388bf7fc..6e285c2987f 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -20,7 +20,7 @@ import { renderCorrectionFor } from '../../correction-suggestion-page.decorator' import { CorrectionType } from '../../../../core/submission/models/correction-type-mode.model'; import { CorrectionTypeForms } from '../correction-type-forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable, of as observableOf, Subscription, switchMap } from 'rxjs'; +import { finalize, Observable, of as observableOf, Subscription, switchMap } from 'rxjs'; import { hasValue, isNotEmpty } from '../../../empty.util'; import { ListableObject } from '../../../object-collection/shared/listable-object.model'; import { Item } from '../../../../core/shared/item.model'; @@ -55,9 +55,9 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy /** * Pagination options */ - pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'csmr', - pageSize: 3, + pageSize: 10, currentPage: 1 }); @@ -99,11 +99,11 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy /** * List ID for selecting local entities */ - entityListId = 'correction-suggestion-manage-relation'; + entityListId = 'csmr'; /** * List ID for selecting local authorities */ - authorityListId = 'correction-suggestion-manage-relation-authority'; + authorityListId = 'csmr-authority'; /** * ImportType enum @@ -134,23 +134,33 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy * Get the search results */ ngOnInit(): void { - this.searchOptions = Object.assign(new PaginatedSearchOptions( - { - configuration: this.correctionType.discoveryConfiguration, - scope: this.itemUuid, - pagination: this.pagination - } - )); + this.getData(); + } - this.localEntitiesRD$ = this.searchService.search(this.searchOptions); - this.subs.push( - this.localEntitiesRD$.pipe( - getFirstCompletedRemoteData(), - ).subscribe( - () => { - this.isLoading$ = observableOf(false); + private getData(){ + this.localEntitiesRD$ = this.aroute.queryParams + .pipe( + switchMap((params) => { + if (hasValue(params)) { + this.pagination = Object.assign(new PaginationComponentOptions(),{ + ...this.pagination, + currentPage: params[`${this.pagination.id}.page`] || 1 + }); } - ) + + this.searchOptions = Object.assign(new PaginatedSearchOptions( + { + configuration: this.correctionType.discoveryConfiguration, + scope: this.itemUuid, + pagination: this.pagination, + } + )); + + return this.searchService.search(this.searchOptions).pipe( + getFirstCompletedRemoteData(), + finalize(() => this.isLoading$ = observableOf(false)) + ); + }) ); } @@ -169,15 +179,24 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy pagination: this.pagination } )); - this.localEntitiesRD$ = this.searchService.search(this.searchOptions); - this.subs.push( - this.localEntitiesRD$.pipe( - getFirstCompletedRemoteData(), - ).subscribe( - () => this.isLoading$ = observableOf(false) - ) - ); + } else { + this.searchOptions = Object.assign(new PaginatedSearchOptions( + { + configuration: this.correctionType.discoveryConfiguration, + scope: this.itemUuid, + pagination: this.pagination + } + )); } + + this.localEntitiesRD$ = this.searchService.search(this.searchOptions); + this.subs.push( + this.localEntitiesRD$.pipe( + getFirstCompletedRemoteData(), + ).subscribe( + () => this.isLoading$ = observableOf(false) + ) + ); } /** From 9094d8233ffe349b51b53178c6cc119272e8b09f Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Wed, 1 Nov 2023 14:29:26 +0100 Subject: [PATCH 14/38] [CST-12109] implemented withdrawn-reinstate requests --- src/app/app-routing.module.ts | 8 +- src/app/core/core.module.ts | 6 +- .../quality-assurance-event-data.service.ts | 4 +- src/app/item-page/item-page-routing.module.ts | 13 - src/app/item-page/item-shared.module.ts | 4 + .../correction-type-menu.component.html | 7 - .../correction-type-menu.component.spec.ts | 116 -------- .../correction-type-menu.component.ts | 98 ------ .../correction-suggestion-page.decorator.ts | 15 - .../correction-suggestion-routing.module.ts | 24 -- .../correction-suggestion.component.html | 3 - .../correction-suggestion.component.spec.ts | 80 ----- .../correction-suggestion.component.ts | 94 ------ .../correction-suggestion.module.ts | 39 --- .../correction-types/correction-type-forms.ts | 3 - ...ge-relation-correction-type.component.html | 56 ---- ...ge-relation-correction-type.component.scss | 0 ...relation-correction-type.component.spec.ts | 173 ----------- ...nage-relation-correction-type.component.ts | 278 ------------------ ...m-withdrawn-reinstate-modal.component.html | 48 +++ ...-withdrawn-reinstate-modal.component.scss} | 0 .../withdrawn-reinstate-modal.component.ts | 47 +++ .../shared/dso-page/dso-edit-menu.resolver.ts | 34 ++- .../dso-reinstate-modal.service.ts | 65 ++++ .../dso-withdrawn-modal.service.ts | 64 ++++ src/app/shared/shared.module.ts | 6 +- src/assets/i18n/en.json5 | 20 ++ src/themes/custom/lazy-theme.module.ts | 4 +- 28 files changed, 292 insertions(+), 1017 deletions(-) delete mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html delete mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts delete mode 100644 src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.html delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion.component.ts delete mode 100644 src/app/shared/correction-suggestion/correction-suggestion.module.ts delete mode 100644 src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts delete mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html delete mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss delete mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts delete mode 100644 src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts create mode 100644 src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html rename src/app/shared/correction-suggestion/{correction-suggestion.component.scss => item-withdrawn-reinstate-modal.component.scss} (100%) create mode 100644 src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts create mode 100644 src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts create mode 100644 src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b1c04c40da1..0d7a0bd0f05 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -237,13 +237,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone .then((m) => m.SubscriptionsPageRoutingModule), canActivate: [AuthenticatedGuard] }, - { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent }, - { - path: 'items', - loadChildren: () => import('./shared/correction-suggestion/correction-suggestion.module') - .then((m) => m.CorrectionSuggestionModule), - canActivate: [AuthenticatedGuard] - }, + { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent } ] } ], { diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 0eeb476d69d..8d8d2e93e6e 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -185,7 +185,6 @@ import { FlatBrowseDefinition } from './shared/flat-browse-definition.model'; import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model'; import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition'; import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model'; -import { CorrectionTypeMode } from './submission/models/correction-type-mode.model'; import { CorrectionTypeDataService } from './submission/correctiontype-data.service'; /** @@ -309,8 +308,8 @@ const PROVIDERS = [ OrcidAuthService, OrcidQueueDataService, OrcidHistoryDataService, - SupervisionOrderDataService - CorrectionTypeDataService, + SupervisionOrderDataService, + CorrectionTypeDataService ]; /** @@ -390,7 +389,6 @@ export const models = Subscription, ItemRequest, BulkAccessConditionOptions - CorrectionTypeMode ]; @NgModule({ diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index ae1538f7bb2..23e7d6a6a4c 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -207,7 +207,7 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService> { + postData(data: string): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getBrowseEndpoint(); @@ -218,7 +218,7 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService(requestId); + return this.rdbService.buildFromRequestUUID(requestId); }) ); } diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 04e4ba21797..0c855ab34dd 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -16,7 +16,6 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component'; import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; -import { CORRECTION_TYPE_PATH, REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; import { OrcidPageComponent } from './orcid-page/orcid-page.component'; import { OrcidPageGuard } from './orcid-page/orcid-page.guard'; import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @@ -42,18 +41,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; path: 'full', component: ThemedFullItemPageComponent, }, - { - path: CORRECTION_TYPE_PATH, - loadChildren: () => import('../shared/correction-suggestion/correction-suggestion.module') - .then((m) => m.CorrectionSuggestionModule), - canActivate: [AuthenticatedGuard] - }, - { - path: `full/${CORRECTION_TYPE_PATH}` , - loadChildren: () => import('../shared/correction-suggestion/correction-suggestion.module') - .then((m) => m.CorrectionSuggestionModule), - canActivate: [AuthenticatedGuard] - }, { path: ITEM_EDIT_PATH, loadChildren: () => import('./edit-item-page/edit-item-page.module') diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts index 9c2bbba6194..9a7477e6aea 100644 --- a/src/app/item-page/item-shared.module.ts +++ b/src/app/item-page/item-shared.module.ts @@ -16,10 +16,14 @@ import { RelatedItemsComponent } from './simple/related-items/related-items-comp import { ThemedMetadataRepresentationListComponent } from './simple/metadata-representation-list/themed-metadata-representation-list.component'; +import { + ItemWithdrawnReinstateModalComponent +} from '../shared/correction-suggestion/withdrawn-reinstate-modal.component'; const ENTRY_COMPONENTS = [ ItemVersionsDeleteModalComponent, ItemVersionsSummaryModalComponent, + ItemWithdrawnReinstateModalComponent ]; diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html deleted file mode 100644 index 09a41614b7c..00000000000 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.html +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts deleted file mode 100644 index a6713a12a8c..00000000000 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.spec.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { Item } from './../../../core/shared/item.model'; -import { DSpaceObject } from './../../../core/shared/dspace-object.model'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CorrectionTypeMenuComponent } from './correction-type-menu.component'; -import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; -import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; -import { createPaginatedList } from '../../testing/utils.test'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; -import { RouterTestingModule } from '@angular/router/testing'; -import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { By } from '@angular/platform-browser'; -import { CorrectionType } from '../../../core/submission/models/correction-type-mode.model'; - -describe('CorrectionTypeMenuComponent', () => { - let component: CorrectionTypeMenuComponent; - let fixture: ComponentFixture; - let componentAsAny: any; - - let correctionTypeService: any; - let dso: DSpaceObject; - const notificationService = new NotificationsServiceStub(); - const correctionType: CorrectionType = Object.assign(new CorrectionType(), { - id: 'addpersonalpath', - creationForm:'manageRelation', - discoveryConfiguration: 'RELATION.PersonPath.Items', - topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH' - }); - - const correctionTypeObjRDList$ = createSuccessfulRemoteDataObject$(createPaginatedList([correctionType])); - - beforeEach(async () => { - dso = Object.assign(new Item(), { - id: 'test-item', - _links: { - self: { href: 'test-item-selflink' } - } - }); - - correctionTypeService = jasmine.createSpyObj('CorrectionTypeDataService', { - findByItem: jasmine.createSpy('findByItem') - }); - - await TestBed.configureTestingModule({ - declarations: [ CorrectionTypeMenuComponent ], - imports: [ - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - RouterTestingModule.withRoutes([])], - providers: [ - { provide: CorrectionTypeDataService, useValue: correctionTypeService }, - { provide: 'contextMenuObjectProvider', useValue: dso }, - { provide: 'contextMenuObjectTypeProvider', useValue: DSpaceObjectType.ITEM }, - { provide: NotificationsService, useValue: notificationService } - ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(CorrectionTypeMenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('when correction types are available', () => { - beforeEach(() => { - correctionTypeService.findByItem.and.returnValue(correctionTypeObjRDList$); - fixture = TestBed.createComponent(CorrectionTypeMenuComponent); - component = fixture.componentInstance; - componentAsAny = fixture.componentInstance; - component.contextMenuObject = dso; - fixture.detectChanges(); - }); - - it('should init properly', () => { - expect(componentAsAny.correctionTypes$.value).toEqual([correctionType]); - }); - - it('should render a button', () => { - const link = fixture.debugElement.query(By.css('button')); - expect(link).not.toBeNull(); - }); - }); - - describe('when is no data are available', () => { - beforeEach(() => { - correctionTypeService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([]))); - fixture = TestBed.createComponent(CorrectionTypeMenuComponent); - component = fixture.componentInstance; - componentAsAny = fixture.componentInstance; - component.contextMenuObject = dso; - fixture.detectChanges(); - }); - - it('should init edit mode properly', () => { - expect(componentAsAny.correctionTypes$.value).toEqual([]); - }); - - it('should render a button', () => { - const link = fixture.debugElement.query(By.css('button')); - expect(link).toBeNull(); - }); - }); -}); diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts deleted file mode 100644 index 2fb195ccf75..00000000000 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../core/shared/operators'; -import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { ContextMenuEntryComponent } from '../context-menu-entry.component'; -import { ContextMenuEntryType } from '../context-menu-entry-type'; -import { BehaviorSubject, map, Observable, startWith, Subscription } from 'rxjs'; -import { CorrectionType } from '../../../core/submission/models/correction-type-mode.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { hasValue, isNotEmpty } from '../../empty.util'; -import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; -import { CORRECTION_TYPE_PATH } from '../../../app-routing-paths'; - -@Component({ - selector: 'ds-correction-type-menu', - templateUrl: './correction-type-menu.component.html', -}) -@rendersContextMenuEntriesForType(DSpaceObjectType.ITEM) -export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent implements OnInit, OnDestroy { - - /** - * The menu entry type - */ - public static menuEntryType: ContextMenuEntryType = ContextMenuEntryType.CorrectionType; - - /** - * List of Edit Modes available on this item - * for the current user - */ - private correctionTypes$: BehaviorSubject = new BehaviorSubject([]); - - /** - * Variable to track subscription and unsubscribe it onDestroy - */ - private sub: Subscription; - - isAuthorized$: Observable; - - constructor( - @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject, - @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, - private correctionTypeService: CorrectionTypeDataService, - ) { - super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.CorrectionType); - } - - ngOnInit(): void { - this.getData(); - } - - /** - * Check if edit mode is available - */ - getCorrectionTypes(): Observable { - return this.correctionTypes$.asObservable(); - } - - /** - * Check if any correction type are available - */ - hasCorrectionTypeAvailable(): Observable { - return this.correctionTypes$.asObservable().pipe( - map((type) => isNotEmpty(type) && type.length > 0) - ); - } - - /** - * Get correction types - * useCachedVersionIfAvailable = false to force refreshing the list - */ - getData(): void { - this.sub = this.correctionTypeService.findByItem(this.contextMenuObject.id, false).pipe( - getAllSucceededRemoteDataPayload(), - getPaginatedListPayload(), - startWith([]) - ).subscribe((types: CorrectionType[]) => { - this.correctionTypes$.next(types); - }); - } - - /** - * Get the route to the correction type page - * @param typeId correction type id - * @returns the route to the correction type page - */ - getTypeRoute(typeId: string): string[] { - return ['./', CORRECTION_TYPE_PATH, typeId]; - } - - /** - * Make sure the subscription is unsubscribed from when this component is destroyed - */ - ngOnDestroy(): void { - if (hasValue(this.sub)) { - this.sub.unsubscribe(); - } - } -} diff --git a/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts b/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts deleted file mode 100644 index 88f1c9f8025..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion-page.decorator.ts +++ /dev/null @@ -1,15 +0,0 @@ -const pageMap = new Map(); - -export function renderCorrectionFor(creationMode: string) { - return function decorator(component: any) { - if (!component) { - return; - } - pageMap.set(creationMode, component); - }; -} - -export function getCorrectionComponent(creationMode: string) { - return pageMap.get(creationMode); -} - diff --git a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts deleted file mode 100644 index b562785f860..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { CorrectionSuggestionComponent } from './correction-suggestion.component'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; - -const routes: Routes = [ - { - path: ':correctionType', - component: CorrectionSuggestionComponent, - resolve: { - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'item-correction-suggestion.correction-type', breadcrumbKey: 'item-correction-suggestion.correction-type' }, - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], - providers: [ - I18nBreadcrumbResolver - ] -}) -export class CorrectionSuggestionRoutingModule { } diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.html b/src/app/shared/correction-suggestion/correction-suggestion.component.html deleted file mode 100644 index 7cc498504ee..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts deleted file mode 100644 index cdb793f7ea8..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.spec.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CorrectionSuggestionComponent } from './correction-suggestion.component'; -import { ActivatedRoute } from '@angular/router'; -import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service'; -import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; -import { CommonModule } from '@angular/common'; -import { BrowserModule } from '@angular/platform-browser'; -import { TranslateModule } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; - -describe('CorrectionSuggestionComponent', () => { - let component: CorrectionSuggestionComponent; - let fixture: ComponentFixture; - - const correctionTypeMock = { - id: 'addpersonalpath', - topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH', - discoveryConfiguration: 'RELATION.PersonPath.Items', - creationForm: 'manageRelation', - type: 'correctiontype', - _links: { - self: { - href: 'https://rest.api/discover/configurations/addpersonalpath', - }, - }, - }; - - const correctionTypeMockRD$ = createSuccessfulRemoteDataObject$(correctionTypeMock); - - const mockActivatedRoute = { - snapshot:{ - params: { - correctionType: 'addpersonalpath' - } - } - }; - - let correctionTypeDataService: any; - - beforeEach(async () => { - correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService', { - getCorrectionTypeById: jasmine.createSpy('getCorrectionTypeById') - }); - - await TestBed.configureTestingModule({ - declarations: [ CorrectionSuggestionComponent ], - imports: [ - CommonModule, - BrowserModule, - TranslateModule.forRoot(), - RouterTestingModule.withRoutes([]), - ], - providers: [ - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: CorrectionTypeDataService, useValue: correctionTypeDataService }, - ], - schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(CorrectionSuggestionComponent); - component = fixture.componentInstance; - correctionTypeDataService.getCorrectionTypeById.and.returnValue(correctionTypeMockRD$); - spyOn(component, 'initComponent'); - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should subscribe to route params and set correctionTypeId & initialize component', () => { - expect((component as any).correctionTypeId).toEqual('addpersonalpath'); - expect(component.initComponent).toHaveBeenCalled(); - }); -}); diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.ts b/src/app/shared/correction-suggestion/correction-suggestion.component.ts deleted file mode 100644 index df70a1756fb..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { getRemoteDataPayload } from './../../core/shared/operators'; -import { CorrectionTypeDataService } from './../../core/submission/correctiontype-data.service'; -import { ChangeDetectorRef, Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; -import { CorrectionType } from '../../core/submission/models/correction-type-mode.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { getCorrectionComponent } from './correction-suggestion-page.decorator'; -import { ActivatedRoute } from '@angular/router'; -import { hasValue } from '../empty.util'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; - -@Component({ - selector: 'ds-correction-suggestion', - templateUrl: './correction-suggestion.component.html', - styleUrls: ['./correction-suggestion.component.scss'] -}) -export class CorrectionSuggestionComponent implements OnInit { - - /** - * The correction type object - */ - public correctionTypeObject: CorrectionType; - - /** - * The correction type id - */ - private correctionTypeId: string; - - /** - * The creation form - */ - private creationForm: string; - - /** - * The injector for the component - */ - public objectInjector: Injector; - - constructor( - private componentFactoryResolver: ComponentFactoryResolver, - private aroute: ActivatedRoute, - private correctionTypeDataService: CorrectionTypeDataService, - private injector: Injector, - private chd: ChangeDetectorRef, - ) { - this.correctionTypeId = this.aroute.snapshot.params.correctionType; - } - - ngOnInit(): void { - this.initComponent(); - } - - /** - * Initialize the component by fetching the correction type object - * and rendering the correct component based on the creation form - */ - initComponent(): void { - if (hasValue(this.correctionTypeId)) { - this.correctionTypeDataService.getCorrectionTypeById(this.correctionTypeId) - .pipe( - getFirstCompletedRemoteData(), - getRemoteDataPayload(), - ) - .subscribe((correctionType: CorrectionType) => { - if (hasValue(correctionType)) { - this.correctionTypeObject = correctionType; - this.creationForm = correctionType.creationForm; - this.componentFactoryResolver.resolveComponentFactory(this.getComponent()); - this.injectData(); - this.chd.detectChanges(); - } - }); - } - } - - /** - * Inject the data into the component - */ - private injectData(): void { - this.objectInjector = Injector.create({ - providers: [ - { provide: 'correctionTypeObjectProvider', useValue: this.correctionTypeObject, deps: [] }, - ], - parent: this.injector, - }); - } - - /** - * Fetch the component depending on the creation form - * @returns {GenericConstructor} - */ - getComponent(): GenericConstructor { - return getCorrectionComponent(this.creationForm); - } -} diff --git a/src/app/shared/correction-suggestion/correction-suggestion.module.ts b/src/app/shared/correction-suggestion/correction-suggestion.module.ts deleted file mode 100644 index 37204b441e6..00000000000 --- a/src/app/shared/correction-suggestion/correction-suggestion.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CorrectionSuggestionComponent } from './correction-suggestion.component'; -import { SharedModule } from '../shared.module'; -import { CorrectionSuggestionRoutingModule } from './correction-suggestion-routing.module'; -import { ManageRelationCorrectionTypeComponent } from './correction-types/manage-relation-correction-type/manage-relation-correction-type.component'; -import { SearchModule } from '../search/search.module'; - -const COMPONENTS = [ - CorrectionSuggestionComponent, - ManageRelationCorrectionTypeComponent, -]; - -const ENTRY_COMPONENTS = [ - ManageRelationCorrectionTypeComponent, -]; - -@NgModule({ - declarations: [ - COMPONENTS, - ], - imports: [ - CommonModule, - CorrectionSuggestionRoutingModule, - SharedModule, - SearchModule - ], - exports: [ - COMPONENTS, - ] -}) -export class CorrectionSuggestionModule { - static withEntryComponents() { - return { - ngModule: CorrectionSuggestionModule, - providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })) - }; - } - } diff --git a/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts b/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts deleted file mode 100644 index 9faf8ca18be..00000000000 --- a/src/app/shared/correction-suggestion/correction-types/correction-type-forms.ts +++ /dev/null @@ -1,3 +0,0 @@ -export enum CorrectionTypeForms { - MANAGE_RELATION = 'manageRelation', -} diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html deleted file mode 100644 index 32824cf6350..00000000000 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.html +++ /dev/null @@ -1,56 +0,0 @@ -
-

- {{ ( 'correction-type.manage-relation.' + (correctionType.topic | lowercase) + '.searchHeader' | translate) }} -

-
-
-
- - - - - - - - -
- -

{{( 'correction-type.manage-relation.search.notFound' | translate)}}

- -
- -
-
-
- -
-
- -
-
-
diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts deleted file mode 100644 index a329138c06b..00000000000 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.spec.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { ThemeService } from './../../../theme-support/theme.service'; - -import { SearchModule } from './../../../search/search.module'; -import { RouterMock } from './../../../mocks/router.mock'; -import { NotificationsService } from './../../../notifications/notifications.service'; -import { ItemDataService } from './../../../../core/data/item-data.service'; -import { OpenaireBrokerEventRestService } from './../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; -import { Item } from './../../../../core/shared/item.model'; -import { SelectableListService } from './../../../object-list/selectable-list/selectable-list.service'; -import { OpenaireMockDspaceObject, getMockOpenaireBrokerEventRestService } from './../../../mocks/openaire.mock'; -import { PaginatedSearchOptions } from './../../../search/models/paginated-search-options.model'; -import { PaginationComponentOptions } from './../../../pagination/pagination-component-options.model'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ManageRelationCorrectionTypeComponent } from './manage-relation-correction-type.component'; -import { PageInfo } from './../../../../core/shared/page-info.model'; -import { buildPaginatedList } from './../../../../core/data/paginated-list.model'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from './../../../../shared/remote-data.utils'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CommonModule } from '@angular/common'; -import { RouterTestingModule } from '@angular/router/testing'; -import { Component, NO_ERRORS_SCHEMA } from '@angular/core'; -import { SearchService } from './../../../../core/shared/search/search.service'; -import { of } from 'rxjs'; -import { ActivatedRoute, Router } from '@angular/router'; -import { MockActivatedRoute } from './../../../../shared/mocks/active-router.mock'; -import { NotificationsServiceStub } from './../../../../shared/testing/notifications-service.stub'; -import { getMockTranslateService } from './../../../../shared/mocks/translate.service.mock'; -import { TranslateLoaderMock } from './../../../../shared/mocks/translate-loader.mock'; -import { SearchServiceStub } from './../../../../shared/testing/search-service.stub'; -import { BrowserModule } from '@angular/platform-browser'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { getMockThemeService } from './../../../../shared/mocks/theme-service.mock'; -import { ImportType } from './../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; - -describe('ManageRelationCorrectionTypeComponent', () => { - let component: ManageRelationCorrectionTypeComponent; - let compAsAny: any; - let fixture: ComponentFixture; - - const correctionTypeMock = { - id: 'addpersonalpath', - topic: '/DSPACEUSERS/RELATIONADD/PERSONALPATH', - discoveryConfiguration: 'RELATION.PersonPath.Items', - creationForm: 'manageRelation', - type: 'correctiontype', - _links: { - self: { - href: 'https://rest.api/discover/configurations/addpersonalpath', - }, - }, - }; - - const pagination = Object.assign( - new PaginationComponentOptions(), { - id: 'correction-suggestion-manage-relation', - pageSize: 3 - } - ); - - const uuid = '123e4567-e89b-12d3-a456-426614174003'; - - const searchOptions = Object.assign(new PaginatedSearchOptions( - { - configuration: 'RELATION.PersonPath.Items', - scope: '123e4567-e89b-12d3-a456-426614174013', - pagination: pagination - } - )); - - const pageInfo = new PageInfo({ - elementsPerPage: 3, - totalElements: 1, - totalPages: 1, - currentPage: 1 - }); - - const array = [ - OpenaireMockDspaceObject, - ]; - const paginatedList = buildPaginatedList(pageInfo, array); - const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - - const searchServiceStub = Object.assign(new SearchServiceStub(), { - search: () => of(paginatedListRD), - }); - - const openaireBrokerEventRestServiceStub: any = getMockOpenaireBrokerEventRestService(); - - const itemDataService = { - findById: (id: string) => createSuccessfulRemoteDataObject$(new Item()) - }; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ManageRelationCorrectionTypeComponent, TestComponent ], - imports: [ - CommonModule, - BrowserModule, - NoopAnimationsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - RouterTestingModule.withRoutes([]), - SearchModule - ], - providers: [ - { provide: 'correctionTypeObjectProvider', useValue: correctionTypeMock }, - { provide: SearchService, useValue: searchServiceStub }, - { provide: OpenaireBrokerEventRestService, useValue: openaireBrokerEventRestServiceStub }, - { provide: SelectableListService, useValue: jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']) }, - { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, - { provide: ItemDataService, useValue: itemDataService }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: Router, useValue: new RouterMock() }, - { provide: TranslateService, useValue: getMockTranslateService() }, - { provide: ThemeService, useValue: getMockThemeService() }, - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ManageRelationCorrectionTypeComponent); - component = fixture.componentInstance; - compAsAny = component as any; - component.localEntitiesRD$ = createSuccessfulRemoteDataObject$(paginatedList); - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('search', () => { - it('should call SearchService.search', () => { - (searchServiceStub as any).search.and.returnValue(of(paginatedListRD)); - component.pagination = pagination; - component.search(''); - expect(compAsAny.searchService.search).toHaveBeenCalledWith(searchOptions); - }); - }); - - describe('selectEntity', () => { - const entity = Object.assign(new Item(), { uuid: uuid }); - beforeEach(() => { - component.selectEntity(entity); - }); - it('should set selected entity', () => { - expect(component.selectedEntity).toBe(entity); - }); - it('should set the import type to local entity', () => { - expect(component.selectedImportType).toEqual(ImportType.LocalEntity); - }); - }); - - afterEach(() => { - fixture.destroy(); - component = null; - compAsAny = null; - }); -}); - -@Component({ - selector: 'ds-test-cmp', - template: `` -}) -class TestComponent { - -} diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts deleted file mode 100644 index 6e285c2987f..00000000000 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ /dev/null @@ -1,278 +0,0 @@ -import { NotificationsService } from '../../../notifications/notifications.service'; -import { OpenaireBrokerEventObject } from '../../../../core/openaire/broker/models/openaire-broker-event.model'; -import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { - OpenaireBrokerEventRestService -} from '../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; -import { Context } from '../../../../core/shared/context.model'; -import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { SearchResult } from '../../../search/models/search-result.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model'; -import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { renderCorrectionFor } from '../../correction-suggestion-page.decorator'; -import { CorrectionType } from '../../../../core/submission/models/correction-type-mode.model'; -import { CorrectionTypeForms } from '../correction-type-forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { finalize, Observable, of as observableOf, Subscription, switchMap } from 'rxjs'; -import { hasValue, isNotEmpty } from '../../../empty.util'; -import { ListableObject } from '../../../object-collection/shared/listable-object.model'; -import { Item } from '../../../../core/shared/item.model'; -import { - ImportType -} from '../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; -import { TranslateService } from '@ngx-translate/core'; - -@Component({ - selector: 'ds-manage-relation-correction-type', - templateUrl: './manage-relation-correction-type.component.html', - styleUrls: ['./manage-relation-correction-type.component.scss'] -}) -@renderCorrectionFor(CorrectionTypeForms.MANAGE_RELATION) -export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy { - - /** - * The correction type object - */ - correctionType: CorrectionType; - - /** - * The item uuid from the parent object - */ - itemUuid: string; - - /** - * The project title from the parent object - */ - projectTitle = ''; - - /** - * Pagination options - */ - pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'csmr', - pageSize: 10, - currentPage: 1 - }); - - /** - * Entities to show in the list - */ - localEntitiesRD$: Observable>>>; - - /** - * Search options to use for fetching projects - */ - searchOptions: PaginatedSearchOptions; - - /** - * The list of subscriptions - */ - protected subs: Subscription[] = []; - - /** - * Information about the data loading status - */ - isLoading$ = observableOf(true); - - /** - * The selected local entity - */ - selectedEntity: ListableObject; - - /** - * The type of link to render in listable elements - */ - linkTypes = CollectionElementLinkType; - - /** - * The context we're currently in (submission) - */ - context = Context.Search; - - /** - * List ID for selecting local entities - */ - entityListId = 'csmr'; - /** - * List ID for selecting local authorities - */ - authorityListId = 'csmr-authority'; - - /** - * ImportType enum - */ - importType = ImportType; - - /** - * The type of import the user currently has selected - */ - selectedImportType = ImportType.None; - - constructor( - @Inject('correctionTypeObjectProvider') private correctionTypeObject: CorrectionType, - private searchService: SearchService, - private selectService: SelectableListService, - private aroute: ActivatedRoute, - private openaireBrokerEventRestService: OpenaireBrokerEventRestService, - private itemService: ItemDataService, - private notificationsService: NotificationsService, - private router: Router, - private translateService: TranslateService, - ) { - this.correctionType = correctionTypeObject; - this.itemUuid = this.aroute.snapshot.params.id; - } - - /** - * Get the search results - */ - ngOnInit(): void { - this.getData(); - } - - private getData(){ - this.localEntitiesRD$ = this.aroute.queryParams - .pipe( - switchMap((params) => { - if (hasValue(params)) { - this.pagination = Object.assign(new PaginationComponentOptions(),{ - ...this.pagination, - currentPage: params[`${this.pagination.id}.page`] || 1 - }); - } - - this.searchOptions = Object.assign(new PaginatedSearchOptions( - { - configuration: this.correctionType.discoveryConfiguration, - scope: this.itemUuid, - pagination: this.pagination, - } - )); - - return this.searchService.search(this.searchOptions).pipe( - getFirstCompletedRemoteData(), - finalize(() => this.isLoading$ = observableOf(false)) - ); - }) - ); - } - - /** - * Perform a project search by title. - */ - public search(searchTitle): void { - if (isNotEmpty(searchTitle)) { - const filterRegEx = /[:]/g; - this.isLoading$ = observableOf(true); - this.searchOptions = Object.assign(new PaginatedSearchOptions( - { - configuration: this.correctionType.discoveryConfiguration, - query: (searchTitle) ? searchTitle.replace(filterRegEx, '') : searchTitle, - scope: this.itemUuid, - pagination: this.pagination - } - )); - } else { - this.searchOptions = Object.assign(new PaginatedSearchOptions( - { - configuration: this.correctionType.discoveryConfiguration, - scope: this.itemUuid, - pagination: this.pagination - } - )); - } - - this.localEntitiesRD$ = this.searchService.search(this.searchOptions); - this.subs.push( - this.localEntitiesRD$.pipe( - getFirstCompletedRemoteData(), - ).subscribe( - () => this.isLoading$ = observableOf(false) - ) - ); - } - - /** - * Deselected a local entity - */ - public deselectEntity(): void { - this.selectedEntity = undefined; - if (this.selectedImportType === ImportType.LocalEntity) { - this.selectedImportType = ImportType.None; - } - } - - /** - * Selected a local entity - * @param entity - */ - public selectEntity(entity): void { - this.selectedEntity = entity; - this.selectedImportType = ImportType.LocalEntity; - } - - /** - * Deselect every element from both entity and authority lists - */ - public deselectAllLists(): void { - this.selectService.deselectAll(this.entityListId); - this.selectService.deselectAll(this.authorityListId); - } - - /** - * Perform the action based on the correction type - * by posting the data to the OpenAIRE Broker Event API. - * Data is formatted as follows, in the exact order: - * - * - * - */ - performAction() { - if (hasValue(this.selectedEntity)) { - const selectedItemLink = (this.selectedEntity as SearchResult).indexableObject._links.self.href; - - this.itemService.findById(this.itemUuid).pipe( - getFirstSucceededRemoteDataPayload(), - switchMap((item: Item) => { - const data: string = this.correctionTypeObject._links.self.href + '\n' + item._links.self.href + '\n' + selectedItemLink; - return this.openaireBrokerEventRestService.postData(data); - }), - getFirstCompletedRemoteData() - ).subscribe((res: RemoteData) => { - if (res.hasSucceeded) { - this.selectedImportType = ImportType.None; - const message = 'correction-type.manage-relation.' + this.correctionTypeObject.id + '.notification.success'; - this.notificationsService.success(this.translateService.get(message)); - this.deselectAllLists(); - this.back(); - } else { - this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); - } - }); - } - } - - /** - * Navigate back to the previous page - */ - back() { - this.router.navigate(['../../'], { relativeTo: this.aroute }); - } - - /** - * Unsubscribe from all subscriptions. - */ - ngOnDestroy(): void { - this.deselectAllLists(); - this.subs - .filter((sub) => hasValue(sub)) - .forEach((sub) => sub.unsubscribe()); - } -} diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html new file mode 100644 index 00000000000..0c17373c407 --- /dev/null +++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html @@ -0,0 +1,48 @@ +
+
+ {{'item.qa.withdrawn.modal.header' | translate}} + +
+
+
+ + +
+
+
+ + +
+
+ + +
{{'item.qa.withdrawn.modal.submitted.header' | translate}}
+
+
+ +
+
+ + + +
+ {{'item.qa.reinstate.modal.header' | translate}} + +
+ diff --git a/src/app/shared/correction-suggestion/correction-suggestion.component.scss b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss similarity index 100% rename from src/app/shared/correction-suggestion/correction-suggestion.component.scss rename to src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts new file mode 100644 index 00000000000..8bce9460e4e --- /dev/null +++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts @@ -0,0 +1,47 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { ModalBeforeDismiss } from '../interfaces/modal-before-dismiss.interface'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; + +@Component({ + selector: 'ds-item-withdrawn-reinstate-modal', + templateUrl: './item-withdrawn-reinstate-modal.component.html', + styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'] +}) +export class ItemWithdrawnReinstateModalComponent implements ModalBeforeDismiss { + + summary: string; + + canWithdraw$: Observable = of(false); + canReinstate$: Observable = of(false); + submitted$: BehaviorSubject = new BehaviorSubject(false); + + @Output() createQAEvent: EventEmitter = new EventEmitter(); + + constructor( + protected activeModal: NgbActiveModal, + protected authorizationService: AuthorizationDataService + ) {} + + onModalClose() { + this.activeModal.close(); + } + + beforeDismiss(): boolean { + // prevent the modal from being dismissed after version creation is initiated + return !this.submitted$.getValue(); + } + + onModalSubmit() { + this.submitted$.next(true); + this.createQAEvent.emit(this.summary); + } + + public setDso(dso: DSpaceObject) { + this.canWithdraw$ = this.authorizationService.isAuthorized(FeatureID.WithdrawItem, dso.self); + this.canReinstate$ = this.authorizationService.isAuthorized(FeatureID.ReinstateItem, dso.self); + } +} diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 80a69c2830d..52ae6551945 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -21,6 +21,8 @@ import { getDSORoute } from '../../app-routing-paths'; import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; import { NotificationsService } from '../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { DsoWithdrawnModalService } from './dso-withdrawn-service/dso-withdrawn-modal.service'; +import { DsoReinstateModalService } from './dso-reinstate-service/dso-reinstate-modal.service'; /** * Creates the menus for the dspace object pages @@ -39,6 +41,8 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection protected researcherProfileService: ResearcherProfileDataService, protected notificationsService: NotificationsService, protected translate: TranslateService, + protected dsoWithdrawnModalService: DsoWithdrawnModalService, + protected dsoReinstateModalService: DsoReinstateModalService ) { } @@ -125,8 +129,10 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'), this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self), this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self), + this.authorizationService.isAuthorized(FeatureID.WithdrawItem, dso.self), + this.authorizationService.isAuthorized(FeatureID.ReinstateItem, dso.self), ]).pipe( - map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem]) => { + map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, canWithdrawItem, canReinstateItem]) => { const isPerson = this.getDsoType(dso) === 'person'; return [ { @@ -170,6 +176,32 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection icon: 'hand-paper', index: 3 }, + { + id: 'withdrawn-item', + active: false, + visible: canWithdrawItem, + model: { + type: MenuItemType.ONCLICK, + function: () => { + this.dsoWithdrawnModalService.openCreateWithdrawnModal(dso); + } + } as OnClickMenuItemModel, + icon: 'lock', + index: 4 + }, + { + id: 'reinstate-item', + active: false, + visible: canReinstateItem, + model: { + type: MenuItemType.ONCLICK, + function: () => { + this.dsoReinstateModalService.openCreateReinstateModal(dso); + } + } as OnClickMenuItemModel, + icon: 'unlock-keyhole', + index: 5 + } ]; }), ); diff --git a/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts new file mode 100644 index 00000000000..60714a9788c --- /dev/null +++ b/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts @@ -0,0 +1,65 @@ +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { + QualityAssuranceEventDataService +} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; +import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/withdrawn-reinstate-modal.component'; +import { filter } from 'rxjs/operators'; +import { RemoteData } from '../../../core/data/remote-data'; +import { + QualityAssuranceEventObject +} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model'; + + +@Injectable({ + providedIn: 'root' +}) +export class DsoReinstateModalService { + + constructor( + protected router: Router, + protected modalService: NgbModal, + protected itemService: ItemDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService, + protected qaEventDataService: QualityAssuranceEventDataService + ) {} + + /** + * Open the reinstate modal for the provided dso + */ + openCreateReinstateModal(dso): void { + const selfHref = dso._links.self.href; + + const data = 'https://localhost:8080/server/api/config/correctiontypes/reinstateRequest' + '\n' + selfHref; + // Open modal + const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); + (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setDso(dso); + (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).submitted$ + .pipe( + filter((val) => val) + ).subscribe( + () => { + this.sendQARequest(data); + activeModal.close(); + } + ); + } + + sendQARequest(data: string): void { + this.qaEventDataService.postData(data) + .subscribe((res: RemoteData) => { + if (res.hasSucceeded) { + const message = 'reinstate'; + this.notificationsService.success(this.translateService.get(message)); + } else { + this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); + } + }); + } + +} diff --git a/src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts new file mode 100644 index 00000000000..8986fa9555c --- /dev/null +++ b/src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts @@ -0,0 +1,64 @@ +import { Injectable } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Router } from '@angular/router'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/withdrawn-reinstate-modal.component'; +import { + QualityAssuranceEventDataService +} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; +import { + QualityAssuranceEventObject +} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { TranslateService } from '@ngx-translate/core'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { filter } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root' +}) +export class DsoWithdrawnModalService { + + constructor( + protected router: Router, + protected modalService: NgbModal, + protected itemService: ItemDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService, + protected qaEventDataService: QualityAssuranceEventDataService + ) {} + + /** + * Open the create withdrawn modal for the provided dso + */ + openCreateWithdrawnModal(dso): void { + const selfHref = dso._links.self.href; + + const data = 'https://localhost:8080/server/api/config/correctiontypes/withdrawnRequest' + '\n' + selfHref; + // Open modal + const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); + (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setDso(dso); + (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).submitted$ + .pipe( + filter((val) => val) + ).subscribe( + () => { + this.sendQARequest(data); + activeModal.close(); + } + ); + } + + sendQARequest(data: string): void { + this.qaEventDataService.postData(data) + .subscribe((res: RemoteData) => { + if (res.hasSucceeded) { + const message = 'withdrawn'; + this.notificationsService.success(this.translateService.get(message)); + } else { + this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); + } + }); + } +} + diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 0f7871f7f9b..90a853168cd 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -284,6 +284,9 @@ import { } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component'; import { NgxPaginationModule } from 'ngx-pagination'; +import { + QualityAssuranceEventDataService +} from '../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; const MODULES = [ CommonModule, @@ -471,7 +474,8 @@ const ENTRY_COMPONENTS = [ const PROVIDERS = [ TruncatableService, MockAdminGuard, - AbstractTrackableComponent + AbstractTrackableComponent, + QualityAssuranceEventDataService ]; const DIRECTIVES = [ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4c13ec73d14..c0407c8bf88 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2562,6 +2562,12 @@ "item.version.create.modal.header": "New version", + "item.qa.withdrawn.modal.header": "Send Withdrawn Item request", + + "item.qa.reinstate.modal.header": "Send Reinstate Item request", + + "item.qa.reinstate.create.modal.header": "New version", + "item.version.create.modal.text": "Create a new version for this item", "item.version.create.modal.text.startingFrom": "starting from version {{version}}", @@ -2570,16 +2576,30 @@ "item.version.create.modal.button.confirm.tooltip": "Create new version", + "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request", + + "item.qa.withdrown-reinstate.create.modal.button.confirm": "Send Request", + "item.version.create.modal.button.cancel": "Cancel", + "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel", + "item.version.create.modal.button.cancel.tooltip": "Do not create new version", + "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request", + "item.version.create.modal.form.summary.label": "Summary", + "item.qa-withdrawn-reinstate.create.modal.form.summary.label": "Summary", + "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", + "item.qa.withdrown-reinstate.modal.form.summary.placeholder": "Indicates the reasons (optionaly)", + "item.version.create.modal.submitted.header": "Creating new version...", + "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...", + "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", "item.version.create.notification.success": "New version has been created with version number {{version}}", diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index bff10cdd5a3..f2ef797eac1 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -1,4 +1,3 @@ -import { CorrectionSuggestionModule } from './../../app/shared/correction-suggestion/correction-suggestion.module'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; @@ -299,8 +298,7 @@ const DECLARATIONS = [ SystemWideAlertModule, NgxGalleryModule, FormModule, - RequestCopyModule, - CorrectionSuggestionModule, + RequestCopyModule ], declarations: DECLARATIONS, exports: [ From 0b391970e0975f7b0cc0839eb9c55c949cd08991 Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Wed, 1 Nov 2023 14:40:46 +0100 Subject: [PATCH 15/38] [CST-12109] added new labels --- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 2 ++ src/assets/i18n/en.json5 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 52ae6551945..1dcae4de1fc 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -182,6 +182,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection visible: canWithdrawItem, model: { type: MenuItemType.ONCLICK, + text:'item.page.withdrawn', function: () => { this.dsoWithdrawnModalService.openCreateWithdrawnModal(dso); } @@ -195,6 +196,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection visible: canReinstateItem, model: { type: MenuItemType.ONCLICK, + text:'item.page.reinstate', function: () => { this.dsoReinstateModalService.openCreateReinstateModal(dso); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index c0407c8bf88..4b03ce208f9 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2450,6 +2450,10 @@ "item.page.version.create": "Create new version", + "item.page.withdrawn": "Withdrawn this Item", + + "item.page.reinstate": "Reinstate this Item", + "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", "item.page.claim.button": "Claim", From 6dc3528ae8cd607973e451a6ed616d9305c690da Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Fri, 3 Nov 2023 00:36:40 +0100 Subject: [PATCH 16/38] [CTS-12109] refactoring --- .../quality-assurance-event-data.service.ts | 15 ++++++++-- ...m-withdrawn-reinstate-modal.component.html | 6 ++-- .../withdrawn-reinstate-modal.component.ts | 28 +++++++++++-------- .../shared/dso-page/dso-edit-menu.resolver.ts | 4 +-- .../dso-reinstate-modal.service.ts | 28 +++++++++++-------- .../dso-withdrawn-modal.service.ts | 26 +++++++++-------- .../quality-assurance-events.component.html | 3 +- 7 files changed, 65 insertions(+), 45 deletions(-) diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index 23e7d6a6a4c..284cd8791a7 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -25,7 +25,8 @@ import { SearchData, SearchDataImpl } from '../../../data/base/search-data'; import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; import { hasValue } from '../../../../shared/empty.util'; import { DeleteByIDRequest, PostRequest } from '../../../data/request.models'; -import { HttpHeaders } from '@angular/common/http'; +import { HttpHeaders, HttpParams } from '@angular/common/http'; +import { HttpOptions } from '../../../dspace-rest/dspace-rest.service'; /** * The service handling all Quality Assurance topic REST requests. @@ -207,13 +208,21 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService> { + postData(target: string, correctionType: string, related: string, reason: string): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getBrowseEndpoint(); return href$.pipe( switchMap((href: string) => { - const request = new PostRequest(requestId, href, data, { headers: new HttpHeaders().set('Content-Type', 'text/uri-list') }); + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'application/json'); + options.headers = headers; + let params = new HttpParams(); + params = params.append('target', target) + .append('correctionType', correctionType); + options.params = params; + const request = new PostRequest(requestId, href, {'reason': reason} , options); if (hasValue(this.responseMsToLive)) { request.responseMsToLive = this.responseMsToLive; } diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html index 0c17373c407..1201fbee6f2 100644 --- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html +++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html @@ -1,5 +1,5 @@
-
+
{{'item.qa.withdrawn.modal.header' | translate}}
- - {{'item.qa-withdrawn-reinstate.create.modal.form.summary.label' | translate }}: +
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index ed530286a68..2b270abc766 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -21,8 +21,7 @@ import { getDSORoute } from '../../app-routing-paths'; import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; import { NotificationsService } from '../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { DsoWithdrawnModalService } from './dso-withdrawn-service/dso-withdrawn-modal.service'; -import { DsoReinstateModalService } from './dso-reinstate-service/dso-reinstate-modal.service'; +import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; /** * Creates the menus for the dspace object pages @@ -41,8 +40,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection protected researcherProfileService: ResearcherProfileDataService, protected notificationsService: NotificationsService, protected translate: TranslateService, - protected dsoWithdrawnModalService: DsoWithdrawnModalService, - protected dsoReinstateModalService: DsoReinstateModalService + protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService ) { } @@ -129,8 +127,8 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'), this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self), this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self), - this.authorizationService.isAuthorized(FeatureID.WithdrawItem, dso.self), - this.authorizationService.isAuthorized(FeatureID.ReinstateItem, dso.self), + this.authorizationService.isAuthorized(FeatureID.WithdrawItem, dso.self,), + this.authorizationService.isAuthorized(FeatureID.ReinstateItem, dso.self) ]).pipe( map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, canWithdrawItem, canReinstateItem]) => { const isPerson = this.getDsoType(dso) === 'person'; @@ -184,7 +182,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection type: MenuItemType.ONCLICK, text:'item.page.withdrawn', function: () => { - this.dsoWithdrawnModalService.openCreateWithdrawnModal(dso, canWithdrawItem); + this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-withdrawn', canWithdrawItem); } } as OnClickMenuItemModel, icon: 'lock', @@ -198,7 +196,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection type: MenuItemType.ONCLICK, text:'item.page.reinstate', function: () => { - this.dsoReinstateModalService.openCreateReinstateModal(dso, canReinstateItem); + this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-reinstate', canWithdrawItem); } } as OnClickMenuItemModel, icon: 'unlock-keyhole', diff --git a/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts deleted file mode 100644 index dfb8c3da103..00000000000 --- a/src/app/shared/dso-page/dso-reinstate-service/dso-reinstate-modal.service.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Router } from '@angular/router'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { - QualityAssuranceEventDataService -} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; -import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/withdrawn-reinstate-modal.component'; -import { take } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { - QualityAssuranceEventObject -} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; - - -@Injectable({ - providedIn: 'root' -}) -export class DsoReinstateModalService { - - constructor( - protected router: Router, - protected modalService: NgbModal, - protected itemService: ItemDataService, - private notificationsService: NotificationsService, - private translateService: TranslateService, - protected qaEventDataService: QualityAssuranceEventDataService - ) {} - - /** - * Open the reinstat modal for the provided dso - */ - openCreateReinstateModal(dso, state: boolean): void { - const target = dso.id; - - // Open modal - const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); - (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setReinstate(!state); - (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).createQAEvent - .pipe( - take(1) - ).subscribe( - (reason) => { - this.sendQARequest(target, reason); - activeModal.close(); - } - ); - } - - sendQARequest(target: string, reason: string): void { - this.qaEventDataService.postData(target, 'request-reinstate','', reason) - .pipe ( - getFirstCompletedRemoteData() - ) - .subscribe((res: RemoteData) => { - if (res.hasSucceeded) { - const message = 'reinstate'; - this.notificationsService.success(this.translateService.get(message)); - } else { - this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); - } - }); - } - -} - diff --git a/src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts similarity index 72% rename from src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts rename to src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index b6d09cf8031..ce491a89a50 100644 --- a/src/app/shared/dso-page/dso-withdrawn-service/dso-withdrawn-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -14,17 +14,19 @@ import { TranslateService } from '@ngx-translate/core'; import { NotificationsService } from '../../notifications/notifications.service'; import { take } from 'rxjs/operators'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; @Injectable({ providedIn: 'root' }) -export class DsoWithdrawnModalService { +export class DsoWithdrawnReinstateModalService { constructor( protected router: Router, protected modalService: NgbModal, protected itemService: ItemDataService, private notificationsService: NotificationsService, + protected authorizationService: AuthorizationDataService, private translateService: TranslateService, protected qaEventDataService: QualityAssuranceEventDataService ) {} @@ -32,7 +34,7 @@ export class DsoWithdrawnModalService { /** * Open the create withdrawn modal for the provided dso */ - openCreateWithdrawnModal(dso, state: boolean): void { + openCreateWithdrawnReinstateModal(dso, correctionType: string, state: boolean): void { const target = dso.id; // Open modal const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); @@ -42,21 +44,24 @@ export class DsoWithdrawnModalService { take(1) ).subscribe( (reasone) => { - this.sendQARequest(target, reasone); + this.sendQARequest(target, correctionType, reasone); activeModal.close(); } ); } - sendQARequest(target: string, reason: string): void { - this.qaEventDataService.postData(target, 'request-withdrawn', '', reason) + sendQARequest(target: string, correctionType: string, reason: string): void { + this.qaEventDataService.postData(target, correctionType, '', reason) .pipe ( getFirstCompletedRemoteData() ) .subscribe((res: RemoteData) => { if (res.hasSucceeded) { - const message = 'withdrawn'; + const withdrawnMessage = 'Withdrawn request sent.'; + const reinstateMessage = 'Reinstate request sent.'; + const message = (correctionType === 'request-withdrawn') ? withdrawnMessage : reinstateMessage; this.notificationsService.success(this.translateService.get(message)); + this.authorizationService.invalidateAuthorizationsRequestCache(); } else { this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); } diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html index f942bf0ef67..aa416ec2c0e 100644 --- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html +++ b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html @@ -37,12 +37,12 @@

{{'quality-assurance.event.table.trust' | translate}} {{'quality-assurance.event.table.publication' | translate}} - - {{'quality-assurance.event.table.details' | translate}} - {{'quality-assurance.event.table.project-details' | translate}} + + {{'quality-assurance.event.table.reasons' | translate}} + {{'quality-assurance.event.table.actions' | translate}} @@ -79,6 +79,15 @@

{{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }} + + +

+ + {{eventElement.event.message.reason}}
+ +

+ +

{{'quality-assurance.event.table.suggestedProject' | translate}} diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts index e34c121f359..18d05172858 100644 --- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts @@ -151,9 +151,11 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ public hasDetailColumn(): boolean { return (this.showTopic.indexOf('/PROJECT') !== -1 || - this.showTopic.indexOf('/PID') !== -1 || - this.showTopic.indexOf('/SUBJECT') !== -1 || - this.showTopic.indexOf('/ABSTRACT') !== -1 + this.showTopic.indexOf('/PID') !== -1 || + this.showTopic.indexOf('/SUBJECT') !== -1 || + this.showTopic.indexOf('/WITHDRAWN') !== -1 || + this.showTopic.indexOf('/REINSTATE') !== -1 || + this.showTopic.indexOf('/ABSTRACT') !== -1 ); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4b03ce208f9..435e0a30588 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2594,7 +2594,7 @@ "item.version.create.modal.form.summary.label": "Summary", - "item.qa-withdrawn-reinstate.create.modal.form.summary.label": "Summary", + "item.qa-withdrawn-reinstate.create.modal.form.summary.label": "Reason", "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", @@ -3158,6 +3158,8 @@ "quality-assurance.event.table.project-details": "Project details", + "quality-assurance.event.table.reasons": "Reasons", + "quality-assurance.event.table.actions": "Actions", "quality-assurance.event.action.accept": "Accept suggestion", From 5589c76f5494f78c051a7a859604258e1e3f26f4 Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Tue, 7 Nov 2023 16:17:49 +0100 Subject: [PATCH 18/38] [CST-12109] porting of box thatallows undo of QAEvent request --- .../quality-assurance-event-data.service.ts | 10 ++++ .../quality-assurance-source-data.service.ts | 17 +++++++ src/app/item-page/item-page.module.ts | 2 + .../item-page/simple/item-page.component.html | 1 + .../qa-event-notification.component.html | 15 ++++++ .../qa-event-notification.component.scss | 7 +++ .../qa-event-notification.component.spec.ts | 19 ++++++++ .../qa-event-notification.component.ts | 48 +++++++++++++++++++ .../my-dspace-page.component.html | 1 + .../my-dspace-page/my-dspace-page.module.ts | 6 ++- ...ace-qa-events-notifications.component.html | 25 ++++++++++ ...ace-qa-events-notifications.component.scss | 6 +++ ...space-qa-events-notifications.component.ts | 41 ++++++++++++++++ src/app/shared/shared.module.ts | 4 +- src/app/shared/utils/split.pipe.ts | 10 ++++ 15 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html create mode 100644 src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss create mode 100644 src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts create mode 100644 src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts create mode 100644 src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html create mode 100644 src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss create mode 100644 src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts create mode 100644 src/app/shared/utils/split.pipe.ts diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index 284cd8791a7..8eb8359164a 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -86,6 +86,16 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService[]): Observable>> { + return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow); + } + /** * Clear findByTopic requests from cache */ diff --git a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts index 03a5da2e8c4..30f3b848f4f 100644 --- a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts @@ -16,6 +16,7 @@ import { PaginatedList } from '../../../data/paginated-list.model'; import { FindListOptions } from '../../../data/find-list-options.model'; import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; import { FindAllData, FindAllDataImpl } from '../../../data/base/find-all-data'; +import { SearchData } from '../../../data/base/search-data'; /** * The service handling all Quality Assurance source REST requests. @@ -25,6 +26,9 @@ import { FindAllData, FindAllDataImpl } from '../../../data/base/find-all-data'; export class QualityAssuranceSourceDataService extends IdentifiableDataService { private findAllData: FindAllData; + private searchAllData: SearchData; + + private searchByTargetMethod = 'byTarget'; /** * Initialize service variables @@ -84,4 +88,17 @@ export class QualityAssuranceSourceDataService extends IdentifiableDataService[]): Observable> { return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } + + /** + * Retrieves a paginated list of QualityAssuranceSourceObject objects that are associated with a given target object. + * @param options The options for the search query. + * @param useCachedVersionIfAvailable Whether to use a cached version of the data if available. + * @param reRequestOnStale Whether to re-request the data if the cached version is stale. + * @param linksToFollow The links to follow to retrieve the data. + * @returns An observable that emits a RemoteData object containing the paginated list of QualityAssuranceSourceObject objects. + */ + public getSourcesByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { + return this.searchAllData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } + } diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts index a8d41d15352..5aa1b6e508f 100644 --- a/src/app/item-page/item-page.module.ts +++ b/src/app/item-page/item-page.module.ts @@ -60,6 +60,7 @@ import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component import { ThemedFullFileSectionComponent } from './full/field-components/file-section/themed-full-file-section.component'; +import { QaEventNotificationComponent } from './simple/qa-event-notification/qa-event-notification.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -103,6 +104,7 @@ const DECLARATIONS = [ ItemAlertsComponent, ThemedItemAlertsComponent, BitstreamRequestACopyPageComponent, + QaEventNotificationComponent ]; @NgModule({ diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html index cc9983bb354..37a5e0c4cbf 100644 --- a/src/app/item-page/simple/item-page.component.html +++ b/src/app/item-page/simple/item-page.component.html @@ -2,6 +2,7 @@

+ diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html new file mode 100644 index 00000000000..f2a06bd4fd3 --- /dev/null +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -0,0 +1,15 @@ + + +
+ +
+
{{'item.qa-event-notification.check.notification-info' | translate : {num: + source.totalEvents } }}
+ +
+
+ + +Added file diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss new file mode 100644 index 00000000000..f852bb8454c --- /dev/null +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss @@ -0,0 +1,7 @@ +.source-logo { + max-height: var(--ds-header-logo-height); +} + +.sections-gap { + gap: 1rem; +} diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts new file mode 100644 index 00000000000..2621f1e6d01 --- /dev/null +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts @@ -0,0 +1,19 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { QaEventNotificationComponent } from './qa-event-notification.component'; + +describe('QaEventNotificationComponent', () => { + let component: QaEventNotificationComponent; + let fixture: ComponentFixture; + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ QaEventNotificationComponent ] + }) + .compileComponents(); + fixture = TestBed.createComponent(QaEventNotificationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts new file mode 100644 index 00000000000..c48d30851e5 --- /dev/null +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -0,0 +1,48 @@ +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Item } from '../../../core/shared/item.model'; +import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from '../../../core/shared/operators'; +import { Observable } from 'rxjs'; +import { AlertType } from '../../../shared/alert/aletr-type'; +import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { RequestParam } from '../../../core/cache/models/request-param.model'; +import { QualityAssuranceSourceDataService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service'; +import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model'; +@Component({ + selector: 'ds-qa-event-notification', + templateUrl: './qa-event-notification.component.html', + styleUrls: ['./qa-event-notification.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [QualityAssuranceSourceDataService] +}) +/** + * Component for displaying quality assurance event notifications for an item. + */ +export class QaEventNotificationComponent { + /** + * The item to display quality assurance event notifications for. + */ + @Input() item: Item; + /** + * The type of alert to display for the notification. + */ + AlertTypeInfo = AlertType.Info; + constructor( + private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, + ) { } + /** + * Returns an Observable of QualityAssuranceSourceObject[] for the current item. + * @returns An Observable of QualityAssuranceSourceObject[] for the current item. + * Note: sourceId is composed as: id: "sourceName:" + */ + getQualityAssuranceSources$(): Observable { + const findListTopicOptions: FindListOptions = { + searchParams: [new RequestParam('target', this.item.uuid)] + }; + return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions) + .pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + getPaginatedListPayload(), + ); + } +} 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 ea5784170fb..ed3c58a2867 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.html +++ b/src/app/my-dspace-page/my-dspace-page.component.html @@ -1,4 +1,5 @@
+
diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts index 6ad50af96a5..30dd49b145a 100644 --- a/src/app/my-dspace-page/my-dspace-page.module.ts +++ b/src/app/my-dspace-page/my-dspace-page.module.ts @@ -15,6 +15,9 @@ import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; import { SearchModule } from '../shared/search/search.module'; import { UploadModule } from '../shared/upload/upload.module'; +import { + MyDspaceQaEventsNotificationsComponent +} from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component'; const DECLARATIONS = [ MyDSpacePageComponent, @@ -22,7 +25,8 @@ const DECLARATIONS = [ MyDSpaceNewSubmissionComponent, CollectionSelectorComponent, MyDSpaceNewSubmissionDropdownComponent, - MyDSpaceNewExternalDropdownComponent + MyDSpaceNewExternalDropdownComponent, + MyDspaceQaEventsNotificationsComponent ]; @NgModule({ diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html new file mode 100644 index 00000000000..e4713d282ff --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html @@ -0,0 +1,25 @@ + + +
+ +
+
+ {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }} +
+ +
+
+ + diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss new file mode 100644 index 00000000000..f0a8fa29596 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss @@ -0,0 +1,6 @@ +.source-logo { + max-height: var(--ds-header-logo-height); +} +.sections-gap { + gap: 1rem; +} diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts new file mode 100644 index 00000000000..38a154ceaaa --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts @@ -0,0 +1,41 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { QualityAssuranceSourceDataService } from '../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service'; +import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from '../../core/shared/operators'; +import { Observable, of, tap } from 'rxjs'; +import { QualityAssuranceSourceObject } from 'src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model'; +@Component({ + selector: 'ds-my-dspace-qa-events-notifications', + templateUrl: './my-dspace-qa-events-notifications.component.html', + styleUrls: ['./my-dspace-qa-events-notifications.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class MyDspaceQaEventsNotificationsComponent implements OnInit { + /** + * An Observable that emits an array of QualityAssuranceSourceObject. + */ + sources$: Observable = of([]); + constructor(private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService) { } + + ngOnInit(): void { + this.getSources(); + } + /** + * Retrieves the sources for Quality Assurance. + * @returns An Observable of the sources for Quality Assurance. + * @throws An error if the retrieval of Quality Assurance sources fails. + */ + getSources() { + this.sources$ = this.qualityAssuranceSourceDataService.getSources() + .pipe( + getFirstCompletedRemoteData(), + tap((rd) => { + if (rd.hasFailed) { + throw new Error('Can\'t retrieve Quality Assurance sources'); + } + }), + getRemoteDataPayload(), + getPaginatedListPayload(), + ); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 90a853168cd..2881d46c2bd 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -287,6 +287,7 @@ import { NgxPaginationModule } from 'ngx-pagination'; import { QualityAssuranceEventDataService } from '../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; +import { SplitPipe } from './utils/split.pipe'; const MODULES = [ CommonModule, @@ -326,7 +327,8 @@ const PIPES = [ ObjNgFor, BrowserOnlyPipe, MarkdownPipe, - ShortNumberPipe + ShortNumberPipe, + SplitPipe ]; const COMPONENTS = [ diff --git a/src/app/shared/utils/split.pipe.ts b/src/app/shared/utils/split.pipe.ts new file mode 100644 index 00000000000..cccd285922a --- /dev/null +++ b/src/app/shared/utils/split.pipe.ts @@ -0,0 +1,10 @@ +import { Pipe, PipeTransform } from '@angular/core'; +@Pipe({ + name: 'dsSplit' +}) +export class SplitPipe implements PipeTransform { + transform(value: string, separator: string): string[] { + return value.split(separator); + } + +} From 1c3776b2d3bf8efe71132c7deae4371a36447f30 Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Fri, 24 Nov 2023 11:28:38 +0100 Subject: [PATCH 19/38] [CST-12109] porting missing code --- config/config.yml | 6 +- .../admin-notifications-routing.module.ts | 5 +- src/app/admin/admin-routing.module.ts | 22 +++++-- src/app/app-routing.module.ts | 5 +- .../data/feature-authorization/feature-id.ts | 3 +- .../quality-assurance-source-data.service.ts | 3 +- .../quality-assurance-topic-data.service.ts | 39 ++++++++----- .../qa-event-notification.component.html | 9 +-- .../qa-event-notification.component.ts | 18 ++++-- .../shared/dso-page/dso-edit-menu.resolver.ts | 35 ++++++++--- .../dso-withdrawn-reinstate-modal.service.ts | 2 +- src/app/shared/shared.module.ts | 6 +- .../quality-assurance-topics.actions.ts | 8 ++- .../quality-assurance-topics.component.html | 8 ++- .../quality-assurance-topics.component.ts | 58 ++++++++++++++++--- .../quality-assurance-topics.effects.ts | 4 +- .../quality-assurance-topics.service.ts | 29 +++++----- .../suggestion-notifications-state.service.ts | 4 +- src/assets/i18n/en.json5 | 4 ++ 19 files changed, 185 insertions(+), 83 deletions(-) diff --git a/config/config.yml b/config/config.yml index b5eecd112f0..a5337cdd0d4 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,5 +1,5 @@ rest: - ssl: true - host: api7.dspace.org - port: 443 + ssl: false + host: localhost + port: 8080 nameSpace: /server diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts index dc0d82c1d99..ab4d3f09faa 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts @@ -12,6 +12,9 @@ import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assuran import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component'; import { AdminQualityAssuranceSourcePageResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service'; import { SourceDataResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover'; +import { + SiteAdministratorGuard +} from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; @NgModule({ imports: [ @@ -32,7 +35,7 @@ import { SourceDataResolver } from './admin-quality-assurance-source-page-compon } }, { - canActivate: [ AuthenticatedGuard ], + canActivate: [ SiteAdministratorGuard ], path: `${QUALITY_ASSURANCE_EDIT_PATH}`, component: AdminQualityAssuranceSourcePageComponent, pathMatch: 'full', diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts index a7d19a69357..65b16139c15 100644 --- a/src/app/admin/admin-routing.module.ts +++ b/src/app/admin/admin-routing.module.ts @@ -8,6 +8,9 @@ import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.ser import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; import { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; +import { + SiteAdministratorGuard +} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; @NgModule({ imports: [ @@ -21,42 +24,49 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import path: REGISTRIES_MODULE_PATH, loadChildren: () => import('./admin-registries/admin-registries.module') .then((m) => m.AdminRegistriesModule), + canActivate: [SiteAdministratorGuard] }, { path: 'search', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: AdminSearchPageComponent, - data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' } + data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }, + canActivate: [SiteAdministratorGuard] }, { path: 'workflow', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: AdminWorkflowPageComponent, - data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' } + data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }, + canActivate: [SiteAdministratorGuard] }, { path: 'curation-tasks', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: AdminCurationTasksComponent, - data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' } + data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' }, + canActivate: [SiteAdministratorGuard] }, { path: 'metadata-import', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: MetadataImportPageComponent, - data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' } + data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' }, + canActivate: [SiteAdministratorGuard] }, { path: 'batch-import', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: BatchImportPageComponent, - data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' } + data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }, + canActivate: [SiteAdministratorGuard] }, { path: 'system-wide-alert', resolve: { breadcrumb: I18nBreadcrumbResolver }, loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule), - data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'} + data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}, + canActivate: [SiteAdministratorGuard] }, ]) ], diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0d7a0bd0f05..6c247eb9bfa 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,9 +3,6 @@ import { RouterModule, NoPreloading } from '@angular/router'; import { AuthBlockingGuard } from './core/auth/auth-blocking.guard'; import { AuthenticatedGuard } from './core/auth/authenticated.guard'; -import { - SiteAdministratorGuard -} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { ACCESS_CONTROL_MODULE_PATH, ADMIN_MODULE_PATH, @@ -154,7 +151,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone path: ADMIN_MODULE_PATH, loadChildren: () => import('./admin/admin.module') .then((m) => m.AdminModule), - canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard] + canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'login', diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts index 8fef45a9532..248698c1057 100644 --- a/src/app/core/data/feature-authorization/feature-id.ts +++ b/src/app/core/data/feature-authorization/feature-id.ts @@ -33,5 +33,6 @@ export enum FeatureID { CanSubmit = 'canSubmit', CanEditItem = 'canEditItem', CanRegisterDOI = 'canRegisterDOI', - CanSubscribe = 'canSubscribeDso', + CanSubscribe = 'canSubscribeDso' + } diff --git a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts index 30f3b848f4f..aed7f7541f8 100644 --- a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts @@ -16,7 +16,7 @@ import { PaginatedList } from '../../../data/paginated-list.model'; import { FindListOptions } from '../../../data/find-list-options.model'; import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; import { FindAllData, FindAllDataImpl } from '../../../data/base/find-all-data'; -import { SearchData } from '../../../data/base/search-data'; +import { SearchData, SearchDataImpl } from '../../../data/base/search-data'; /** * The service handling all Quality Assurance source REST requests. @@ -47,6 +47,7 @@ export class QualityAssuranceSourceDataService extends IdentifiableDataService { private findAllData: FindAllData; + private searchData: SearchData; + + private searchByTargetMethod = 'byTarget'; + private searchBySourceMethod = 'bySource'; /** * Initialize service variables @@ -43,23 +48,31 @@ export class QualityAssuranceTopicDataService extends IdentifiableDataService>> - * The list of Quality Assurance topics. + * Search for Quality Assurance topics. + * @param options The search options. + * @param useCachedVersionIfAvailable Whether to use cached version if available. + * @param reRequestOnStale Whether to re-request on stale. + * @param linksToFollow The links to follow. + * @returns An observable of remote data containing a paginated list of Quality Assurance topics. + */ + public searchTopicsByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { + return this.searchData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } + + /** + * Searches for quality assurance topics by source. + * @param options The search options. + * @param useCachedVersionIfAvailable Whether to use a cached version if available. + * @param reRequestOnStale Whether to re-request the data if it's stale. + * @param linksToFollow The links to follow. + * @returns An observable of the remote data containing the paginated list of quality assurance topics. */ - public getTopics(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { - return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + public searchTopicsBySource(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { + return this.searchData.searchBy(this.searchBySourceMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } /** diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html index f2a06bd4fd3..10247001497 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -1,15 +1,12 @@
-
-
{{'item.qa-event-notification.check.notification-info' | translate : {num: - source.totalEvents } }}
-
-Added file diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index c48d30851e5..fb6bad1b460 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -1,12 +1,13 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { Observable } from 'rxjs'; -import { AlertType } from '../../../shared/alert/aletr-type'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { RequestParam } from '../../../core/cache/models/request-param.model'; import { QualityAssuranceSourceDataService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service'; import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model'; +import { map, tap } from 'rxjs/operators'; +import { RemoteData } from '../../../core/data/remote-data'; @Component({ selector: 'ds-qa-event-notification', templateUrl: './qa-event-notification.component.html', @@ -25,9 +26,8 @@ export class QaEventNotificationComponent { /** * The type of alert to display for the notification. */ - AlertTypeInfo = AlertType.Info; constructor( - private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, + private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService ) { } /** * Returns an Observable of QualityAssuranceSourceObject[] for the current item. @@ -35,14 +35,20 @@ export class QaEventNotificationComponent { * Note: sourceId is composed as: id: "sourceName:" */ getQualityAssuranceSources$(): Observable { + console.log('ciao'); const findListTopicOptions: FindListOptions = { searchParams: [new RequestParam('target', this.item.uuid)] }; return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions) .pipe( getFirstCompletedRemoteData(), - getRemoteDataPayload(), - getPaginatedListPayload(), + tap(console.log), + map((data: RemoteData) => { + if (data.hasSucceeded) { + return data.payload.page; + } + return []; + }) ); } } diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 2b270abc766..6e4985cfa31 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -8,7 +8,10 @@ import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; import { Item } from '../../core/shared/item.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload +} from '../../core/shared/operators'; import { map, switchMap } from 'rxjs/operators'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; @@ -22,6 +25,13 @@ import { ResearcherProfileDataService } from '../../core/profile/researcher-prof import { NotificationsService } from '../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { AuthService } from '../../core/auth/auth.service'; +import { + QualityAssuranceSourceDataService +} from '../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service'; +import { FindListOptions } from '../../core/data/find-list-options.model'; +import { RequestParam } from '../../core/cache/models/request-param.model'; /** * Creates the menus for the dspace object pages @@ -40,7 +50,9 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection protected researcherProfileService: ResearcherProfileDataService, protected notificationsService: NotificationsService, protected translate: TranslateService, - protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService + protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService, + private auth: AuthService, + private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService ) { } @@ -121,16 +133,20 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection */ protected getItemMenu(dso): Observable { if (dso instanceof Item) { + const findListTopicOptions: FindListOptions = { + searchParams: [new RequestParam('target', dso.uuid)] + }; return combineLatest([ this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self), this.dsoVersioningModalService.isNewVersionButtonDisabled(dso), this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'), this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self), this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self), - this.authorizationService.isAuthorized(FeatureID.WithdrawItem, dso.self,), - this.authorizationService.isAuthorized(FeatureID.ReinstateItem, dso.self) + this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions).pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload()) ]).pipe( - map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, canWithdrawItem, canReinstateItem]) => { + map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, correction]) => { const isPerson = this.getDsoType(dso) === 'person'; return [ { @@ -177,12 +193,12 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'withdrawn-item', active: false, - visible: canWithdrawItem, + visible: dso.isArchived && correction.totalElements === 0, model: { type: MenuItemType.ONCLICK, text:'item.page.withdrawn', function: () => { - this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-withdrawn', canWithdrawItem); + this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-withdrawn', dso.isArchived && correction.totalElements === 0); } } as OnClickMenuItemModel, icon: 'lock', @@ -191,12 +207,12 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'reinstate-item', active: false, - visible: canReinstateItem, + visible: dso.isWithdrawn && correction.totalElements === 0, model: { type: MenuItemType.ONCLICK, text:'item.page.reinstate', function: () => { - this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-reinstate', canWithdrawItem); + this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-reinstate', dso.isWithdrawn && correction.totalElements === 0); } } as OnClickMenuItemModel, icon: 'unlock-keyhole', @@ -258,4 +274,5 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection return menu; }); } + } diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index ce491a89a50..242a5c1fc41 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -38,7 +38,7 @@ export class DsoWithdrawnReinstateModalService { const target = dso.id; // Open modal const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); - (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setWithdraw(!state); + (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setWithdraw(state); (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).createQAEvent .pipe( take(1) diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2881d46c2bd..b2b2420f105 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -288,6 +288,9 @@ import { QualityAssuranceEventDataService } from '../core/suggestion-notifications/qa/events/quality-assurance-event-data.service'; import { SplitPipe } from './utils/split.pipe'; +import { + QualityAssuranceSourceDataService +} from '../core/suggestion-notifications/qa/source/quality-assurance-source-data.service'; const MODULES = [ CommonModule, @@ -477,7 +480,8 @@ const PROVIDERS = [ TruncatableService, MockAdminGuard, AbstractTrackableComponent, - QualityAssuranceEventDataService + QualityAssuranceEventDataService, + QualityAssuranceSourceDataService ]; const DIRECTIVES = [ diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts index 2459d4352ab..482a85a9882 100644 --- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts +++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts @@ -25,6 +25,8 @@ export class RetrieveAllTopicsAction implements Action { payload: { elementsPerPage: number; currentPage: number; + source: string; + target?: string; }; /** @@ -35,10 +37,12 @@ export class RetrieveAllTopicsAction implements Action { * @param currentPage * The page number to retrieve */ - constructor(elementsPerPage: number, currentPage: number) { + constructor(elementsPerPage: number, currentPage: number, source: string, target?: string) { this.payload = { elementsPerPage, - currentPage + currentPage, + source, + target }; } } diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html index db8586f264d..ed91bbf6cab 100644 --- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html +++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html @@ -2,7 +2,11 @@

{{'quality-assurance.title'| translate}}

- {{'quality-assurance.topics.description'| translate:{source: sourceId} }} + {{'quality-assurance.topics.description'| translate:{source: sourceId} }} + + {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }} + {{(getTargetItemTitle() | async)}} +
@@ -15,7 +19,7 @@

{{'quality-assurance.topics'| translate}}

[collectionSize]="(totalElements$ | async)" [hideGear]="false" [hideSortOptions]="true" - (paginationChange)="getQualityAssuranceTopics()"> + (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)"> diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts index 3c8b4f8f38a..0f7a111089d 100644 --- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts +++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; -import { distinctUntilChanged, take } from 'rxjs/operators'; +import { distinctUntilChanged, map, take, tap } from 'rxjs/operators'; import { SortOptions } from '../../../core/cache/models/sort-options.model'; import { @@ -15,7 +15,10 @@ import { } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { ActivatedRoute } from '@angular/router'; -import { QualityAssuranceTopicsService } from './quality-assurance-topics.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; +import { Item } from '../../../core/shared/item.model'; +import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; /** * Component to display the Quality Assurance topic list. @@ -60,6 +63,17 @@ export class QualityAssuranceTopicsComponent implements OnInit { */ public sourceId: string; + /** + * This property represents a targetId (item-id) which is used to retrive a topic + * @type {string} + */ + public targetId: string; + + /** + * The URL of the item page. + */ + public itemPageUrl: string; + /** * Initialize the component variables. * @param {PaginationService} paginationService @@ -71,16 +85,16 @@ export class QualityAssuranceTopicsComponent implements OnInit { private paginationService: PaginationService, private activatedRoute: ActivatedRoute, private notificationsStateService: SuggestionNotificationsStateService, - private qualityAssuranceTopicsService: QualityAssuranceTopicsService + private itemService: ItemDataService ) { + this.sourceId = this.activatedRoute.snapshot.params.sourceId; + this.targetId = this.activatedRoute.snapshot.params.targetId; } /** * Component initialization. */ ngOnInit(): void { - this.sourceId = this.activatedRoute.snapshot.paramMap.get('sourceId'); - this.qualityAssuranceTopicsService.setSourceId(this.sourceId); this.topics$ = this.notificationsStateService.getQualityAssuranceTopics(); this.totalElements$ = this.notificationsStateService.getQualityAssuranceTopicsTotals(); } @@ -93,7 +107,7 @@ export class QualityAssuranceTopicsComponent implements OnInit { this.notificationsStateService.isQualityAssuranceTopicsLoaded().pipe( take(1) ).subscribe(() => { - this.getQualityAssuranceTopics(); + this.getQualityAssuranceTopics(this.sourceId, this.targetId); }) ); } @@ -121,13 +135,15 @@ export class QualityAssuranceTopicsComponent implements OnInit { /** * Dispatch the Quality Assurance topics retrival. */ - public getQualityAssuranceTopics(): void { + public getQualityAssuranceTopics(source: string, target?: string): void { this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe( distinctUntilChanged(), ).subscribe((options: PaginationComponentOptions) => { this.notificationsStateService.dispatchRetrieveQualityAssuranceTopics( options.pageSize, - options.currentPage + options.currentPage, + source, + target ); }); } @@ -150,6 +166,32 @@ export class QualityAssuranceTopicsComponent implements OnInit { } } + /** + * Returns an Observable that emits the title of the target item. + * The target item is retrieved by its ID using the itemService. + * The title is extracted from the first metadata value of the item. + * The item page URL is also set in the component. + * @returns An Observable that emits the title of the target item. + */ + getTargetItemTitle(): Observable { + return this.itemService.findById(this.targetId).pipe( + take(1), + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + tap((item: Item) => this.itemPageUrl = getItemPageRoute(item)), + map((item: Item) => item.firstMetadataValue('dc.title')) + ); + } + + /** + * Returns the page route for the given item. + * @param item The item to get the page route for. + * @returns The page route for the given item. + */ + getItemPageRoute(item: Item): string { + return getItemPageRoute(item); + } + /** * Unsubscribe from all subscriptions. */ diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts index 13e36700001..92d7dc9e21c 100644 --- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts +++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts @@ -37,7 +37,9 @@ export class QualityAssuranceTopicsEffects { switchMap(([action, currentState]: [RetrieveAllTopicsAction, any]) => { return this.qualityAssuranceTopicService.getTopics( action.payload.elementsPerPage, - action.payload.currentPage + action.payload.currentPage, + action.payload.source, + action.payload.target ).pipe( map((topics: PaginatedList) => new AddTopicsAction(topics.page, topics.totalPages, topics.currentPage, topics.totalElements) diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts index 6820791dffd..4144cd88758 100644 --- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts +++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts @@ -13,6 +13,7 @@ import { import { RequestParam } from '../../../core/cache/models/request-param.model'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { hasValue } from '../../../shared/empty.util'; /** * The service handling all Quality Assurance topic requests to the REST service. @@ -28,10 +29,6 @@ export class QualityAssuranceTopicsService { private qualityAssuranceTopicRestService: QualityAssuranceTopicDataService ) { } - /** - * sourceId used to get topics - */ - sourceId: string; /** * Return the list of Quality Assurance topics managing pagination and errors. @@ -43,17 +40,25 @@ export class QualityAssuranceTopicsService { * @return Observable> * The list of Quality Assurance topics. */ - public getTopics(elementsPerPage, currentPage): Observable> { + public getTopics(elementsPerPage, currentPage, source: string, target?: string): Observable> { const sortOptions = new SortOptions('name', SortDirection.ASC); - const findListOptions: FindListOptions = { elementsPerPage: elementsPerPage, currentPage: currentPage, sort: sortOptions, - searchParams: [new RequestParam('source', this.sourceId)] + searchParams: [new RequestParam('source', source)] }; - return this.qualityAssuranceTopicRestService.getTopics(findListOptions).pipe( + let request$: Observable>>; + + if (hasValue(target)) { + findListOptions.searchParams.push(new RequestParam('target', target)); + request$ = this.qualityAssuranceTopicRestService.searchTopicsByTarget(findListOptions); + } else { + request$ = this.qualityAssuranceTopicRestService.searchTopicsBySource(findListOptions); + } + + return request$.pipe( getFirstCompletedRemoteData(), map((rd: RemoteData>) => { if (rd.hasSucceeded) { @@ -64,12 +69,4 @@ export class QualityAssuranceTopicsService { }) ); } - - /** - * set sourceId which is used to get topics - * @param sourceId string - */ - setSourceId(sourceId: string) { - this.sourceId = sourceId; - } } diff --git a/src/app/suggestion-notifications/suggestion-notifications-state.service.ts b/src/app/suggestion-notifications/suggestion-notifications-state.service.ts index ec1ea2e0394..1fc54220188 100644 --- a/src/app/suggestion-notifications/suggestion-notifications-state.service.ts +++ b/src/app/suggestion-notifications/suggestion-notifications-state.service.ts @@ -118,8 +118,8 @@ export class SuggestionNotificationsStateService { * @param currentPage * The number of the current page. */ - public dispatchRetrieveQualityAssuranceTopics(elementsPerPage: number, currentPage: number): void { - this.store.dispatch(new RetrieveAllTopicsAction(elementsPerPage, currentPage)); + public dispatchRetrieveQualityAssuranceTopics(elementsPerPage: number, currentPage: number, sourceId: string, targteId?: string): void { + this.store.dispatch(new RetrieveAllTopicsAction(elementsPerPage, currentPage, sourceId, targteId)); } // Quality Assurance source diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 435e0a30588..f277a934233 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2604,6 +2604,10 @@ "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...", + "item.qa-event-notification.check.notification-withdrawn": "You have requested to withdrawn this item.", + + "item.qa-event-notification-undo-withdrawn.check.button": "Undo request withdrawal", + "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", "item.version.create.notification.success": "New version has been created with version number {{version}}", From 101cd0a553915e9a5f4ffe8d5eed4376bebce295 Mon Sep 17 00:00:00 2001 From: Mykhaylo Boychuk Date: Tue, 28 Nov 2023 00:17:04 +0100 Subject: [PATCH 20/38] [CST-12109] improvement code --- .../quality-assurance-event-data.service.ts | 8 +++++ .../qa-event-notification.component.html | 7 ++-- .../qa-event-notification.component.ts | 1 - ...m-withdrawn-reinstate-modal.component.html | 21 ++++++++---- .../withdrawn-reinstate-modal.component.ts | 7 ---- .../shared/dso-page/dso-edit-menu.resolver.ts | 28 +++++++--------- .../quality-assurance-events.component.html | 28 +++++++++++++++- .../quality-assurance-events.component.ts | 22 +++++++++++-- src/assets/i18n/en.json5 | 32 +++++++++++++++---- 9 files changed, 110 insertions(+), 44 deletions(-) diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index 8eb8359164a..86325102c7c 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -27,6 +27,9 @@ import { hasValue } from '../../../../shared/empty.util'; import { DeleteByIDRequest, PostRequest } from '../../../data/request.models'; import { HttpHeaders, HttpParams } from '@angular/common/http'; import { HttpOptions } from '../../../dspace-rest/dspace-rest.service'; +import { + QualityAssuranceEventData +} from '../../../../suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component'; /** * The service handling all Quality Assurance topic REST requests. @@ -241,4 +244,9 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService> { + return this.deleteData.delete(qaEvent.id); + } + } diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html index 10247001497..16f1955dc32 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -2,10 +2,11 @@
-
{{'item.qa-event-notification.check.notification-withdrawn' | translate : {num: source.totalEvents } }}
+
{{ this.item.isArchived ? ('qa-event-notification.check.notification-withdrawn' | translate) + : ('qa-event-notification.check.notification-reinstate' | translate) }}
+ class="btn btn-primary align-self-center">{{ this.item.isArchived ? ('qa-event-notification-undo-withdrawn.check.button' | translate) + : ('qa-event-notification-undo-reinstate.check.button' | translate) }}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index fb6bad1b460..0acc78f6772 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -35,7 +35,6 @@ export class QaEventNotificationComponent { * Note: sourceId is composed as: id: "sourceName:" */ getQualityAssuranceSources$(): Observable { - console.log('ciao'); const findListTopicOptions: FindListOptions = { searchParams: [new RequestParam('target', this.item.uuid)] }; diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html index f0e248c647e..1463235bee9 100644 --- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html +++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html @@ -1,16 +1,22 @@
- {{'item.qa.withdrawn.modal.header' | translate}} + {{ 'item.qa.withdrawn.modal.header' | translate }}
- - + + +
@@ -24,7 +30,8 @@ type="submit" (click)="onModalSubmit()" title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}"> - {{'item.qa.withdrown-reinstate.create.modal.button.confirm' | translate}} + {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate) + : ('qa-reinstate.create.modal.button.confirm' | translate) }}
@@ -39,7 +46,7 @@ -
+
{{'item.qa.reinstate.modal.header' | translate}}
-
+
+
+ +
@@ -226,3 +235,20 @@
+ + +
+ +
+
+

{{'quality-assurance.event.undo.description' | translate}}

+ + +
+ diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts index 18d05172858..2e91d08453c 100644 --- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts @@ -30,6 +30,9 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { Item } from '../../../core/shared/item.model'; import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { NoContent } from '../../../core/shared/NoContent.model'; /** * Component to display the Quality Assurance event list. @@ -85,6 +88,7 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { * @type {Observable} */ public isEventPageLoading: BehaviorSubject = new BehaviorSubject(false); + /** * The modal reference. * @type {any} @@ -105,6 +109,8 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ protected subs: Subscription[] = []; + isAdmin$: Observable; + /** * Initialize the component variables. * @param {ActivatedRoute} activatedRoute @@ -120,7 +126,8 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { private notificationsService: NotificationsService, private qualityAssuranceEventRestService: QualityAssuranceEventDataService, private paginationService: PaginationService, - private translateService: TranslateService + private translateService: TranslateService, + private authorizationService: AuthorizationDataService, ) { } @@ -130,6 +137,7 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { ngOnInit(): void { this.isEventPageLoading.next(true); + this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf); this.activatedRoute.paramMap.pipe( map((params) => params.get('topicId')), take(1), @@ -239,8 +247,14 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ public executeAction(action: string, eventData: QualityAssuranceEventData): void { eventData.isRunning = true; + let operation; + if (action === 'UNDO') { + operation = this.delete(eventData); + } else { + operation = this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason); + } this.subs.push( - this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason).pipe( + operation.pipe( getFirstCompletedRemoteData(), switchMap((rd: RemoteData) => { if (rd.hasSucceeded) { @@ -427,4 +441,8 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { last() ); } + + delete(qaEvent: QualityAssuranceEventData): Observable> { + return this.qualityAssuranceEventRestService.deleteQAEvent(qaEvent); + } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f277a934233..18e5ec3a661 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2566,9 +2566,9 @@ "item.version.create.modal.header": "New version", - "item.qa.withdrawn.modal.header": "Send Withdrawn Item request", + "item.qa.withdrawn.modal.header": "Request withdrawal", - "item.qa.reinstate.modal.header": "Send Reinstate Item request", + "item.qa.reinstate.modal.header": "Request reinstate", "item.qa.reinstate.create.modal.header": "New version", @@ -2582,7 +2582,9 @@ "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request", - "item.qa.withdrown-reinstate.create.modal.button.confirm": "Send Request", + "qa-withdrown.create.modal.button.confirm": "Withdrawn", + + "qa-reinstate.create.modal.button.confirm": "Reinstate", "item.version.create.modal.button.cancel": "Cancel", @@ -2594,19 +2596,31 @@ "item.version.create.modal.form.summary.label": "Summary", - "item.qa-withdrawn-reinstate.create.modal.form.summary.label": "Reason", + "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdrawn this item", + + "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal", + + "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item", + + "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment", "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", - "item.qa.withdrown-reinstate.modal.form.summary.placeholder": "Indicates the reasons (optionaly)", + "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal", + + "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstate", "item.version.create.modal.submitted.header": "Creating new version...", "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...", - "item.qa-event-notification.check.notification-withdrawn": "You have requested to withdrawn this item.", + "qa-event-notification.check.notification-withdrawn": "You have requested to withdrawn this item.", - "item.qa-event-notification-undo-withdrawn.check.button": "Undo request withdrawal", + "qa-event-notification.check.notification-reinstate": "You have requested to reinstate this item.", + + "qa-event-notification-undo-withdrawn.check.button": "Undo request withdrawal", + + "qa-event-notification-undo-reinstate.check.button": "Undo request reinstatment", "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", @@ -3170,6 +3184,8 @@ "quality-assurance.event.action.ignore": "Ignore suggestion", + "quality-assurance.event.action.undo": "DELETE", + "quality-assurance.event.action.reject": "Reject suggestion", "quality-assurance.event.action.import": "Import project and accept suggestion", @@ -3210,6 +3226,8 @@ "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?", + "quality-assurance.event.undo.description": "This operation can't be undone!", + "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?", "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.", From 805e98b8379071d5414fb0f84735a8f4cb764c5a Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 17 Jan 2024 18:39:54 +0100 Subject: [PATCH 21/38] [CST-12109] fixed failing unit tests after merge --- ...ality-assurance-topic-data.service.spec.ts | 23 +++++++++----- .../qa-event-notification.component.spec.ts | 30 ++++++++++++++++++- .../notifications-state.service.spec.ts | 4 +-- ...quality-assurance-events.component.spec.ts | 4 +++ ...quality-assurance-topics.component.spec.ts | 10 +++---- .../quality-assurance-topics.reducer.spec.ts | 2 +- .../quality-assurance-topics.service.spec.ts | 16 +++++----- .../dso-page/dso-edit-menu.resolver.spec.ts | 26 ++++++++++++---- src/app/shared/mocks/notifications.mock.ts | 29 ++++++++++++------ 9 files changed, 104 insertions(+), 40 deletions(-) diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts index 638ee3fa62e..4b164e3d5bf 100644 --- a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts +++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts @@ -82,20 +82,27 @@ describe('QualityAssuranceTopicDataService', () => { spyOn((service as any).findAllData, 'findAll').and.callThrough(); spyOn((service as any), 'findById').and.callThrough(); + spyOn((service as any).searchData, 'searchBy').and.callThrough(); }); - describe('getTopics', () => { - it('should call findListByHref', (done) => { - service.getTopics().subscribe( - (res) => { - expect((service as any).findAllData.findAll).toHaveBeenCalledWith({}, true, true); - } + describe('searchTopicsByTarget', () => { + it('should call searchData.searchBy with the correct parameters', () => { + const options = { elementsPerPage: 10 }; + const useCachedVersionIfAvailable = true; + const reRequestOnStale = true; + + service.searchTopicsByTarget(options, useCachedVersionIfAvailable, reRequestOnStale); + + expect((service as any).searchData.searchBy).toHaveBeenCalledWith( + 'byTarget', + options, + useCachedVersionIfAvailable, + reRequestOnStale ); - done(); }); it('should return a RemoteData> for the object with the given URL', () => { - const result = service.getTopics(); + const result = service.searchTopicsByTarget(); const expected = cold('(a)', { a: paginatedListRD }); diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts index 2621f1e6d01..2a1ccb28aec 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts @@ -1,16 +1,44 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { QaEventNotificationComponent } from './qa-event-notification.component'; +import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; +import { createPaginatedList } from 'src/app/shared/testing/utils.test'; +import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { QualityAssuranceSourceDataService } from 'src/app/core/notifications/qa/source/quality-assurance-source-data.service'; +import { RequestService } from 'src/app/core/data/request.service'; +import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; +import { ObjectCacheService } from 'src/app/core/cache/object-cache.service'; +import { RemoteDataBuildService } from 'src/app/core/cache/builders/remote-data-build.service'; +import { provideMockStore } from '@ngrx/store/testing'; +import { HALEndpointService } from 'src/app/core/shared/hal-endpoint.service'; +import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub'; describe('QaEventNotificationComponent', () => { let component: QaEventNotificationComponent; let fixture: ComponentFixture; + let qualityAssuranceSourceDataServiceStub: any; + + const obj = createSuccessfulRemoteDataObject$(createPaginatedList([new QualityAssuranceSourceObject()])); + const item = Object.assign({ uuid: '1234' }); beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ QaEventNotificationComponent ] + imports: [CommonModule, TranslateModule.forRoot()], + declarations: [ QaEventNotificationComponent ], + providers: [ + { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub }, + { provide: RequestService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test')}, + ObjectCacheService, + RemoteDataBuildService, + provideMockStore({}) + ], }) .compileComponents(); fixture = TestBed.createComponent(QaEventNotificationComponent); component = fixture.componentInstance; + component.item = item; fixture.detectChanges(); }); it('should create', () => { diff --git a/src/app/notifications/notifications-state.service.spec.ts b/src/app/notifications/notifications-state.service.spec.ts index f07b4f56970..324710ad09b 100644 --- a/src/app/notifications/notifications-state.service.spec.ts +++ b/src/app/notifications/notifications-state.service.spec.ts @@ -271,8 +271,8 @@ describe('NotificationsStateService', () => { it('Should call store.dispatch', () => { const elementsPerPage = 3; const currentPage = 1; - const action = new RetrieveAllTopicsAction(elementsPerPage, currentPage); - service.dispatchRetrieveQualityAssuranceTopics(elementsPerPage, currentPage); + const action = new RetrieveAllTopicsAction(elementsPerPage, currentPage, 'source', 'target'); + service.dispatchRetrieveQualityAssuranceTopics(elementsPerPage, currentPage, 'source', 'target'); expect(serviceAsAny.store.dispatch).toHaveBeenCalledWith(action); }); }); diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts index 3349dd3154d..c69a9108f99 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts @@ -42,6 +42,8 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { ItemDataService } from 'src/app/core/data/item-data.service'; +import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; describe('QualityAssuranceEventsComponent test suite', () => { let fixture: ComponentFixture; @@ -118,6 +120,8 @@ describe('QualityAssuranceEventsComponent test suite', () => { { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: TranslateService, useValue: getMockTranslateService() }, { provide: PaginationService, useValue: paginationService }, + { provide: ItemDataService, useValue: {} }, + { provide: AuthorizationDataService, useValue: {} }, QualityAssuranceEventsComponent ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts index fd64b82ce7d..228dbffd5e7 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts @@ -16,7 +16,7 @@ import { NotificationsStateService } from '../../notifications-state.service'; import { cold } from 'jasmine-marbles'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { QualityAssuranceTopicsService } from './quality-assurance-topics.service'; +import { ItemDataService } from 'src/app/core/data/item-data.service'; describe('QualityAssuranceTopicsComponent test suite', () => { let fixture: ComponentFixture; @@ -44,14 +44,14 @@ describe('QualityAssuranceTopicsComponent test suite', () => { providers: [ { provide: NotificationsStateService, useValue: mockNotificationsStateService }, { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: { - paramMap: { - get: () => 'openaire', + params: { + sourceId: 'openaire', + targetId: null }, }}}, { provide: PaginationService, useValue: paginationService }, + { provide: ItemDataService, useValue: {} }, QualityAssuranceTopicsComponent, - // tslint:disable-next-line: no-empty - { provide: QualityAssuranceTopicsService, useValue: { setSourceId: (sourceId: string) => { } }} ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents().then(() => { diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts index a1c002d3f25..37d83f6e4fe 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts @@ -29,7 +29,7 @@ describe('qualityAssuranceTopicsReducer test suite', () => { const expectedState = qualityAssuranceTopicInitialState; expectedState.processing = true; - const action = new RetrieveAllTopicsAction(elementPerPage, currentPage); + const action = new RetrieveAllTopicsAction(elementPerPage, currentPage, 'ENRICH!MORE!ABSTRACT'); const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action); expect(newState).toEqual(expectedState); diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts index c6aae27a888..78cedb2e2a7 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts @@ -42,30 +42,30 @@ describe('QualityAssuranceTopicsService', () => { beforeEach(() => { restService = TestBed.inject(QualityAssuranceTopicDataService); restServiceAsAny = restService; - restServiceAsAny.getTopics.and.returnValue(observableOf(paginatedListRD)); + restServiceAsAny.searchTopicsBySource.and.returnValue(observableOf(paginatedListRD)); + restServiceAsAny.searchTopicsByTarget.and.returnValue(observableOf(paginatedListRD)); service = new QualityAssuranceTopicsService(restService); serviceAsAny = service; }); describe('getTopics', () => { - it('Should proxy the call to qualityAssuranceTopicRestService.getTopics', () => { + it('should proxy the call to qualityAssuranceTopicRestService.searchTopicsBySource', () => { const sortOptions = new SortOptions('name', SortDirection.ASC); const findListOptions: FindListOptions = { elementsPerPage: elementsPerPage, currentPage: currentPage, sort: sortOptions, - searchParams: [new RequestParam('source', 'ENRICH!MORE!ABSTRACT')] + searchParams: [new RequestParam('source', 'openaire')] }; - service.setSourceId('ENRICH!MORE!ABSTRACT'); - const result = service.getTopics(elementsPerPage, currentPage); - expect((service as any).qualityAssuranceTopicRestService.getTopics).toHaveBeenCalledWith(findListOptions); + service.getTopics(elementsPerPage, currentPage, 'openaire'); + expect((service as any).qualityAssuranceTopicRestService.searchTopicsBySource).toHaveBeenCalledWith(findListOptions); }); - it('Should return a paginated list of Quality Assurance topics', () => { + it('should return a paginated list of Quality Assurance topics', () => { const expected = cold('(a|)', { a: paginatedList }); - const result = service.getTopics(elementsPerPage, currentPage); + const result = service.getTopics(elementsPerPage, currentPage, 'openaire'); expect(result).toBeObservable(expected); }); }); diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index e28a416f230..14b4313ac22 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -23,6 +23,10 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { Community } from '../../core/shared/community.model'; import { Collection } from '../../core/shared/collection.model'; import flatten from 'lodash/flatten'; +import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; +import { AuthService } from 'src/app/core/auth/auth.service'; +import { AuthServiceMock } from '../mocks/auth.service.mock'; +import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service'; describe('DSOEditMenuResolver', () => { @@ -39,6 +43,8 @@ describe('DSOEditMenuResolver', () => { let researcherProfileService; let notificationsService; let translate; + let dsoWithdrawnReinstateModalService; + let correctionsDataService; const dsoRoute = (dso: DSpaceObject) => { return { @@ -141,6 +147,14 @@ describe('DSOEditMenuResolver', () => { error: {}, }); + dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', { + openCreateWithdrawnReinstateModal: {}, + }); + + correctionsDataService = jasmine.createSpyObj('correctionsDataService', { + findByItem: observableOf([]) + }); + TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule], declarations: [AdminSidebarComponent], @@ -152,6 +166,9 @@ describe('DSOEditMenuResolver', () => { {provide: ResearcherProfileDataService, useValue: researcherProfileService}, {provide: TranslateService, useValue: translate}, {provide: NotificationsService, useValue: notificationsService}, + {provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService}, + {provide: AuthService, useValue: new AuthServiceMock()}, + {provide: CorrectionTypeDataService, useValue: correctionsDataService}, { provide: NgbModal, useValue: { open: () => {/*comment*/ @@ -350,7 +367,7 @@ describe('DSOEditMenuResolver', () => { route = dsoRoute(testItem); }); - it('should return Item-specific entries', (done) => { + it('should return Item-specific entries', () => { const result = resolver.getDsoMenus(testObject, route, state); combineLatest(result).pipe(map(flatten)).subscribe((menu) => { const orcidEntry = menu.find(entry => entry.id === 'orcid-dso'); @@ -371,20 +388,18 @@ describe('DSOEditMenuResolver', () => { expect(claimEntry.active).toBeFalse(); expect(claimEntry.visible).toBeFalse(); expect(claimEntry.model.type).toEqual(MenuItemType.ONCLICK); - done(); }); }); - it('should not return Community/Collection-specific entries', (done) => { + it('should not return Community/Collection-specific entries', () => { const result = resolver.getDsoMenus(testObject, route, state); combineLatest(result).pipe(map(flatten)).subscribe((menu) => { const subscribeEntry = menu.find(entry => entry.id === 'subscribe'); expect(subscribeEntry).toBeFalsy(); - done(); }); }); - it('should return as third part the common list ', (done) => { + it('should return as third part the common list ', () => { const result = resolver.getDsoMenus(testObject, route, state); combineLatest(result).pipe(map(flatten)).subscribe((menu) => { const editEntry = menu.find(entry => entry.id === 'edit-dso'); @@ -395,7 +410,6 @@ describe('DSOEditMenuResolver', () => { expect((editEntry.model as LinkMenuItemModel).link).toEqual( '/items/test-item-uuid/edit/metadata' ); - done(); }); }); }); diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts index 707b9a9e6ab..86f7b74a809 100644 --- a/src/app/shared/mocks/notifications.mock.ts +++ b/src/app/shared/mocks/notifications.mock.ts @@ -1482,7 +1482,8 @@ export const qualityAssuranceEventObjectMissingPid: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing PID' }, _links: { self: { @@ -1519,7 +1520,8 @@ export const qualityAssuranceEventObjectMissingPid2: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing PID' }, _links: { self: { @@ -1556,7 +1558,8 @@ export const qualityAssuranceEventObjectMissingPid3: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing PID' }, _links: { self: { @@ -1593,7 +1596,8 @@ export const qualityAssuranceEventObjectMissingPid4: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing DOI' }, _links: { self: { @@ -1630,7 +1634,8 @@ export const qualityAssuranceEventObjectMissingPid5: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing PID' }, _links: { self: { @@ -1667,7 +1672,8 @@ export const qualityAssuranceEventObjectMissingPid6: QualityAssuranceEventObject funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing PID' }, _links: { self: { @@ -1704,7 +1710,8 @@ export const qualityAssuranceEventObjectMissingAbstract: QualityAssuranceEventOb funder: null, fundingProgram: null, jurisdiction: null, - title: null + title: null, + reason: 'Missing abstract' }, _links: { self: { @@ -1741,6 +1748,7 @@ export const qualityAssuranceEventObjectMissingProjectFound: QualityAssuranceEve funder: 'EC', fundingProgram: 'H2020', jurisdiction: 'EU', + reason: 'Project found', title: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage' }, _links: { @@ -1778,7 +1786,8 @@ export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssurance funder: 'EC', fundingProgram: 'H2021', jurisdiction: 'EU', - title: 'Tracking Unknown Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage' + title: 'Tracking Unknown Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage', + reason: 'Project not found' }, _links: { self: { @@ -1838,8 +1847,10 @@ export function getMockNotificationsStateService(): any { */ export function getMockQualityAssuranceTopicRestService(): QualityAssuranceTopicDataService { return jasmine.createSpyObj('QualityAssuranceTopicDataService', { - getTopics: jasmine.createSpy('getTopics'), getTopic: jasmine.createSpy('getTopic'), + searchTopicsByTarget: jasmine.createSpy('searchTopicsByTarget'), + searchTopicsBySource: jasmine.createSpy('searchTopicsBySource'), + clearFindAllTopicsRequests: jasmine.createSpy('clearFindAllTopicsRequests'), }); } From a4b0c5a13db87ab00ef6aa1f3d09c46b2e5575f2 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 30 Nov 2023 13:01:46 +0100 Subject: [PATCH 22/38] cherry-picked "[CST-12791] changed the route for suggestions to be be accessible to any logged in user" to CST-12109 --- .../admin-notifications-routing-paths.ts | 6 ++---- src/app/admin/admin-routing-paths.ts | 5 +++++ src/app/admin/admin-routing.module.ts | 7 +------ src/app/app-routing.module.ts | 7 +++++++ .../qa-event-notification.component.ts | 10 ++++++++++ src/app/menu.resolver.ts | 2 +- .../my-dspace-qa-events-notifications.component.html | 2 +- .../my-dspace-qa-events-notifications.component.ts | 9 +++++++++ .../qa/topics/quality-assurance-topics.component.ts | 9 +++++++++ 9 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts index 2820a9a2c7b..791b44af2b1 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts @@ -1,8 +1,6 @@ -import { URLCombiner } from '../../core/url-combiner/url-combiner'; -import { getNotificationsModuleRoute } from '../admin-routing-paths'; export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance'; -export function getQualityAssuranceRoute(id: string) { - return new URLCombiner(getNotificationsModuleRoute(), QUALITY_ASSURANCE_EDIT_PATH, id).toString(); +export function getQualityAssuranceEditRoute() { + return `/${QUALITY_ASSURANCE_EDIT_PATH}`; } diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts index 30f801cecb7..144b9d09bf0 100644 --- a/src/app/admin/admin-routing-paths.ts +++ b/src/app/admin/admin-routing-paths.ts @@ -1,5 +1,6 @@ import { URLCombiner } from '../core/url-combiner/url-combiner'; import { getAdminModuleRoute } from '../app-routing-paths'; +import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifications-routing-paths'; export const REGISTRIES_MODULE_PATH = 'registries'; export const NOTIFICATIONS_MODULE_PATH = 'notifications'; @@ -11,3 +12,7 @@ export function getRegistriesModuleRoute() { export function getNotificationsModuleRoute() { return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString(); } + +export function getNotificatioQualityAssuranceRoute() { + return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString(); +} diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts index 65b16139c15..c17dd5554ff 100644 --- a/src/app/admin/admin-routing.module.ts +++ b/src/app/admin/admin-routing.module.ts @@ -6,7 +6,7 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component'; import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; -import { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths'; +import { REGISTRIES_MODULE_PATH } from './admin-routing-paths'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { SiteAdministratorGuard @@ -15,11 +15,6 @@ import { @NgModule({ imports: [ RouterModule.forChild([ - { - path: NOTIFICATIONS_MODULE_PATH, - loadChildren: () => import('./admin-notifications/admin-notifications.module') - .then((m) => m.AdminNotificationsModule), - }, { path: REGISTRIES_MODULE_PATH, loadChildren: () => import('./admin-registries/admin-registries.module') diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6c247eb9bfa..69322752459 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -37,6 +37,7 @@ import { import { ServerCheckGuard } from './core/server-check/server-check.guard'; import { MenuResolver } from './menu.resolver'; import { ThemedPageErrorComponent } from './page-error/themed-page-error.component'; +import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths'; @NgModule({ imports: [ @@ -153,6 +154,12 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone .then((m) => m.AdminModule), canActivate: [EndUserAgreementCurrentUserGuard] }, + { + path: NOTIFICATIONS_MODULE_PATH, + loadChildren: () => import('./admin/admin-notifications/admin-notifications.module') + .then((m) => m.AdminNotificationsModule), + canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] + }, { path: 'login', loadChildren: () => import('./login-page/login-page.module') diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index 4fb40cddcdf..adb120e2a57 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -8,6 +8,8 @@ import { QualityAssuranceSourceDataService } from '../../../core/notifications/q import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; import { map, tap } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; +import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; + @Component({ selector: 'ds-qa-event-notification', templateUrl: './qa-event-notification.component.html', @@ -50,4 +52,12 @@ export class QaEventNotificationComponent { }) ); } + + /** + * Returns the quality assurance route. + * @returns The quality assurance route. + */ + getQualityAssuranceRoute(): string { + return getNotificatioQualityAssuranceRoute(); + } } diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index a9a247007f5..318667267b5 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -556,7 +556,7 @@ export class MenuResolver implements Resolve { model: { type: MenuItemType.LINK, text: 'menu.section.quality-assurance', - link: '/admin/notifications/quality-assurance' + link: '/notifications/quality-assurance' } as LinkMenuItemModel, }, /* Admin Search */ diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html index e4713d282ff..46c7bdc3cff 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html @@ -14,7 +14,7 @@ {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index adb120e2a57..d7bfb973782 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { Observable } from 'rxjs'; @@ -6,9 +6,11 @@ import { FindListOptions } from '../../../core/data/find-list-options.model'; import { RequestParam } from '../../../core/cache/models/request-param.model'; import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { map, tap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; +import { PaginatedList } from 'src/app/core/data/paginated-list.model'; +import { NavigationEnd, Router } from '@angular/router'; @Component({ selector: 'ds-qa-event-notification', @@ -20,17 +22,40 @@ import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routin /** * Component for displaying quality assurance event notifications for an item. */ -export class QaEventNotificationComponent { +export class QaEventNotificationComponent implements OnChanges { /** * The item to display quality assurance event notifications for. */ @Input() item: Item; + + /** + * An observable that emits an array of QualityAssuranceSourceObject. + */ + sources$: Observable; /** * The type of alert to display for the notification. */ constructor( - private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService - ) { } + private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, + private router: Router, + private chd: ChangeDetectorRef + ) { + this.router.events.pipe().subscribe((event) => { + if (event instanceof NavigationEnd) { + this.sources$ = this.getQualityAssuranceSources$(); + this.chd.markForCheck(); + } + }); + } + + /** + * Detect changes to the item input and update the sources$ observable. + */ + ngOnChanges(changes: SimpleChanges): void { + if (changes.item && changes.item.currentValue.uuid !== changes.item.previousValue?.uuid) { + this.sources$ = this.getQualityAssuranceSources$(); + } + } /** * Returns an Observable of QualityAssuranceSourceObject[] for the current item. * @returns An Observable of QualityAssuranceSourceObject[] for the current item. @@ -40,11 +65,10 @@ export class QaEventNotificationComponent { const findListTopicOptions: FindListOptions = { searchParams: [new RequestParam('target', this.item.uuid)] }; - return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions) + return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions, false) .pipe( getFirstCompletedRemoteData(), - tap(console.log), - map((data: RemoteData) => { + map((data: RemoteData>) => { if (data.hasSucceeded) { return data.payload.page; } diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html index 04a43c7ddce..0f7fc01d62e 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.html +++ b/src/app/notifications/qa/events/quality-assurance-events.component.html @@ -185,7 +185,7 @@

- + {{'quality-assurance.events.back' | translate}} diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 6fa5382d8d7..ef0d10d6f83 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -193,7 +193,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'withdrawn-item', active: false, - visible: dso.isArchived && correction.totalElements > 0, + visible: dso.isArchived && correction?.totalElements > 0, model: { type: MenuItemType.ONCLICK, text:'item.page.withdrawn', @@ -207,7 +207,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'reinstate-item', active: false, - visible: dso.isWithdrawn && correction.totalElements > 0, + visible: dso.isWithdrawn && correction?.totalElements > 0, model: { type: MenuItemType.ONCLICK, text:'item.page.reinstate', diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index a28b8483d20..13e9490bd03 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -28,7 +28,7 @@ export class DsoWithdrawnReinstateModalService { private notificationsService: NotificationsService, protected authorizationService: AuthorizationDataService, private translateService: TranslateService, - protected qaEventDataService: QualityAssuranceEventDataService + protected qaEventDataService: QualityAssuranceEventDataService, ) {} /** @@ -62,6 +62,7 @@ export class DsoWithdrawnReinstateModalService { const message = (correctionType === 'request-withdrawn') ? withdrawnMessage : reinstateMessage; this.notificationsService.success(this.translateService.get(message)); this.authorizationService.invalidateAuthorizationsRequestCache(); + this.router.navigate([this.router.url]); // refresh page } else { this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); } From 415bdeabc197930fa7559b7dfa15f2a4a975f900 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 2 Nov 2023 17:49:19 +0100 Subject: [PATCH 24/38] cherry-picked "[CST-12145] get qa-sources by target for item-page & refactor" into [CST-12109] --- .../quality-assurance-source-data.service.ts | 1 - src/assets/i18n/en.json5 | 8 ++++++++ src/assets/i18n/it.json5 | 16 ++++++++++++++++ src/assets/images/qa-coar-notify-logo.png | Bin 0 -> 31117 bytes src/assets/images/qa-openaire-logo.png | Bin 0 -> 31205 bytes 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/qa-coar-notify-logo.png create mode 100644 src/assets/images/qa-openaire-logo.png diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts index aed7f7541f8..f6a58fdd45f 100644 --- a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts +++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts @@ -101,5 +101,4 @@ export class QualityAssuranceSourceDataService extends IdentifiableDataService[]): Observable>> { return this.searchAllData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } - } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 477759cec81..396e5db9a2e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2384,6 +2384,14 @@ "item.truncatable-part.show-less": "Collapse", + "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + + "item.qa-event-notification-info.check.button": "Check", + + "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + + "mydspace.qa-event-notification-info.check.button": "Check", + "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 7f410ce0b17..2d709a8c333 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -3535,6 +3535,22 @@ // "item.truncatable-part.show-less": "Collapse", "item.truncatable-part.show-less": "Riduci", + // "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + // TODO New key - Add a translation + "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + + // "item.qa-event-notification-info.check.button": "Check", + // TODO New key - Add a translation + "item.qa-event-notification-info.check.button": "Check", + + // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + // TODO New key - Add a translation + "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + + // "mydspace.qa-event-notification-info.check.button": "Check", + // TODO New key - Add a translation + "mydspace.qa-event-notification-info.check.button": "Check", + // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", "workflow-item.search.result.delete-supervision.modal.header": "Elimina l'ordine di supervisione", diff --git a/src/assets/images/qa-coar-notify-logo.png b/src/assets/images/qa-coar-notify-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0ba021dfd27dcd323bade2c944c87c7d728c34d8 GIT binary patch literal 31117 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/qa-openaire-logo.png b/src/assets/images/qa-openaire-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..359fd73b8461b1f350ce567cb687f1bb7da5b717 GIT binary patch literal 31205 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 literal 0 HcmV?d00001 From e4858f223911621da6b3c6e99bb5f26a696e1165 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 18 Jan 2024 18:48:31 +0100 Subject: [PATCH 25/38] [CST-12109] fixes --- ...space-qa-events-notifications.component.html | 1 + .../quality-assurance-events.component.ts | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html index 46c7bdc3cff..4f6fa90474f 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html @@ -7,6 +7,7 @@
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts index a827184460d..bf0b1dfa804 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts @@ -155,10 +155,17 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { this.topic = id; return this.getQualityAssuranceEvents(); }) - ).subscribe((events: QualityAssuranceEventData[]) => { - this.eventsUpdated$.next(events); - this.isEventPageLoading.next(false); - }); + ).subscribe( + { + next: (events: QualityAssuranceEventData[]) => { + this.eventsUpdated$.next(events); + this.isEventPageLoading.next(false); + }, + error: (error) => { + this.isEventPageLoading.next(false); + } + } + ); } /** @@ -378,7 +385,7 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { switchMap((rd: RemoteData>) => { if (rd.hasSucceeded) { this.totalElements$.next(rd.payload.totalElements); - if (rd.payload.totalElements > 0) { + if (rd.payload?.page?.length > 0) { return this.fetchEvents(rd.payload.page); } else { return of([]); From ad5e3af1418ee3c03b650be04f85128d8874b627 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 22 Jan 2024 16:59:10 +0100 Subject: [PATCH 26/38] [CST-12109] "refresh" page refactor --- .../qa-event-notification.component.ts | 14 ++--------- ...space-qa-events-notifications.component.ts | 7 +----- .../dso-withdrawn-reinstate-modal.service.ts | 24 ++++++++++++++++++- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index d7bfb973782..e5f509c405e 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { Observable } from 'rxjs'; @@ -10,7 +10,6 @@ import { map } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; import { PaginatedList } from 'src/app/core/data/paginated-list.model'; -import { NavigationEnd, Router } from '@angular/router'; @Component({ selector: 'ds-qa-event-notification', @@ -37,16 +36,7 @@ export class QaEventNotificationComponent implements OnChanges { */ constructor( private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, - private router: Router, - private chd: ChangeDetectorRef - ) { - this.router.events.pipe().subscribe((event) => { - if (event instanceof NavigationEnd) { - this.sources$ = this.getQualityAssuranceSources$(); - this.chd.markForCheck(); - } - }); - } + ) { } /** * Detect changes to the item input and update the sources$ observable. diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts index 02de82a59f5..d383f3a728c 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service'; import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from '../../core/shared/operators'; -import { Observable, of, tap } from 'rxjs'; +import { Observable, of } from 'rxjs'; import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; import { getNotificatioQualityAssuranceRoute } from '../../admin/admin-routing-paths'; @@ -30,11 +30,6 @@ export class MyDspaceQaEventsNotificationsComponent implements OnInit { this.sources$ = this.qualityAssuranceSourceDataService.getSources() .pipe( getFirstCompletedRemoteData(), - tap((rd) => { - if (rd.hasFailed) { - throw new Error('Can\'t retrieve Quality Assurance sources'); - } - }), getRemoteDataPayload(), getPaginatedListPayload(), ); diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index 13e9490bd03..a4214099a72 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -50,6 +50,15 @@ export class DsoWithdrawnReinstateModalService { ); } + /** + * Sends a quality assurance request. + * + * @param target - The target - the item's UUID. + * @param correctionType - The type of correction. + * @param reason - The reason for the request. + * Reloads the current page in order to update the withdrawn/reinstate button. + * and desplay a notification box. + */ sendQARequest(target: string, correctionType: string, reason: string): void { this.qaEventDataService.postData(target, correctionType, '', reason) .pipe ( @@ -62,11 +71,24 @@ export class DsoWithdrawnReinstateModalService { const message = (correctionType === 'request-withdrawn') ? withdrawnMessage : reinstateMessage; this.notificationsService.success(this.translateService.get(message)); this.authorizationService.invalidateAuthorizationsRequestCache(); - this.router.navigate([this.router.url]); // refresh page + this.reloadPage(true); } else { this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error')); } }); } + + /** + * Reloads the current page or navigates to a specified URL. + * @param self - A boolean indicating whether to reload the current page (true) or navigate to a specified URL (false). + * @param urlToNavigateTo - The URL to navigate to if `self` is false. + * skipLocationChange:true means dont update the url to / when navigating + */ + reloadPage(self: boolean, urlToNavigateTo?: string) { + const url = self ? this.router.url : urlToNavigateTo; + this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => { + this.router.navigate([`/${url}`]); + }); + } } From 8cc45e8cbed8b6d1f101c3b15be1de63ba1ed083 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 23 Jan 2024 12:59:47 +0100 Subject: [PATCH 27/38] [CST-12109] request reinstate for normal users --- .../alerts/item-alerts.component.html | 5 ++- .../alerts/item-alerts.component.spec.ts | 21 ++++++++++ .../item-page/alerts/item-alerts.component.ts | 39 +++++++++++++++++++ src/app/notifications/notifications.module.ts | 13 +++++-- .../qa/events/get-ePerson-data.pipe.ts | 26 +++++++++++++ .../quality-assurance-events.component.html | 37 ++++++++++++------ .../quality-assurance-events.component.ts | 5 +++ .../shared/dso-page/dso-edit-menu.resolver.ts | 6 +-- .../dso-withdrawn-reinstate-modal.service.ts | 6 ++- src/assets/i18n/en.json5 | 4 ++ 10 files changed, 143 insertions(+), 19 deletions(-) create mode 100644 src/app/notifications/qa/events/get-ePerson-data.pipe.ts diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html index cd71d23a910..f6304340f3d 100644 --- a/src/app/item-page/alerts/item-alerts.component.html +++ b/src/app/item-page/alerts/item-alerts.component.html @@ -6,7 +6,10 @@
{{'item.alerts.withdrawn' | translate}} - {{"404.link.home-page" | translate}} +
+ {{"404.link.home-page" | translate}} + {{ 'item.alerts.reinstate-request' | translate}} +
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts index a933eb6a589..6dee6879b13 100644 --- a/src/app/item-page/alerts/item-alerts.component.spec.ts +++ b/src/app/item-page/alerts/item-alerts.component.spec.ts @@ -4,16 +4,37 @@ import { TranslateModule } from '@ngx-translate/core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Item } from '../../core/shared/item.model'; import { By } from '@angular/platform-browser'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { of } from 'rxjs'; +import { DsoWithdrawnReinstateModalService } from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; +import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; describe('ItemAlertsComponent', () => { let component: ItemAlertsComponent; let fixture: ComponentFixture; let item: Item; + let authorizationService; + let dsoWithdrawnReinstateModalService; + let correctionTypeDataService; beforeEach(waitForAsync(() => { + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: of(true) + }); + dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', { + openCreateWithdrawnReinstateModal: {} + }); + correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService', { + findByItem: of({}) + }); TestBed.configureTestingModule({ declarations: [ItemAlertsComponent], imports: [TranslateModule.forRoot()], + providers: [ + { provide: AuthorizationDataService, useValue: authorizationService }, + { provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService }, + { provide: CorrectionTypeDataService, useValue: correctionTypeDataService } + ], schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts index 2b1df58c9f7..025dafb425e 100644 --- a/src/app/item-page/alerts/item-alerts.component.ts +++ b/src/app/item-page/alerts/item-alerts.component.ts @@ -1,6 +1,12 @@ import { Component, Input } from '@angular/core'; import { Item } from '../../core/shared/item.model'; import { AlertType } from '../../shared/alert/alert-type'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { Observable, combineLatest, map } from 'rxjs'; +import { DsoWithdrawnReinstateModalService, REQUEST_REINSTATE } from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; +import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; +import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from 'src/app/core/shared/operators'; @Component({ selector: 'ds-item-alerts', @@ -21,4 +27,37 @@ export class ItemAlertsComponent { * @type {AlertType} */ public AlertTypeEnum = AlertType; + + constructor( + private authService: AuthorizationDataService, + private dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService, + private correctionTypeDataService: CorrectionTypeDataService + ) { + } + + /** + * Determines whether to show the reinstate button. + * The button is shown if the user is not an admin and the item has a reinstate request. + * @returns An Observable that emits a boolean value indicating whether to show the reinstate button. + */ + showReinstateButton$(): Observable { + const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + getPaginatedListPayload() + ); + const isAdmin$ = this.authService.isAuthorized(FeatureID.AdministratorOf); + return combineLatest([isAdmin$, correction$]).pipe( + map(([isAdmin, correction]) => { + return !isAdmin && correction.some((correctionType) => correctionType.topic === REQUEST_REINSTATE); + } + )); + } + + /** + * Opens the reinstate modal for the item. + */ + openReinstateModal() { + this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(this.item, 'request-reinstate', this.item.isArchived); + } } diff --git a/src/app/notifications/notifications.module.ts b/src/app/notifications/notifications.module.ts index 7003ed3cc86..26ad81cb9cc 100644 --- a/src/app/notifications/notifications.module.ts +++ b/src/app/notifications/notifications.module.ts @@ -26,6 +26,7 @@ import { QualityAssuranceSourceService } from './qa/source/quality-assurance-sou import { QualityAssuranceSourceDataService } from '../core/notifications/qa/source/quality-assurance-source-data.service'; +import { GetEPersonDataPipe } from './qa/events/get-ePerson-data.pipe'; const MODULES = [ CommonModule, @@ -55,7 +56,11 @@ const PROVIDERS = [ QualityAssuranceSourceService, QualityAssuranceTopicDataService, QualityAssuranceSourceDataService, - QualityAssuranceEventDataService + QualityAssuranceEventDataService, +]; + +const PIPES = [ + GetEPersonDataPipe ]; @NgModule({ @@ -65,7 +70,8 @@ const PROVIDERS = [ declarations: [ ...COMPONENTS, ...DIRECTIVES, - ...ENTRY_COMPONENTS + ...ENTRY_COMPONENTS, + ...PIPES ], providers: [ ...PROVIDERS @@ -75,7 +81,8 @@ const PROVIDERS = [ ], exports: [ ...COMPONENTS, - ...DIRECTIVES + ...DIRECTIVES, + ...PIPES ] }) diff --git a/src/app/notifications/qa/events/get-ePerson-data.pipe.ts b/src/app/notifications/qa/events/get-ePerson-data.pipe.ts new file mode 100644 index 00000000000..d84ff30c638 --- /dev/null +++ b/src/app/notifications/qa/events/get-ePerson-data.pipe.ts @@ -0,0 +1,26 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { Observable, tap } from 'rxjs'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; + +@Pipe({ + name: 'dsGetEPersonData' +}) +export class GetEPersonDataPipe implements PipeTransform { + constructor(private ePersonDataService: EPersonDataService) { } + + /** + * Transforms the personId into an Observable of EPerson. + * @param personId The ID of the person. + * @returns An Observable of EPerson. + */ + transform(personId: string): Observable { + return this.ePersonDataService.findById(personId, true).pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + tap((ePerson: EPerson) => {console.log(ePerson)}) + ); + } + +} diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html index 0f7fc01d62e..e617d7b55e8 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.html +++ b/src/app/notifications/qa/events/quality-assurance-events.component.html @@ -36,9 +36,14 @@

{{'quality-assurance.event.table.project-details' | translate}} - - {{'quality-assurance.event.table.reasons' | translate}} - + + + {{'quality-assurance.event.table.reasons' | translate}} + + + {{'quality-assurance.event.table.person-who-requested' | translate}} + + {{'quality-assurance.event.table.actions' | translate}} @@ -76,14 +81,24 @@

{{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }} - - -

- - {{eventElement.event.message.reason}}
- -

- + + +

+ + {{eventElement.event.message.reason}}
+ +

+ + +

+ + + {{ (eventElement.event.originalId | dsGetEPersonData | async)?.name }} + + +

+ +

diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts index bf0b1dfa804..24369c00fa6 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts @@ -34,6 +34,7 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { NoContent } from '../../../core/shared/NoContent.model'; import {environment} from '../../../../environments/environment'; +import { getEntityPageRoute } from 'src/app/item-page/item-page-routing-paths'; /** * Component to display the Quality Assurance event list. @@ -458,4 +459,8 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { delete(qaEvent: QualityAssuranceEventData): Observable> { return this.qualityAssuranceEventRestService.deleteQAEvent(qaEvent); } + + getEntityPageRoute(itemId: string): string { + return getEntityPageRoute('person', itemId); + } } diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index ef0d10d6f83..bcded3acd5a 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -23,7 +23,7 @@ import { getDSORoute } from '../../app-routing-paths'; import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; import { NotificationsService } from '../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; +import { DsoWithdrawnReinstateModalService, REQUEST_REINSTATE, REQUEST_WITHDRAWN } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; import { AuthService } from '../../core/auth/auth.service'; import { FindListOptions } from '../../core/data/find-list-options.model'; import { RequestParam } from '../../core/cache/models/request-param.model'; @@ -193,7 +193,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'withdrawn-item', active: false, - visible: dso.isArchived && correction?.totalElements > 0, + visible: dso.isArchived && correction?.page.some((c) => c.topic === REQUEST_WITHDRAWN), model: { type: MenuItemType.ONCLICK, text:'item.page.withdrawn', @@ -207,7 +207,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection { id: 'reinstate-item', active: false, - visible: dso.isWithdrawn && correction?.totalElements > 0, + visible: dso.isWithdrawn && correction?.page.some((c) => c.topic === REQUEST_REINSTATE), model: { type: MenuItemType.ONCLICK, text:'item.page.reinstate', diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index a4214099a72..ebb304957e4 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -15,6 +15,10 @@ import { NotificationsService } from '../../notifications/notifications.service' import { take } from 'rxjs/operators'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { Item } from 'src/app/core/shared/item.model'; + +export const REQUEST_WITHDRAWN = 'REQUEST/WITHDRAWN'; +export const REQUEST_REINSTATE = 'REQUEST/REINSTATE'; @Injectable({ providedIn: 'root' @@ -34,7 +38,7 @@ export class DsoWithdrawnReinstateModalService { /** * Open the create withdrawn modal for the provided dso */ - openCreateWithdrawnReinstateModal(dso, correctionType: string, state: boolean): void { + openCreateWithdrawnReinstateModal(dso: Item, correctionType: string, state: boolean): void { const target = dso.id; // Open modal const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 396e5db9a2e..164d384ea34 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1916,6 +1916,10 @@ "item.alerts.withdrawn": "This item has been withdrawn", + "item.alerts.reinstate-request": "Request reinstate", + + "quality-assurance.event.table.person-who-requested": "Requested by", + "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", "item.edit.authorizations.title": "Edit item's Policies", From 2f43bb71a03f7310721a902b3876a2c325cc1f6c Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 23 Jan 2024 14:53:41 +0100 Subject: [PATCH 28/38] [CST-12109] small fixes --- src/app/notifications/qa/events/get-ePerson-data.pipe.ts | 4 +--- src/assets/i18n/en.json5 | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/notifications/qa/events/get-ePerson-data.pipe.ts b/src/app/notifications/qa/events/get-ePerson-data.pipe.ts index d84ff30c638..58084d4a422 100644 --- a/src/app/notifications/qa/events/get-ePerson-data.pipe.ts +++ b/src/app/notifications/qa/events/get-ePerson-data.pipe.ts @@ -18,9 +18,7 @@ export class GetEPersonDataPipe implements PipeTransform { transform(personId: string): Observable { return this.ePersonDataService.findById(personId, true).pipe( getFirstCompletedRemoteData(), - getRemoteDataPayload(), - tap((ePerson: EPerson) => {console.log(ePerson)}) + getRemoteDataPayload() ); } - } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 164d384ea34..621836e161d 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2480,7 +2480,7 @@ "item.page.version.create": "Create new version", - "item.page.withdrawn": "Withdrawn this Item", + "item.page.withdrawn": "Withdraw this Item", "item.page.reinstate": "Reinstate this Item", @@ -2616,7 +2616,7 @@ "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request", - "qa-withdrown.create.modal.button.confirm": "Withdrawn", + "qa-withdrown.create.modal.button.confirm": "Withdraw", "qa-reinstate.create.modal.button.confirm": "Reinstate", @@ -2630,7 +2630,7 @@ "item.version.create.modal.form.summary.label": "Summary", - "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdrawn this item", + "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item", "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal", @@ -2648,7 +2648,7 @@ "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...", - "qa-event-notification.check.notification-withdrawn": "You have requested to withdrawn this item.", + "qa-event-notification.check.notification-withdrawn": "You have requested to withdraw this item.", "qa-event-notification.check.notification-reinstate": "You have requested to reinstate this item.", From ac6c890d780f77a67728200b36256b0490e4e977 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 23 Jan 2024 17:51:12 +0100 Subject: [PATCH 29/38] [CST-12109] tests & translations --- .../alerts/item-alerts.component.spec.ts | 57 +++++++++++++++++-- .../quality-assurance-source.component.html | 2 +- .../quality-assurance-source.component.ts | 16 +++++- .../quality-assurance-topics.component.html | 2 +- .../quality-assurance-topics.component.ts | 15 +++++ .../dso-withdrawn-reinstate-modal.service.ts | 17 +++--- src/assets/i18n/en.json5 | 4 ++ 7 files changed, 96 insertions(+), 17 deletions(-) diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts index 6dee6879b13..c55bac41800 100644 --- a/src/app/item-page/alerts/item-alerts.component.spec.ts +++ b/src/app/item-page/alerts/item-alerts.component.spec.ts @@ -17,13 +17,14 @@ describe('ItemAlertsComponent', () => { let dsoWithdrawnReinstateModalService; let correctionTypeDataService; + const itemMock = Object.assign(new Item(), { + uuid: 'item-uuid', + id: 'item-uuid', + }); + beforeEach(waitForAsync(() => { - authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: of(true) - }); - dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', { - openCreateWithdrawnReinstateModal: {} - }); + authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']); + dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService',['openCreateWithdrawnReinstateModal']); correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService', { findByItem: of({}) }); @@ -43,6 +44,7 @@ describe('ItemAlertsComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ItemAlertsComponent); component = fixture.componentInstance; + component.item = itemMock; fixture.detectChanges(); }); @@ -105,4 +107,47 @@ describe('ItemAlertsComponent', () => { expect(privateWarning).toBeNull(); }); }); + + describe('show reinstate button', () => { + it('should return false if user is an admin', () => { + const isAdmin$ = of(true); + authorizationService.isAuthorized.and.returnValue(isAdmin$); + const result$ = component.showReinstateButton$(); + result$.subscribe((result) => { + expect(result).toBe(false); + }); + }); + + it('should return false if no correction types are found', () => { + const isAdmin$ = of(false); + authorizationService.isAuthorized.and.returnValue(isAdmin$); + correctionTypeDataService.findByItem.and.returnValue(of([])); + const result$ = component.showReinstateButton$(); + result$.subscribe((result) => { + expect(result).toBe(false); + }); + }); + + it('should return false if no correction type with topic "REQUEST_REINSTATE" is found', () => { + const isAdmin$ = of(false); + authorizationService.isAuthorized.and.returnValue(isAdmin$); + correctionTypeDataService.findByItem.and.returnValue(of([{ topic: 'OTHER_TOPIC' }])); + const result$ = component.showReinstateButton$(); + result$.subscribe((result) => { + expect(result).toBe(false); + }); + }); + + it('should return true if user is not an admin and correction type with topic "REQUEST_REINSTATE" is found', () => { + const isAdmin$ = of(false); + authorizationService.isAuthorized.and.returnValue(isAdmin$); + correctionTypeDataService.findByItem.and.returnValue(of([{ topic: 'REQUEST_REINSTATE' }])); + + const result$ = component.showReinstateButton$(); + + result$.subscribe((result) => { + expect(result).toBe(true); + }); + }); + }); }); diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html index 0f6cf184024..841c70b6a7c 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.component.html +++ b/src/app/notifications/qa/source/quality-assurance-source.component.html @@ -34,7 +34,7 @@

{{'quality-assurance.source'| translate}}

{{sourceElement.id}} - {{sourceElement.lastEvent}} + {{formatDate(sourceElement.lastEvent)}}

{{topicElement.name}} - {{topicElement.lastEvent}} + {{formatDate(topicElement.lastEvent)}}
+
+
+ + + {{'quality-assurance.events.back-to-sources' | translate}} + +
+
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts index ecc7e668985..96a613d26ca 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { distinctUntilChanged, map, take, tap } from 'rxjs/operators'; @@ -20,7 +20,6 @@ import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core import { Item } from '../../../core/shared/item.model'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; -import { format } from 'date-fns'; /** * Component to display the Quality Assurance topic list. @@ -30,7 +29,7 @@ import { format } from 'date-fns'; templateUrl: './quality-assurance-topics.component.html', styleUrls: ['./quality-assurance-topics.component.scss'], }) -export class QualityAssuranceTopicsComponent implements OnInit { +export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit { /** * The pagination system configuration for HTML listing. * @type {PaginationComponentOptions} @@ -138,7 +137,7 @@ export class QualityAssuranceTopicsComponent implements OnInit { * Dispatch the Quality Assurance topics retrival. */ public getQualityAssuranceTopics(source: string, target?: string): void { - this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe( + this.subs.push(this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe( distinctUntilChanged(), ).subscribe((options: PaginationComponentOptions) => { this.notificationsStateService.dispatchRetrieveQualityAssuranceTopics( @@ -147,7 +146,7 @@ export class QualityAssuranceTopicsComponent implements OnInit { source, target ); - }); + })); } /** @@ -202,20 +201,6 @@ export class QualityAssuranceTopicsComponent implements OnInit { return getNotificatioQualityAssuranceRoute(); } - /** - * Formats the given date string into the format 'yyyy-MM-dd HH:mm:ss'. - * If the date is falsy, an empty string is returned. - * - * @param date - The date string to format. - * @returns The formatted date string. - */ - formatDate(date: string): string { - if (!date) { - return ''; - } - return format(new Date(date), 'yyyy-MM-dd HH:mm:ss'); - } - /** * Unsubscribe from all subscriptions. */ diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts index f843bec75d7..de842eb1e5b 100644 --- a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts +++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts @@ -9,13 +9,29 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/ templateUrl: './item-withdrawn-reinstate-modal.component.html', styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'] }) +/** + * Represents a modal component for withdrawing or reinstating an item. + * Implements the ModalBeforeDismiss interface. + */ export class ItemWithdrawnReinstateModalComponent implements ModalBeforeDismiss { + /** + * The reason for withdrawing or reinstating a suggestion. + */ reason: string; - + /** + * Indicates whether the item can be withdrawn. + */ canWithdraw: boolean; + /** + * BehaviorSubject that represents the submitted state. + * Emits a boolean value indicating whether the form has been submitted or not. + */ submitted$: BehaviorSubject = new BehaviorSubject(false); - + /** + * Event emitter for creating a QA event. + * @event createQAEvent + */ @Output() createQAEvent: EventEmitter = new EventEmitter(); constructor( @@ -23,22 +39,36 @@ export class ItemWithdrawnReinstateModalComponent implements ModalBeforeDismiss protected authorizationService: AuthorizationDataService, ) {} + /** + * Closes the modal. + */ onModalClose() { this.activeModal.close(); } + /** + * Determines whether the modal can be dismissed. + * @returns {boolean} True if the modal can be dismissed, false otherwise. + */ beforeDismiss(): boolean { // prevent the modal from being dismissed after version creation is initiated return !this.submitted$.getValue(); } + /** + * Handles the submission of the modal form. + * Emits the reason for withdrawal or reinstatement through the createQAEvent output. + */ onModalSubmit() { this.submitted$.next(true); this.createQAEvent.emit(this.reason); } + /** + * Sets the withdrawal state of the component. + * @param state The new withdrawal state. + */ public setWithdraw(state: boolean) { this.canWithdraw = state; } - } diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index bb96c693aa0..d5f47ed57bf 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -23,6 +23,9 @@ export const REQUEST_REINSTATE = 'REQUEST/REINSTATE'; @Injectable({ providedIn: 'root' }) +/** + * Service for managing the withdrawn/reinstate modal for a DSO. + */ export class DsoWithdrawnReinstateModalService { constructor( diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index bbfc4f6e4fd..9b03d04d795 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -518,7 +518,7 @@ "admin.quality-assurance.page.title": "Quality Assurance", - "admin.notifications.source.breadcrumbs": "Quality Assurance Source", + "admin.notifications.source.breadcrumbs": "Quality Assurance", "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.", @@ -2480,9 +2480,9 @@ "item.page.version.create": "Create new version", - "item.page.withdrawn": "Withdraw this Item", + "item.page.withdrawn": "Request a withdrawal for this item", - "item.page.reinstate": "Reinstate this Item", + "item.page.reinstate": "Request reinstatement", "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", @@ -3190,7 +3190,9 @@ "quality-assurance.table.actions": "Actions", - "quality-assurance.button.detail": "Show details", + "quality-assurance.source-list.button.detail": "Show topics for {{param}}", + + "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}", "quality-assurance.noTopics": "No topics found.", @@ -3256,6 +3258,8 @@ "quality-assurance.events.back": "Back to topics", + "quality-assurance.events.back-to-sources": "Back to sources", + "quality-assurance.event.table.less": "Show less", "quality-assurance.event.table.more": "Show more", From 7350fdd1254250debe4e3cefd5fef28251a0edf6 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 21 Feb 2024 18:06:45 +0100 Subject: [PATCH 32/38] [CST-12109] qa-event notification box fixes --- .../admin-notifications-routing.module.ts | 15 ++++ .../qa-event-notification.component.html | 18 ++++- .../qa-event-notification.component.spec.ts | 72 +++++++++++++------ .../qa-event-notification.component.ts | 16 +++-- .../quality-assurance-events.component.html | 8 --- .../quality-assurance-events.component.ts | 36 ++++++---- .../quality-assurance-topics.component.html | 10 +-- .../quality-assurance-topics.component.ts | 13 +++- src/app/shared/utils/split.pipe.ts | 6 ++ .../suggestions.service.ts | 15 ++-- src/assets/i18n/en.json5 | 12 ++-- 11 files changed, 149 insertions(+), 72 deletions(-) diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts index 761c819b1b7..e00a88cbe22 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts @@ -56,6 +56,21 @@ import { showBreadcrumbsFluid: false } }, + { + canActivate: [ AuthenticatedGuard ], + path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`, + component: AdminQualityAssuranceTopicsPageComponent, + pathMatch: 'full', + resolve: { + breadcrumb: I18nBreadcrumbResolver, + openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver + }, + data: { + title: 'admin.quality-assurance.page.title', + breadcrumbKey: 'admin.quality-assurance', + showBreadcrumbsFluid: false + } + }, { canActivate: [ SiteAdministratorGuard ], path: `${QUALITY_ASSURANCE_EDIT_PATH}`, diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html index e38ecd82394..169fe00950f 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -2,9 +2,21 @@
-
{{ this.item.isArchived ? ('qa-event-notification.check.notification-withdrawn' | translate) - : ('qa-event-notification.check.notification-reinstate' | translate) }}
-
+
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts index 2a1ccb28aec..a9d16440a80 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts @@ -1,47 +1,79 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { QaEventNotificationComponent } from './qa-event-notification.component'; -import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; -import { createPaginatedList } from 'src/app/shared/testing/utils.test'; -import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { createPaginatedList } from '../../../shared/testing/utils.test'; +import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { QualityAssuranceSourceDataService } from 'src/app/core/notifications/qa/source/quality-assurance-source-data.service'; -import { RequestService } from 'src/app/core/data/request.service'; -import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; -import { ObjectCacheService } from 'src/app/core/cache/object-cache.service'; -import { RemoteDataBuildService } from 'src/app/core/cache/builders/remote-data-build.service'; +import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; +import { RequestService } from '../../../core/data/request.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { ObjectCacheService } from '../../../core/cache/object-cache.service'; +import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; import { provideMockStore } from '@ngrx/store/testing'; -import { HALEndpointService } from 'src/app/core/shared/hal-endpoint.service'; -import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub'; +import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; +import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { of } from 'rxjs'; +import { By } from '@angular/platform-browser'; +import { SplitPipe } from 'src/app/shared/utils/split.pipe'; describe('QaEventNotificationComponent', () => { let component: QaEventNotificationComponent; let fixture: ComponentFixture; let qualityAssuranceSourceDataServiceStub: any; + let authorizationService: AuthorizationDataService; - const obj = createSuccessfulRemoteDataObject$(createPaginatedList([new QualityAssuranceSourceObject()])); + const obj = Object.assign(new QualityAssuranceSourceObject(), { + id: 'sourceName:target', + source: 'sourceName', + target: 'target', + totalEvents: 1 + }); + + const objPL = createSuccessfulRemoteDataObject$(createPaginatedList([obj])); const item = Object.assign({ uuid: '1234' }); beforeEach(async () => { + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: of(true) + }); + + qualityAssuranceSourceDataServiceStub = { + getSourcesByTarget: () => objPL + }; await TestBed.configureTestingModule({ imports: [CommonModule, TranslateModule.forRoot()], - declarations: [ QaEventNotificationComponent ], + declarations: [QaEventNotificationComponent, SplitPipe], providers: [ - { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub }, - { provide: RequestService, useValue: {} }, - { provide: NotificationsService, useValue: {} }, - { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test')}, - ObjectCacheService, - RemoteDataBuildService, - provideMockStore({}) - ], + { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub }, + { provide: RequestService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test') }, + { provide: AuthorizationDataService, useValue: authorizationService }, + ObjectCacheService, + RemoteDataBuildService, + provideMockStore({}) + ], }) .compileComponents(); fixture = TestBed.createComponent(QaEventNotificationComponent); component = fixture.componentInstance; component.item = item; + component.sources$ = of([obj]); fixture.detectChanges(); }); + it('should create', () => { expect(component).toBeTruthy(); }); + + it('should display sources if present', () => { + const alertElements = fixture.debugElement.queryAll(By.css('.alert')); + expect(alertElements.length).toBe(1); + }); + + it('should return the quality assurance route when getQualityAssuranceRoute is called', () => { + const route = component.getQualityAssuranceRoute(); + expect(route).toBe('/notifications/quality-assurance'); + }); }); diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index e5f509c405e..6f8e55c9d2b 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -6,10 +6,12 @@ import { FindListOptions } from '../../../core/data/find-list-options.model'; import { RequestParam } from '../../../core/cache/models/request-param.model'; import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { map } from 'rxjs/operators'; +import { catchError, map } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; import { PaginatedList } from 'src/app/core/data/paginated-list.model'; +import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; @Component({ selector: 'ds-qa-event-notification', @@ -32,11 +34,16 @@ export class QaEventNotificationComponent implements OnChanges { */ sources$: Observable; /** - * The type of alert to display for the notification. + * An observable that emits a boolean representing whether the current user is an admin. */ + isAdmin$: Observable; + constructor( private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, - ) { } + private authService: AuthorizationDataService, + ) { + this.isAdmin$ = this.authService.isAuthorized(FeatureID.AdministratorOf); + } /** * Detect changes to the item input and update the sources$ observable. @@ -63,7 +70,8 @@ export class QaEventNotificationComponent implements OnChanges { return data.payload.page; } return []; - }) + }), + catchError(() => []) ); } diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html index 9d9cd2b58c1..286552a00c6 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.html +++ b/src/app/notifications/qa/events/quality-assurance-events.component.html @@ -196,14 +196,6 @@

-
-
- - - {{'quality-assurance.events.back' | translate}} - -
-
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts index 7dcccae2de2..60550a8bafe 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts @@ -33,7 +33,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { NoContent } from '../../../core/shared/NoContent.model'; -import {environment} from '../../../../environments/environment'; +import { environment } from '../../../../environments/environment'; /** * Component to display the Quality Assurance event list. @@ -119,6 +119,9 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ protected subs: Subscription[] = []; + /** + * Observable that emits a boolean value indicating whether the user is an admin. + */ isAdmin$: Observable; /** @@ -146,15 +149,13 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ ngOnInit(): void { this.isEventPageLoading.next(true); - this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf); - // this.sourceId = this.activatedRoute.snapshot.params.sourceId; this.activatedRoute.paramMap.pipe( - tap((params) => { - this.sourceUrlForProjectSearch = environment.qualityAssuranceConfig.sourceUrlMapForProjectSearch[params.get('sourceId')]; - this.sourceId = params.get('sourceId'); - }), - map((params) => params.get('topicId')), + tap((params) => { + this.sourceUrlForProjectSearch = environment.qualityAssuranceConfig.sourceUrlMapForProjectSearch[params.get('sourceId')]; + this.sourceId = params.get('sourceId'); + }), + map((params) => params.get('topicId')), take(1), switchMap((id: string) => { const regEx = /!/g; @@ -180,11 +181,11 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { */ public hasDetailColumn(): boolean { return (this.showTopic.indexOf('/PROJECT') !== -1 || - this.showTopic.indexOf('/PID') !== -1 || - this.showTopic.indexOf('/SUBJECT') !== -1 || - this.showTopic.indexOf('/WITHDRAWN') !== -1 || - this.showTopic.indexOf('/REINSTATE') !== -1 || - this.showTopic.indexOf('/ABSTRACT') !== -1 + this.showTopic.indexOf('/PID') !== -1 || + this.showTopic.indexOf('/SUBJECT') !== -1 || + this.showTopic.indexOf('/WITHDRAWN') !== -1 || + this.showTopic.indexOf('/REINSTATE') !== -1 || + this.showTopic.indexOf('/ABSTRACT') !== -1 ); } @@ -270,9 +271,9 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { eventData.isRunning = true; let operation; if (action === 'UNDO') { - operation = this.delete(eventData); + operation = this.delete(eventData); } else { - operation = this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason); + operation = this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason); } this.subs.push( operation.pipe( @@ -462,6 +463,11 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy { ); } + /** + * Deletes a quality assurance event. + * @param qaEvent The quality assurance event to delete. + * @returns An Observable of RemoteData containing NoContent. + */ delete(qaEvent: QualityAssuranceEventData): Observable> { return this.qualityAssuranceEventRestService.deleteQAEvent(qaEvent); } diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html index e2148a611e9..631296ea1c4 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html @@ -44,7 +44,7 @@

{{'quality-assurance.topics'| translate}}

@@ -58,12 +58,4 @@

{{'quality-assurance.topics'| translate}}

-
-
- - - {{'quality-assurance.events.back-to-sources' | translate}} - -
-
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts index 96a613d26ca..bda45c71c87 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts @@ -14,7 +14,7 @@ import { AdminQualityAssuranceTopicsPageParams } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { ItemDataService } from '../../../core/data/item-data.service'; import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; import { Item } from '../../../core/shared/item.model'; @@ -87,6 +87,7 @@ export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, After private activatedRoute: ActivatedRoute, private itemService: ItemDataService, private notificationsStateService: NotificationsStateService, + private router: Router, ) { this.sourceId = this.activatedRoute.snapshot.params.sourceId; this.targetId = this.activatedRoute.snapshot.params.targetId; @@ -96,7 +97,15 @@ export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, After * Component initialization. */ ngOnInit(): void { - this.topics$ = this.notificationsStateService.getQualityAssuranceTopics(); + this.topics$ = this.notificationsStateService.getQualityAssuranceTopics().pipe( + tap((topics: QualityAssuranceTopicObject[]) => { + const forward = this.activatedRoute.snapshot.queryParams?.forward === 'true'; + if (topics.length === 1 && forward) { + // If there is only one topic, navigate to the first topic automatically + this.router.navigate([this.getQualityAssuranceRoute(), this.sourceId, topics[0].id]); + } + }) + ); this.totalElements$ = this.notificationsStateService.getQualityAssuranceTopicsTotals(); } diff --git a/src/app/shared/utils/split.pipe.ts b/src/app/shared/utils/split.pipe.ts index cccd285922a..e4d0f2cc49c 100644 --- a/src/app/shared/utils/split.pipe.ts +++ b/src/app/shared/utils/split.pipe.ts @@ -1,4 +1,10 @@ import { Pipe, PipeTransform } from '@angular/core'; +/** + * Custom pipe to split a string into an array of substrings based on a specified separator. + * @param value - The string to be split. + * @param separator - The separator used to split the string. + * @returns An array of substrings. + */ @Pipe({ name: 'dsSplit' }) diff --git a/src/app/suggestion-notifications/suggestions.service.ts b/src/app/suggestion-notifications/suggestions.service.ts index 874659eab5f..8a99403586b 100644 --- a/src/app/suggestion-notifications/suggestions.service.ts +++ b/src/app/suggestion-notifications/suggestions.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { of, forkJoin, Observable } from 'rxjs'; -import { catchError, map, mergeMap, take } from 'rxjs/operators'; +import { catchError, map, mergeMap, take, tap } from 'rxjs/operators'; import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model'; import { RemoteData } from '../core/data/remote-data'; @@ -12,8 +12,9 @@ import { ResearcherProfile } from '../core/profile/model/researcher-profile.mode import { getAllSucceededRemoteDataPayload, getFinishedRemoteData, + getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteListPayload + getFirstSucceededRemoteListPayload, } from '../core/shared/operators'; import { Suggestion } from '../core/suggestion-notifications/models/suggestion.model'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; @@ -155,10 +156,10 @@ export class SuggestionsService { */ public retrieveCurrentUserSuggestions(userUuid: string): Observable { return this.researcherProfileService.findById(userUuid, true).pipe( - getFirstSucceededRemoteDataPayload(), - mergeMap((profile: ResearcherProfile) => { - if (isNotEmpty(profile)) { - return this.researcherProfileService.findRelatedItemId(profile).pipe( + getFirstCompletedRemoteData(), + mergeMap((profile: RemoteData ) => { + if (isNotEmpty(profile) && profile.hasSucceeded && isNotEmpty(profile.payload)) { + return this.researcherProfileService.findRelatedItemId(profile.payload).pipe( mergeMap((itemId: string) => { return this.suggestionsDataService.getTargetsByUser(itemId).pipe( getFirstSucceededRemoteListPayload() @@ -169,7 +170,7 @@ export class SuggestionsService { return of([]); } }), - take(1) + catchError(() => of([])) ); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 27e0fee7446..27cc62033fa 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2708,13 +2708,15 @@ "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.", - "qa-event-notification.check.notification-withdrawn": "You have requested to withdraw this item.", + "qa-event-notification.check.notification-withdrawn.user": "There are {{num}} items pending review(s) to check.", - "qa-event-notification.check.notification-reinstate": "You have requested to reinstate this item.", + "qa-event-notification.check.notification-withdrawn.admin": "There are {{num}} {{source}} feedback(s) pending.", - "qa-event-notification-undo-withdrawn.check.button": "Undo request withdrawal", + "qa-event-notification.check.notification-reinstate": "There are {{num}} pending reinstatement(s) pending for this item.", - "qa-event-notification-undo-reinstate.check.button": "Undo request reinstatment", + "qa-event-notification-undo-withdrawn.check.button": "Check", + + "qa-event-notification-undo-reinstate.check.button": "Check", "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", @@ -3246,6 +3248,8 @@ "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.", + "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the", + "quality-assurance.source.description": "Below you can see all the notification's sources.", "quality-assurance.topics": "Current Topics", From c34a49e55a252bc83df109f1a0cd582f23b54299 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 21 Feb 2024 18:11:30 +0100 Subject: [PATCH 33/38] [CST-12109] lint fix --- src/app/suggestion-notifications/suggestions.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/suggestion-notifications/suggestions.service.ts b/src/app/suggestion-notifications/suggestions.service.ts index 8a99403586b..8d70bb9d5f3 100644 --- a/src/app/suggestion-notifications/suggestions.service.ts +++ b/src/app/suggestion-notifications/suggestions.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { of, forkJoin, Observable } from 'rxjs'; -import { catchError, map, mergeMap, take, tap } from 'rxjs/operators'; +import { catchError, map, mergeMap, take } from 'rxjs/operators'; import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model'; import { RemoteData } from '../core/data/remote-data'; From e7579b7bf57e9a7444f317a5f7c009532b8e30fc Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 23 Feb 2024 15:03:52 +0100 Subject: [PATCH 34/38] [CST-12109] fix of text messages / source image --- .../alerts/item-alerts.component.spec.ts | 3 +- .../qa-event-notification.component.html | 23 +++--- .../qa-event-notification.component.spec.ts | 6 -- .../qa-event-notification.component.ts | 13 +-- src/app/menu.resolver.ts | 78 +++++++++--------- .../my-dspace-page.component.html | 2 +- ...ace-qa-events-notifications.component.html | 1 + ...ace-qa-events-notifications.component.scss | 1 + ...space-qa-events-notifications.component.ts | 3 +- src/assets/i18n/en.json5 | 12 +-- src/assets/images/qa-DSpaceUsers-logo.png | Bin 0 -> 8609 bytes 11 files changed, 58 insertions(+), 84 deletions(-) create mode 100644 src/assets/images/qa-DSpaceUsers-logo.png diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts index 3ba88017848..474621f14ff 100644 --- a/src/app/item-page/alerts/item-alerts.component.spec.ts +++ b/src/app/item-page/alerts/item-alerts.component.spec.ts @@ -109,7 +109,7 @@ describe('ItemAlertsComponent', () => { }); }); - it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', fakeAsync(() => { + it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', fakeAsync((done) => { const isAdmin = false; const correction = [{ topic: 'REQUEST_REINSTATE' }]; authorizationService.isAuthorized.and.returnValue(of(isAdmin)); @@ -119,6 +119,7 @@ describe('ItemAlertsComponent', () => { tick(); result$.subscribe((result) => { expect(result).toBeTrue(); + done(); }); })); }); diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html index 169fe00950f..5b3bb021f22 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -1,24 +1,21 @@
+
+ +
- - - {{ - (isAdmin$ | async) ? ('qa-event-notification.check.notification-withdrawn.admin' | translate : { source: (source.id | dsSplit: ':')[0], num: source.totalEvents }) - : ('qa-event-notification.check.notification-withdrawn.user' | translate : { num: source.totalEvents }) - }} - - - - {{ 'qa-event-notification.check.notification-reinstate' | translate: { num: source.totalEvents } }} - + {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+ class="btn btn-primary align-self-center"> + {{'item.qa-event-notification-info.check.button' | translate}} +
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts index a9d16440a80..ce231affeea 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts @@ -13,7 +13,6 @@ import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data import { provideMockStore } from '@ngrx/store/testing'; import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; import { By } from '@angular/platform-browser'; import { SplitPipe } from 'src/app/shared/utils/split.pipe'; @@ -22,7 +21,6 @@ describe('QaEventNotificationComponent', () => { let component: QaEventNotificationComponent; let fixture: ComponentFixture; let qualityAssuranceSourceDataServiceStub: any; - let authorizationService: AuthorizationDataService; const obj = Object.assign(new QualityAssuranceSourceObject(), { id: 'sourceName:target', @@ -34,9 +32,6 @@ describe('QaEventNotificationComponent', () => { const objPL = createSuccessfulRemoteDataObject$(createPaginatedList([obj])); const item = Object.assign({ uuid: '1234' }); beforeEach(async () => { - authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: of(true) - }); qualityAssuranceSourceDataServiceStub = { getSourcesByTarget: () => objPL @@ -49,7 +44,6 @@ describe('QaEventNotificationComponent', () => { { provide: RequestService, useValue: {} }, { provide: NotificationsService, useValue: {} }, { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test') }, - { provide: AuthorizationDataService, useValue: authorizationService }, ObjectCacheService, RemoteDataBuildService, provideMockStore({}) diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index 6f8e55c9d2b..1557a65a0e6 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -9,9 +9,7 @@ import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/mod import { catchError, map } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; -import { PaginatedList } from 'src/app/core/data/paginated-list.model'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; @Component({ selector: 'ds-qa-event-notification', @@ -33,17 +31,10 @@ export class QaEventNotificationComponent implements OnChanges { * An observable that emits an array of QualityAssuranceSourceObject. */ sources$: Observable; - /** - * An observable that emits a boolean representing whether the current user is an admin. - */ - isAdmin$: Observable; constructor( private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService, - private authService: AuthorizationDataService, - ) { - this.isAdmin$ = this.authService.isAuthorized(FeatureID.AdministratorOf); - } + ) {} /** * Detect changes to the item input and update the sources$ observable. diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 94b56ba99d6..9272ed06ea3 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -171,7 +171,8 @@ export class MenuResolver implements Resolve { this.authorizationService.isAuthorized(FeatureID.AdministratorOf), this.authorizationService.isAuthorized(FeatureID.CanSubmit), this.authorizationService.isAuthorized(FeatureID.CanEditItem), - ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem]) => { + this.authorizationService.isAuthorized(FeatureID.CanSeeQA) + ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem, canSeeQa]) => { const newSubMenuList = [ { id: 'new_community', @@ -362,6 +363,40 @@ export class MenuResolver implements Resolve { icon: 'heartbeat', index: 11 }, + /* Notifications */ + { + id: 'notifications', + active: false, + visible: canSeeQa || isSiteAdmin, + model: { + type: MenuItemType.TEXT, + text: 'menu.section.notifications' + } as TextMenuItemModel, + icon: 'bell', + index: 4 + }, + { + id: 'notifications_quality-assurance', + parentID: 'notifications', + active: false, + visible: canSeeQa, + model: { + type: MenuItemType.LINK, + text: 'menu.section.quality-assurance', + link: '/notifications/quality-assurance' + } as LinkMenuItemModel, + }, + { + id: 'notifications_publication-claim', + parentID: 'notifications', + active: false, + visible: isSiteAdmin, + model: { + type: MenuItemType.LINK, + text: 'menu.section.notifications_publication-claim', + link: '/notifications/' + PUBLICATION_CLAIMS_PATH + } as LinkMenuItemModel, + }, ]; menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, { shouldPersistOnRouteChange: true @@ -531,46 +566,9 @@ export class MenuResolver implements Resolve { * Create menu sections dependent on whether or not the current user is a site administrator */ createSiteAdministratorMenuSections() { - combineLatest([ - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - this.authorizationService.isAuthorized(FeatureID.CanSeeQA) - ]) - .subscribe(([authorized, canSeeQA]) => { + this.authorizationService.isAuthorized(FeatureID.AdministratorOf) + .subscribe((authorized) => { const menuList = [ - /* Notifications */ - { - id: 'notifications', - active: false, - visible: authorized && canSeeQA, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.notifications' - } as TextMenuItemModel, - icon: 'bell', - index: 4 - }, - { - id: 'notifications_quality-assurance', - parentID: 'notifications', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.quality-assurance', - link: '/notifications/quality-assurance' - } as LinkMenuItemModel, - }, - { - id: 'notifications_publication-claim', - parentID: 'notifications', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.notifications_publication-claim', - link: '/admin/notifications/' + PUBLICATION_CLAIMS_PATH - } as LinkMenuItemModel, - }, /* Admin Search */ { id: 'admin_search', 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 70bcf1b7bc4..cfae8e07a86 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.html +++ b/src/app/my-dspace-page/my-dspace-page.component.html @@ -1,7 +1,7 @@
+ -
From 447b275387877c073ebfbc1f06c70a5e453d1960 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 27 Feb 2024 10:33:03 +0100 Subject: [PATCH 38/38] [CST-12109] Updated notification text messages --- src/assets/i18n/en.json5 | 8 ++++---- src/assets/i18n/it.json5 | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b5873f1551e..80c7b0e8ff5 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2428,13 +2428,13 @@ "item.truncatable-part.show-less": "Collapse", - "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", - "item.qa-event-notification-info.check.button": "Check", + "item.qa-event-notification-info.check.button": "View", - "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", - "mydspace.qa-event-notification-info.check.button": "Check", + "mydspace.qa-event-notification-info.check.button": "View", "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 6191cc2ac1c..0960b9fae15 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -3535,21 +3535,21 @@ // "item.truncatable-part.show-less": "Collapse", "item.truncatable-part.show-less": "Riduci", - // "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", // TODO New key - Add a translation - "item.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", - // "item.qa-event-notification-info.check.button": "Check", + // "item.qa-event-notification-info.check.button": "View", // TODO New key - Add a translation - "item.qa-event-notification-info.check.button": "Check", + "item.qa-event-notification-info.check.button": "View", - // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", // TODO New key - Add a translation - "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending review to check", + "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account", - // "mydspace.qa-event-notification-info.check.button": "Check", + // "mydspace.qa-event-notification-info.check.button": "View", // TODO New key - Add a translation - "mydspace.qa-event-notification-info.check.button": "Check", + "mydspace.qa-event-notification-info.check.button": "View", // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", "workflow-item.search.result.delete-supervision.modal.header": "Elimina l'ordine di supervisione",