Merge branch 'ux-plus-cris-2024_02_x' into main-glam

Author: atarix83

bitbucket-pipelines.yml

@@ -2,6 +2,9 @@ options:
   runs-on: self.hosted
 
 definitions:
+  caches:
+    node-cris8: ./node_modules
+
   steps:
     - step: &unittest-code-checks
         name: test-code-checks
@@ -10,7 +13,7 @@ definitions:
           run-as-user: 1000
         size: 4x
         caches:
-          - node
+          - node-cris8
         script:
           - yarn install --frozen-lockfile
           - yarn run lint --quiet

config/config.example.yml

@@ -135,6 +135,8 @@ auth:
     # If the rest token expires in less than this amount of time, it will be refreshed automatically.
     # This is independent from the idle warning.
     timeLeftBeforeTokenRefresh: 120000 # 2 minutes
+  # Standard login enabled
+  disableStandardLogin: false
 
 # Form settings
 form:

src/app/app-routes.ts

@@ -4,6 +4,7 @@ import {
   RouterConfigOptions,
 } from '@angular/router';
 
+import { environment } from '../environments/environment';
 import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
   ACCESS_CONTROL_MODULE_PATH,
@@ -172,10 +173,21 @@ export const APP_ROUTES: Route[] = [
         providers: [provideSuggestionNotificationsState()],
         canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
       },
