Merge branch 'dspace-cris-2023_02_x' into ux-plus-2023_02_x

Author: atarix83

src/app/core/data/site-data.service.ts

@@ -46,17 +46,27 @@ export class SiteDataService extends IdentifiableDataService<Site> implements Fi
 
   /**
    * Retrieve the Site Object
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
    */
-  find(): Observable<Site> {
+  find(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Site>[]): Observable<Site> {
     const searchParams: RequestParam[] = [new RequestParam('projection', 'allLanguages')];
-    const options = Object.assign(new FindListOptions(), { searchParams });
-    return this.findAll(options).pipe(
+    const findOptions = Object.assign(new FindListOptions(), options, { searchParams });
+    return this.findAll(findOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),
       switchMap((remoteData: RemoteData<PaginatedList<Site>>) => {
         if (remoteData.hasSucceeded) {
           return of(remoteData.payload.page[0]);
         } else {
-          return this.findAll().pipe(
+          return this.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
             getFirstCompletedRemoteData(),
             map((rd: RemoteData<PaginatedList<Site>>) => rd.hasSucceeded ? rd.payload.page[0] : null)
           );

src/app/home-page/home-page.resolver.ts

@@ -20,6 +20,6 @@ export class HomePageResolver implements Resolve<Site> {
    * @returns Observable<Site> Emits the found Site object, or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Site> | Promise<Site> | Site {
-    return this.siteService.find().pipe(take(1));
+    return this.siteService.find(null, false).pipe(take(1));
   }
 }

src/app/item-page/alerts/item-alerts.component.html

@@ -1,8 +1,8 @@
-<div class="py-3">
-    <div *ngIf="item && !item.isDiscoverable" class="private-warning">
+<div *ngIf="item && (!item.isDiscoverable || item.isWithdrawn)" class="pb-3">
+    <div *ngIf="!item.isDiscoverable" class="private-warning">
         <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
     </div>
-    <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
+    <div *ngIf="item.isWithdrawn" class="withdrawn-warning">
         <ds-alert [type]="AlertTypeEnum.Warning">
             <div class="d-flex justify-content-between flex-wrap flex-column">
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>

src/app/item-page/simple/item-page.component.scss

@@ -4,7 +4,3 @@
     max-width: none;
   }
 }
-
-.container {
-  margin-top: calc(-1 * var(--ds-content-spacing));
-}