[DSC-1661] add showCorrection property

Andrea Barbasso · Andrea Barbasso · commit 276a76166b34 · 2024-05-29T16:44:13.000+02:00
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
@@ -43,7 +43,8 @@
           <ds-themed-item-list-preview [item]="match"
                                        [object]="itemPreviewObject"
                                        [metadataList]="metadataList"
-                                       [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}}"
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
@@ -10,6 +10,7 @@
                 [showMetrics]="showMetrics"
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
+                [showCorrection]="showCorrection"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
@@ -125,6 +125,11 @@ export class ObjectCollectionComponent implements OnInit {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Whether or not to show an alert for hidden related items
    */
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/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;
 
+  /**
+   * 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',
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/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
    */
diff --git a/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 b/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
@@ -6,6 +6,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.t
                           [object]="object"
                           [badgeContext]="badgeContext"
                           [showSubmitter]="showSubmitter"
-                          [showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
+                          [showThumbnails]="showThumbnails"
+                          [showCorrection]="showCorrection"></ds-themed-item-list-preview>
   </div>
 </ng-container>
diff --git a/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 b/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
@@ -6,6 +6,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.t
                           [object]="object"
                           [badgeContext]="badgeContext"
                           [showSubmitter]="showSubmitter"
-                          [showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
+                          [showThumbnails]="showThumbnails"
+                          [showCorrection]="showCorrection"></ds-themed-item-list-preview>
   </div>
 </ng-container>
diff --git a/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 b/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
@@ -6,7 +6,8 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-elem
                                  [object]="object"
                                  [badgeContext]="badgeContext"
                                  [showSubmitter]="showSubmitter"
-                                 [showThumbnails]="showThumbnails">
+                                 [showThumbnails]="showThumbnails"
+                                 [showCorrection]="showCorrection">
     </ds-themed-item-list-preview>
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -4,7 +4,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'">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/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>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -229,4 +229,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();
+    });
+  });
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -48,6 +48,11 @@ export class ItemListPreviewComponent implements OnInit {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * An object representing the duplicate match
    */
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/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', 'showSubmitter', 'showThumbnails', 'workflowItem', 'metadataList'];
+  protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'badgeContext', 'showSubmitter', 'showThumbnails', 'showCorrection', 'workflowItem', 'metadataList'];
 
   @Input() item: Item;
 
@@ -30,6 +30,8 @@ export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPrev
 
   @Input() showThumbnails;
 
+  @Input() showCorrection: boolean;
+
   @Input() workflowItem: WorkflowItem;
 
   @Input() metadataList: DuplicateMatchMetadataDetailConfig[] = [];
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -1,7 +1,8 @@
 <ds-themed-item-list-preview [item]="dso"
                       [object]="object"
                       [badgeContext]="badgeContext"
-                      [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'">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -3,6 +3,7 @@
                                [object]="object"
                                [showSubmitter]="showSubmitter"
                                [showThumbnails]="showThumbnails"
+                               [showCorrection]="showCorrection"
                                [badgeContext]="badgeContext"
                                [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
   <div class="row">
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
@@ -42,6 +42,7 @@
                                                [customData]="customData"
                                                [showMetrics]="showMetrics"
                                                [showThumbnails]="showThumbnails"
+                                               [showCorrection]="showCorrection"
                                                (contentChange)="contentChange.emit()"
                                                (customEvent)="customEvent.emit($event)"
                                                (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
@@ -96,6 +96,11 @@ export class ObjectListComponent {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Emit when one of the listed object has changed.
    */
diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts
@@ -93,6 +93,11 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Emit when one of the listed object has changed.
    */
@@ -178,6 +183,7 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
     'showMetrics',
     'showPaginator',
     'showThumbnails',
+    'showCorrection',
     'contentChange',
     'prev',
     'next',
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
@@ -15,6 +15,7 @@ <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.
             [context]="context"
             [hidePaginationDetail]="hidePaginationDetail"
             [showThumbnails]="showThumbnails"
+            [showCorrection]="showCorrection"
             [customData]="customData"
             (contentChange)="contentChange.emit($event)"
             (customEvent)="emitCustomEvent($event)"
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
@@ -68,6 +68,11 @@ export class SearchResultsComponent {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * The current sorting configuration of the search
    */
diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/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', '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', '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;
@@ -39,6 +39,8 @@ export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsC
 
   @Input() showSearchResultNotice = false;
 
+  @Input() showCorrection = false;
+
   @Input() sortConfig: SortOptions;
 
   @Input() viewMode: ViewMode;
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
@@ -53,6 +53,7 @@
                                       [showCsvExport]="showCsvExport"
                                       [showSearchResultNotice]="showSearchResultNotice"
                                       [showThumbnails]="showThumbnails"
+                                      [showCorrection]="showCorrection"
                                       (contentChange)="onContentChange($event)"
                                       (customEvent)="customEvent.emit($event)"
                                       (deselectObject)="deselectObject.emit($event)"
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
@@ -189,6 +189,11 @@ export class SearchComponent implements OnInit, OnDestroy {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show if the item is a correction
+   */
+  @Input() showCorrection = false;
+
   /**
    * Whether to show the view mode switch
    */
