Merge embargo badge with the existing access-status badge

Author: nibou230

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

@@ -28,8 +28,8 @@ import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loadin
 import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
-import { VarDirective } from '../../../../shared/utils/var.directive';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { VarDirective } from '../../../../shared/utils/var.directive';
 
 /**
  * This component renders the file section of the item

src/app/shared/file-download-link/file-download-link.component.html

@@ -1,4 +1,4 @@
-<ds-embargo-badge [bitstream]="bitstream"></ds-embargo-badge>
+<ds-access-status-badge [object]="bitstream"></ds-access-status-badge>
 <a [routerLink]="(bitstreamPath$| async)?.routerLink" class="d-block dont-break-out mb-1"
   [queryParams]="(bitstreamPath$| async)?.queryParams"
   [target]="isBlank ? '_blank': '_self'"

src/app/shared/file-download-link/file-download-link.component.ts

@@ -30,14 +30,14 @@ import {
   hasValue,
   isNotEmpty,
 } from '../empty.util';
-import { ThemedEmbargoBadgeComponent } from '../object-collection/shared/badges/embargo-badge/themed-embargo-badge.component';
+import { ThemedAccessStatusBadgeComponent } from '../object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
 
 @Component({
   selector: 'ds-base-file-download-link',
   templateUrl: './file-download-link.component.html',
   styleUrls: ['./file-download-link.component.scss'],
   standalone: true,
-  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule, ThemedEmbargoBadgeComponent],
+  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule, ThemedAccessStatusBadgeComponent],
 })
 /**
  * Component displaying a download link

src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html

@@ -1,7 +1,5 @@
 @if (showAccessStatus) {
-  @if (accessStatus$ | async; as accessStatus) {
-    <span>
-      <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
-    </span>
+  @if ({ status: accessStatus$ | async, date: embargoDate$ | async }; as accessStatus) {
+    <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus.status | translate: {date: accessStatus.date} }}</span>
   }
 }

src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts

@@ -16,11 +16,12 @@ import {
   map,
 } from 'rxjs/operators';
 import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
+import { Bitstream } from 'src/app/core/shared/bitstream.model';
+import { getFirstSucceededRemoteDataPayload } from 'src/app/core/shared/operators';
 import { environment } from 'src/environments/environment';
 
 import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { Item } from '../../../../../core/shared/item.model';
-import { ITEM } from '../../../../../core/shared/item.resource-type';
 import { hasValue } from '../../../../empty.util';
 import { AccessStatusObject } from './access-status.model';
 
@@ -37,7 +38,9 @@ import { AccessStatusObject } from './access-status.model';
 export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
 
   @Input() object: DSpaceObject;
+
   accessStatus$: Observable<string>;
+  embargoDate$: Observable<string>;
 
   /**
    * Whether to show the access status badge or not
@@ -62,12 +65,32 @@ export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
   constructor(private accessStatusDataService: AccessStatusDataService) { }
 
   ngOnInit(): void {
-    this.showAccessStatus = environment.item.showAccessStatuses;
-    if (this.object.type.toString() !== ITEM.value || !this.showAccessStatus || this.object == null) {
-      // Do not show the badge if the feature is inactive or if the item is null.
+    if (!hasValue(this.object)) {
       return;
     }
+    switch ((this.object as any).type) {
+      case Item.type.value:
+        this.handleItem();
+        break;
+      case Bitstream.type.value:
+        this.handleBitstream();
+        break;
+    }
+  }
 
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Method to handle the object type Item
+   */
+  private handleItem() {
+    this.showAccessStatus = environment.item.showAccessStatuses;
+    if (!this.showAccessStatus) {
+      // Do not show the badge if the feature is inactive.
+      return;
+    }
     const item = this.object as Item;
     if (item.accessStatus == null) {
       // In case the access status has not been loaded, do it individually.
@@ -85,7 +108,6 @@ export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
       map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
       catchError(() => observableOf('access-status.unknown.listelement.badge')),
     );
-
     // stylesheet based on the access status value
     this.subs.push(
       this.accessStatus$.pipe(
@@ -96,7 +118,31 @@ export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
     );
   }
 
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  /**
+   * Method to handle the object type Bitstream
+   */
+  private handleBitstream() {
+    this.showAccessStatus = environment.item.bitstream.showAccessStatuses;
+    if (!this.showAccessStatus) {
+      // Do not show the badge if the feature is inactive.
+      return;
+    }
+    const bitstream = this.object as Bitstream;
+    if (bitstream.accessStatus == null) {
+      return;
+    }
+    this.embargoDate$ = bitstream.accessStatus.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((accessStatus: AccessStatusObject) => {
+        if (hasValue(accessStatus.embargoDate)) {
+          this.accessStatus$ = observableOf('embargo.listelement.badge');
+          return accessStatus.embargoDate;
+        } else {
+          this.accessStatus$ = observableOf(null);
+          return null;
+        }
+      }),
+      catchError(() => observableOf(null)),
+    );
   }
 }