Merged in task/dspace-cris-2023_02_x/DSC-1661 (pull request DSpace#1755)

Task/dspace cris 2023 02 x/DSC-1661

Approved-by: Francesco Molinaro

src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html

@@ -45,7 +45,8 @@
                                        [metadataList]="metadataList"
                                        [showLabel]="showLabel"
                                        [showMetrics]="showMetrics"
-                                       [showThumbnails]="showThumbnails">
+                                       [showThumbnails]="showThumbnails"
+                                       [showCorrection]="showCorrection">
           </ds-themed-item-list-preview>
           <div class="offset-2">
             <a class="btn btn-primary mt-1" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"

src/app/search-page/configuration-search-page.component.ts

@@ -10,6 +10,7 @@ import { SearchService } from '../core/shared/search/search.service';
 import { Router } from '@angular/router';
 import { SearchManager } from '../core/browse/search-manager';
 import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -37,7 +38,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
               protected router: Router,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig,) {
-    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router, appConfig);
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              protected authorizationService: AuthorizationDataService,) {
+    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router, appConfig, authorizationService);
   }
 }

src/app/shared/object-collection/object-collection.component.html

@@ -11,6 +11,7 @@
                 [showMetrics]="showMetrics"
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
+                [showCorrection]="showCorrection"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"

src/app/shared/object-collection/object-collection.component.ts

@@ -130,6 +130,11 @@ export class ObjectCollectionComponent implements OnInit {
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Whether or not to show an alert for hidden related items
    */

src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts

@@ -80,6 +80,11 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * The value to display for this element
    */
@@ -133,6 +138,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
     'showLabel',
     'showMetrics',
     'showThumbnails',
+    'showCorrection',
     'context',
     'viewMode',
     'value',

src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts

@@ -47,6 +47,11 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    */
   @Input() showMetrics = true;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Whether to show the thumbnail preview
    */

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html

@@ -8,6 +8,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.t
                           [showLabel]="showLabel"
                           [showMetrics]="showMetrics"
                           [showSubmitter]="showSubmitter"
-                          [showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
+                          [showThumbnails]="showThumbnails"
+                          [showCorrection]="showCorrection"></ds-themed-item-list-preview>
   </div>
 </ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html

@@ -8,6 +8,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.t
                           [showLabel]="showLabel"
                           [showMetrics]="showMetrics"
                           [showSubmitter]="showSubmitter"
-                          [showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
+                          [showThumbnails]="showThumbnails"
+                          [showCorrection]="showCorrection"></ds-themed-item-list-preview>
   </div>
 </ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html

@@ -8,7 +8,8 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-elem
                                  [showLabel]="showLabel"
                                  [showMetrics]="showMetrics"
                                  [showSubmitter]="showSubmitter"
-                                 [showThumbnails]="showThumbnails">
+                                 [showThumbnails]="showThumbnails"
+                                 [showCorrection]="showCorrection">
     </ds-themed-item-list-preview>
   </div>
 </ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html

@@ -6,7 +6,8 @@
                                [showSubmitter]="showSubmitter"
                                [showThumbnails]="showThumbnails"
                                [badgeContext]="badgeContext"
-                               [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
+                               [workflowItem]="workflowitem$.value"
+                               [showCorrection]="showCorrection"></ds-themed-item-list-preview>
 
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-xl-2 pl-3' : 'ml-3'">

src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html

@@ -36,7 +36,7 @@ <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMet
 
         </div>
       </ds-truncatable>
-      <ds-item-correction [item]="item"></ds-item-correction>
+      <ds-item-correction *ngIf="showCorrection" [item]="item"></ds-item-correction>
       <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
       <ds-item-collection *ngIf="object.indexableObject" [object]="object.indexableObject"></ds-item-collection>
     </div>

src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts

@@ -243,4 +243,17 @@ describe('ItemListPreviewComponent', () => {
       expect(thumbnail).toBeFalsy();
     });
   });
+
+  describe('When showCorrection is false', () => {
+    beforeEach(() => {
+      component.item = mockItemWithAuthorAndDate;
+      component.showCorrection = false;
+      fixture.detectChanges();
+    });
+
+    it('should not show the correction badge', () => {
+      const correctionBadge = fixture.debugElement.query(By.css('ds-item-correction'));
+      expect(correctionBadge).toBeFalsy();
+    });
+  });
 });

src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts

@@ -58,6 +58,11 @@ export class ItemListPreviewComponent implements OnInit {
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * An object representing the duplicate match
    */

src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts

@@ -18,7 +18,7 @@ import {
   templateUrl: '../../../theme-support/themed.component.html'
 })
 export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPreviewComponent> {
-  protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'badgeContext', 'showLabel', 'showMetrics', 'showSubmitter', 'showThumbnails', 'workflowItem', 'metadataList'];
+  protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'badgeContext', 'showLabel', 'showMetrics', 'showSubmitter', 'showThumbnails', 'showCorrection', 'workflowItem', 'metadataList'];
 
   @Input() item: Item;
 
@@ -34,6 +34,8 @@ export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPrev
 
   @Input() showThumbnails: boolean;
 
+  @Input() showCorrection: boolean;
+
   @Input() workflowItem: WorkflowItem;
 
   @Input() metadataList: DuplicateMatchMetadataDetailConfig[] = [];

src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html

@@ -3,7 +3,8 @@
                              [badgeContext]="badgeContext"
                              [showLabel]="showLabel"
                              [showMetrics]="showMetrics"
