[DURACOM-455] add advanced attachment

Author: FrancescoMolinaro

config/config.example.yml

@@ -730,3 +730,22 @@ identifierSubtypes:
     iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
     link: https://ror.org
 
+# Configuration for advanced attachment rendering. Controls how bitstream attachments and their metadata are displayed.
+advancedAttachmentRendering:
+  # Pagination settings for attachment lists
+  pagination:
+    enabled: true
+    elementsPerPage: 2
+  # Metadata and attributes to display for each attachment. Use 'metadata' type for DSpace metadata fields, 'attribute' for bitstream properties (size, format, checksum).
+  metadata:
+    - name: dc.title
+      type: metadata
+      truncatable: false
+    - name: dc.description
+      type: metadata
+      truncatable: true
+    - name: size
+      type: attribute
+    - name: format
+      type: attribute
+

src/app/core/shared/bitstream.model.ts

@@ -34,6 +34,11 @@ export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
   followLink('format'),
 ];
 
+export interface ChecksumInfo {
+  checkSumAlgorithm: string;
+  value: string;
+}
+
 @typedObject
 @inheritSerialization(DSpaceObject)
 export class Bitstream extends DSpaceObject implements ChildHALResource {
@@ -51,6 +56,12 @@ export class Bitstream extends DSpaceObject implements ChildHALResource {
   @autoserialize
   description: string;
 
+  /**
+   * The checksum information of this Bitstream
+   */
+  @autoserialize
+  checkSum: ChecksumInfo;
+
   /**
    * The name of the Bundle this Bitstream is part of
    */

src/app/item-page/full/field-components/file-section/full-file-section.component.html

@@ -40,16 +40,11 @@ <h3 class="h5 simple-view-element-header">
             </dl>
           </div>
           <div class="col-2">
-            @if (showLinkAsButton) {
-              <ds-file-download-button [bitstream]="file" [item]="item"></ds-file-download-button>
-            } @else {
-              <ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
+            <ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
                 <span class="d-none d-md-inline">
                   {{ "item.page.filesection.download" | translate }}
                 </span>
-              </ds-file-download-link>
-            }
-
+            </ds-file-download-link>
           </div>
         </div>
         }
@@ -97,15 +92,11 @@ <h3 class="h5 simple-view-element-header">
             </dl>
           </div>
           <div class="col-2">
-            @if (showLinkAsButton) {
-              <ds-file-download-button [bitstream]="file" [item]="item"></ds-file-download-button>
-            } @else {
-              <ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
+            <ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
                 <span class="d-none d-md-inline">
                   {{ "item.page.filesection.download" | translate }}
                 </span>
-              </ds-file-download-link>
-            }
+            </ds-file-download-link>
           </div>
         </div>
         }

src/app/item-page/full/field-components/file-section/full-file-section.component.ts

@@ -34,7 +34,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { FileDownloadButtonComponent } from '../../../../shared/file-download-button/file-download-button.component';
 import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
 import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -54,7 +53,6 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
   templateUrl: './full-file-section.component.html',
   imports: [
     AsyncPipe,
-    FileDownloadButtonComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
     PaginationComponent,

src/app/item-page/simple/field-components/file-section/file-section.component.html

@@ -19,21 +19,11 @@
               <span [innerHTML]="separator"></span>
             }
           </ng-template>