+      {
+        path: 'standard-login',
+        loadChildren: () => import('./login-page/login-page-routes').then((m) => m.ROUTES),
+        data: {
+          isBackDoor: true,
+        },
+        canMatch: [() => environment.auth.disableStandardLogin],
+      },
       {
         path: 'login',
-        loadChildren: () => import('./login-page/login-page-routes')
-          .then((m) => m.ROUTES),
+        loadChildren: () => import('./login-page/login-page-routes').then((m) => m.ROUTES),
+        data: {
+          isBackDoor: false,
+        },
+        canMatch: [() => !environment.auth.disableStandardLogin],
       },
       {
         path: 'logout',

src/app/core/shared/image.utils.ts

@@ -0,0 +1,34 @@
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+export const getDefaultImageUrlByEntityType = (entityType: string): Observable<string> => {
+  const fallbackImage = 'assets/images/file-placeholder.svg';
+
+  if (!entityType) {
+    return of(fallbackImage);
+  }
+
+  const defaultImage = `assets/images/${entityType.toLowerCase()}-placeholder.svg`;
+  return checkImageExists(defaultImage).pipe(map((exists) => exists ? defaultImage : fallbackImage));
+};
+
+const checkImageExists = (url: string): Observable<boolean> =>  {
+  return new Observable<boolean>((observer) => {
+    const img = new Image();
+
+    img.onload = () => {
+      observer.next(true);
+      observer.complete();
+    };
+
+    img.onerror = () => {
+      observer.next(false);
+      observer.complete();
+    };
+
+    img.src = url;
+  });
+};

src/app/core/submission/vocabularies/models/vocabulary.model.ts

@@ -74,6 +74,14 @@ export class Vocabulary implements CacheableObject {
   @autoserialize
     externalSource: VocabularyExternalSourceMap;
 
+
+  /**
+   * A boolean variable that indicates whether the functionality of
+   * multiple value generation is enabled within a generator context.
+   */
+  @autoserialize
+  multiValueOnGenerator: boolean;
+
   /**
    * A string representing the kind of Vocabulary model
    */

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component.html

@@ -1,4 +1,4 @@
 <ds-thumbnail *ngIf="(initialized | async)" data-test="thumbnail"
               [thumbnail]="thumbnail$ | async"
-              [defaultImage]="default">
+              [defaultImage]="default$ | async">
 </ds-thumbnail>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component.spec.ts

@@ -173,10 +173,12 @@ describe('', () => {
         expect(thumbnail).toBeTruthy();
       }));
 
-      it('should show default thumbnail', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should show default thumbnail', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
-
     });
 
     describe('When bitstreams are only original', () => {
@@ -193,10 +195,12 @@ describe('', () => {
         expect(thumbnail).toBeTruthy();
       }));
 
-      it('should show default thumbnail', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should show default thumbnail', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
-
     });
 
     describe('When bitstreams are only thumbnail', () => {
@@ -267,10 +271,12 @@ describe('', () => {
         expect(thumbnail).toBeTruthy();
       });
 
-      it('should show default thumbnail', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should show default thumbnail', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
-
     });
 
     describe('When bitstreams are only original without the right metadata information', () => {
@@ -282,8 +288,11 @@ describe('', () => {
         fixture.detectChanges();
       });
 
-      it('should not show bitstream content image src but the default image', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should not show bitstream content image src but the default image', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
 
     });
@@ -297,10 +306,12 @@ describe('', () => {
         fixture.detectChanges();
       });
 
-      it('should not show thumbnail content image src but the default image', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should not show thumbnail content image src but the default image', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
-
     });
 
     describe('When bitstreams are only original with the right metadata information', () => {
@@ -312,8 +323,11 @@ describe('', () => {
         fixture.detectChanges();
       });
 
-      it('should not show thumbnail content image src but the default image', () => {
-        expect(component.default).toBe('assets/images/file-placeholder.svg');
+      it('should not show thumbnail content image src but the default image', (done) => {
+        component.default$.subscribe(image => {
+          expect(image).toBe('assets/images/file-placeholder.svg');
+          done();
+        });
       });
 
     });

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component.ts

@@ -10,6 +10,8 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
+  combineLatest,
+  Observable,
   of as observableOf,
 } from 'rxjs';
 import {
@@ -21,10 +23,10 @@ import { BitstreamDataService } from '../../../../../../../core/data/bitstream-d
 import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
+import { getDefaultImageUrlByEntityType } from '../../../../../../../core/shared/image.utils';
 import { Item } from '../../../../../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../../../../../core/shared/operators';
 import {
-  hasValue,
   isEmpty,
   isNotEmpty,
 } from '../../../../../../../shared/empty.util';
@@ -56,7 +58,7 @@ export class ThumbnailRenderingComponent extends BitstreamRenderingModelComponen
   /**
    * Default image to be shown in the thumbnail
    */
-  default: string;
+  default$: Observable<string>;
 
   /**
    * Item rendering initialization state
@@ -83,9 +85,14 @@ export class ThumbnailRenderingComponent extends BitstreamRenderingModelComponen
    * Get the thumbnail information from api for this item
    */
   ngOnInit(): void {
-    this.setDefaultImage();
-    this.getBitstreamsByItem().pipe(
-      map((bitstreamList: PaginatedList<Bitstream>) => bitstreamList.page),
+    const eType = this.item.firstMetadataValue('dspace.entity.type');
+    this.default$ = getDefaultImageUrlByEntityType(eType);
+
+    combineLatest([
+      this.default$,
+      this.getBitstreamsByItem(),
+    ]).pipe(
+      map(([_, bitstreamList]: [string, PaginatedList<Bitstream>]) => bitstreamList.page),
       switchMap((filteredBitstreams: Bitstream[]) => {
         if (filteredBitstreams.length > 0) {
           if (isEmpty(filteredBitstreams[0].thumbnail)) {
@@ -113,19 +120,4 @@ export class ThumbnailRenderingComponent extends BitstreamRenderingModelComponen
       this.initialized.next(true);
     });
   }
-
-  /**
-   * Set the default image src depending on item entity type
-   */
-  setDefaultImage(): void {
-    const eType = this.item.firstMetadataValue('dspace.entity.type');
-    this.default = 'assets/images/file-placeholder.svg';
-    if (hasValue(eType) && eType.toUpperCase() === 'PROJECT') {
-      this.default = 'assets/images/project-placeholder.svg';
-    } else if (hasValue(eType) && eType.toUpperCase() === 'ORGUNIT') {
-      this.default = 'assets/images/orgunit-placeholder.svg';
-    } else if (hasValue(eType) && eType.toUpperCase() === 'PERSON') {
-      this.default = 'assets/images/person-placeholder.svg';
-    }
-  }
 }