-                             [showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
+                             [showThumbnails]="showThumbnails"
+                             [showCorrection]="showCorrection"></ds-themed-item-list-preview>
 
 <div class="row">
   <div [ngClass]="showThumbnails ? 'offset-3 offset-xl-2 pl-3' : 'ml-3'">

src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html

@@ -5,6 +5,7 @@
                                [showMetrics]="showMetrics"
                                [showSubmitter]="showSubmitter"
                                [showThumbnails]="showThumbnails"
+                               [showCorrection]="showCorrection"
                                [badgeContext]="badgeContext"
                                [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
   <div class="row">

src/app/shared/object-list/object-list.component.html

@@ -43,6 +43,7 @@
                                                [showLabel]="showLabel"
                                                [showMetrics]="showMetrics"
                                                [showThumbnails]="showThumbnails"
+                                               [showCorrection]="showCorrection"
                                                (contentChange)="contentChange.emit()"
                                                (customEvent)="customEvent.emit($event)"
                                                (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>

src/app/shared/object-list/object-list.component.ts

@@ -101,6 +101,11 @@ export class ObjectListComponent {
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Emit when one of the listed object has changed.
    */

src/app/shared/object-list/themed-object-list.component.ts

@@ -98,6 +98,11 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Emit when one of the listed object has changed.
    */
@@ -184,6 +189,7 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
     'showMetrics',
     'showPaginator',
     'showThumbnails',
+    'showCorrection',
     'contentChange',
     'prev',
     'next',

src/app/shared/search/search-results/search-results.component.html

@@ -17,6 +17,7 @@ <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.
             [showLabel]="showLabel"
             [showMetrics]="showMetrics"
             [showThumbnails]="showThumbnails"
+            [showCorrection]="showCorrection"
             [customData]="customData"
             (contentChange)="contentChange.emit($event)"
             (customEvent)="emitCustomEvent($event)"

src/app/shared/search/search-results/search-results.component.ts

@@ -78,6 +78,11 @@ export class SearchResultsComponent {
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * The current sorting configuration of the search
    */

src/app/shared/search/search-results/themed-search-results.component.ts

@@ -22,7 +22,7 @@ import { AlertType } from '../../alert/alert-type';
   templateUrl: '../../theme-support/themed.component.html',
 })
 export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsComponent> {
-  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showLabel', 'showMetrics', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject', 'customData', 'customEvent', 'searchResultNotice', 'searchResultNoticeType', 'showSearchResultNotice'];
+  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showLabel', 'showMetrics', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject', 'customData', 'customEvent', 'searchResultNotice', 'searchResultNoticeType', 'showSearchResultNotice', 'showCorrection'];
   @Input() linkType: CollectionElementLinkType;
 
   @Input() searchResultNotice: string = null;
@@ -43,6 +43,8 @@ export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsC
 
   @Input() showSearchResultNotice = false;
 
+  @Input() showCorrection = false;
+
   @Input() sortConfig: SortOptions;
 
   @Input() viewMode: ViewMode;

src/app/shared/search/search.component.html

@@ -55,6 +55,7 @@
                                       [showMetrics]="showMetrics"
                                       [showSearchResultNotice]="showSearchResultNotice"
                                       [showThumbnails]="showThumbnails"
+                                      [showCorrection]="showCorrection"
                                       (contentChange)="onContentChange($event)"
                                       (customEvent)="customEvent.emit($event)"
                                       (deselectObject)="deselectObject.emit($event)"

src/app/shared/search/search.component.spec.ts

@@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { BehaviorSubject, Observable, of, of as observableOf } from 'rxjs';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { HostWindowService } from '../host-window.service';
@@ -34,13 +34,19 @@ import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
 import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
 let searchServiceObject: SearchService;
 let searchConfigurationServiceObject: SearchConfigurationService;
+
+const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+  isAuthorized: of(true)
+});
+
 const store: Store<SearchComponent> = jasmine.createSpyObj('store', {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   dispatch: {},
@@ -245,6 +251,10 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       {
         provide: APP_CONFIG,
         useValue: environment
+      },
+      {
+        provide: AuthorizationDataService,
+        useValue: authorizationDataService
       }
     ],
     schemas: [NO_ERRORS_SCHEMA]
@@ -335,6 +345,12 @@ describe('SearchComponent', () => {
     expect(comp.resultFound.emit).toHaveBeenCalledWith(expectedResults);
   }));
 
+  it('should show correction badge when item is a correction', fakeAsync(() => {
+    comp.ngOnInit();
+    tick(100);
+    expect(comp.showCorrection).toBe(true);
+  }));
+
   describe('when the open sidebar button is clicked in mobile view', () => {
 
     beforeEach(() => {

src/app/shared/search/search.component.ts

@@ -52,6 +52,8 @@ import { SearchManager } from '../../core/browse/search-manager';
 import { AlertType } from '../alert/alert-type';
 import { isPlatformServer } from '@angular/common';
 import { APP_CONFIG } from '../../../config/app-config.interface';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 
 @Component({
   selector: 'ds-search',
@@ -200,6 +202,11 @@ export class SearchComponent implements OnInit, OnDestroy {
    */
   @Input() showThumbnails: boolean;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection: boolean;
+
   /**
    * Whether to show the view mode switch
    */
@@ -380,7 +387,8 @@ export class SearchComponent implements OnInit, OnDestroy {
     @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
     protected routeService: RouteService,
     protected router: Router,
-    @Inject(APP_CONFIG) protected appConfig: any,){
+    @Inject(APP_CONFIG) protected appConfig: any,
+    protected authorizationService: AuthorizationDataService,){
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -399,6 +407,14 @@ export class SearchComponent implements OnInit, OnDestroy {
 
     this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
 
+    if (this.showCorrection === null || this.showCorrection === undefined) {
+      this.subs.push(
+        this.authorizationService.isAuthorized(FeatureID.CanCorrectItem, null, null, true)
+        .subscribe((showCorrection) => {
+          this.showCorrection = showCorrection;
+        }));
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);