-
-          @if (showLinkAsButton) {
-            <ds-file-download-button
-              [bitstream]="file"
-              [item]="item">
-              <ng-container *ngTemplateOutlet="fileContent"></ng-container>
-            </ds-file-download-button>
-          } @else {
-            <ds-file-download-link
-              [bitstream]="file"
-              [item]="item">
-              <ng-container *ngTemplateOutlet="fileContent"></ng-container>
-            </ds-file-download-link>
-          }
-
+          <ds-file-download-link
+            [bitstream]="file"
+            [item]="item">
+            <ng-container *ngTemplateOutlet="fileContent"></ng-container>
+          </ds-file-download-link>
         }
         @if (isLoading) {
           <ds-loading message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>

src/app/item-page/simple/field-components/file-section/file-section.component.ts

@@ -15,7 +15,11 @@ import { PaginatedList } from '@dspace/core/data/paginated-list.model';
 import { RemoteData } from '@dspace/core/data/remote-data';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
 import { Bitstream } from '@dspace/core/shared/bitstream.model';
-import { followLink } from '@dspace/core/shared/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '@dspace/core/shared/follow-link-config.model';
+import { HALResource } from '@dspace/core/shared/hal-resource.model';
 import { Item } from '@dspace/core/shared/item.model';
 import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
 import { hasValue } from '@dspace/shared/utils/empty.util';
@@ -25,7 +29,6 @@ import {
 } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
 
-import { FileDownloadButtonComponent } from '../../../../shared/file-download-button/file-download-button.component';
 import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
 import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
 import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
@@ -41,7 +44,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
   templateUrl: './file-section.component.html',
   imports: [
     CommonModule,
-    FileDownloadButtonComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
     ThemedFileDownloadLinkComponent,
@@ -70,7 +72,7 @@ export class FileSectionComponent implements OnInit {
 
   primaryBitstreamId: string;
 
-  showLinkAsButton: boolean;
+  showDownloadLinkAsAttachment: boolean;
 
   constructor(
     protected bitstreamDataService: BitstreamDataService,
@@ -80,7 +82,7 @@ export class FileSectionComponent implements OnInit {
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     this.pageSize = this.appConfig.item.bitstream.pageSize;
-    this.showLinkAsButton = this.appConfig.layout.showDownloadLinkAsButton;
+    this.showDownloadLinkAsAttachment = this.appConfig.layout.showDownloadLinkAsAttachment;
   }
 
   ngOnInit(): void {
@@ -111,10 +113,20 @@ export class FileSectionComponent implements OnInit {
     } else {
       this.currentPage++;
     }
+    const followLinks: FollowLinkConfig<HALResource>[] = [
+      followLink('accessStatus'),
+    ];
+
+    if (this.showDownloadLinkAsAttachment) {
+      followLinks.push(
+        ...[followLink('thumbnail'), followLink('format')],
+      );
+    }
+
     this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', {
       currentPage: this.currentPage,
       elementsPerPage: this.pageSize,
-    }, true, true, followLink('accessStatus')).pipe(
+    }, true, true, ...followLinks).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
       if (bitstreamsRD.errorMessage) {

src/app/item-page/simple/item-types/publication/publication.component.html

@@ -29,7 +29,9 @@
         <ds-media-viewer [item]="object"></ds-media-viewer>
       </div>
     }
-    <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
+    @if (showDownloadLinkAsAttachment !== true) {
+      <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
+    }
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
@@ -55,6 +57,9 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-12 col-md-7">
+    @if (showDownloadLinkAsAttachment) {
+      <ds-item-page-attachment-section [item]="object"></ds-item-page-attachment-section>
+    }
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"

src/app/item-page/simple/item-types/publication/publication.component.ts

@@ -7,6 +7,7 @@ import { RouterLink } from '@angular/router';
 import { ViewMode } from '@dspace/core/shared/view-mode.model';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { AttachmentSectionComponent } from '../../../../shared/bitstream-attachment/section/attachment-section.component';
 import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
@@ -38,6 +39,7 @@ import { ItemComponent } from '../shared/item.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     AsyncPipe,
+    AttachmentSectionComponent,
     CollectionsComponent,
     DsoEditMenuComponent,
     GenericItemPageFieldComponent,

src/app/item-page/simple/item-types/shared/item.component.ts

@@ -79,10 +79,13 @@ export class ItemComponent implements OnInit {
    */
   geospatialItemPageFieldsEnabled = false;
 
+  showDownloadLinkAsAttachment: boolean;
+
   constructor(protected routeService: RouteService,
               protected router: Router) {
     this.mediaViewer = environment.mediaViewer;
     this.geospatialItemPageFieldsEnabled = environment.geospatialMapViewer.enableItemPageFields;
+    this.showDownloadLinkAsAttachment = environment.layout.showDownloadLinkAsAttachment;
   }
 
   /**

src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html

@@ -30,7 +30,9 @@
         <ds-media-viewer [item]="object"></ds-media-viewer>
       </div>
     }
-    <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
+    @if (showDownloadLinkAsAttachment) {
+      <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
+    }
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
@@ -56,6 +58,9 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-12 col-md-6">
+    @if (showDownloadLinkAsAttachment) {
+      <ds-item-page-attachment-section [item]="object"></ds-item-page-attachment-section>
+    }
     <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"