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

Author: atarix83

config/config.example.yml

@@ -132,6 +132,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-routing.module.ts

@@ -46,6 +46,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
 import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
 import { RedirectService } from './redirect/redirect.service';
+import { environment } from '../environments/environment';
 import {
   GenericAdministratorGuard
 } from './core/data/feature-authorization/feature-authorization-guard/generic-administrator-guard';
@@ -184,10 +185,21 @@ import {
               .then((m) => m.AdminModule),
             canActivate: [GenericAdministratorGuard, EndUserAgreementCurrentUserGuard]
           },
+          {
+            path: 'standard-login',
+            loadChildren: () => import('./login-page/login-page.module').then((m) => m.LoginPageModule),
+            data: {
+              isBackDoor: true,
+            },
+            canMatch: [() => environment.auth.disableStandardLogin],
+          },
           {
             path: 'login',
-            loadChildren: () => import('./login-page/login-page.module')
-              .then((m) => m.LoginPageModule)
+            loadChildren: () => import('./login-page/login-page.module').then((m) => m.LoginPageModule),
+            data: {
+              isBackDoor: false,
+            },
+            canMatch: [() => !environment.auth.disableStandardLogin],
           },
           {
             path: 'external-login/:token',

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

@@ -65,6 +65,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

@@ -152,10 +152,12 @@ describe('ThumbnailComponent', () => {
         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', () => {
@@ -172,10 +174,12 @@ describe('ThumbnailComponent', () => {
         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', () => {
@@ -239,10 +243,12 @@ describe('ThumbnailComponent', () => {
         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', () => {
@@ -254,8 +260,11 @@ describe('ThumbnailComponent', () => {
         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();
+        });
       });
 
     });
@@ -269,10 +278,12 @@ describe('ThumbnailComponent', () => {
         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', () => {
@@ -284,8 +295,11 @@ describe('ThumbnailComponent', () => {
         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

@@ -1,18 +1,19 @@
 import { Component, Inject, OnInit } from '@angular/core';
 
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { BehaviorSubject, Observable, combineLatest, of as observableOf } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { FieldRenderingType, MetadataBoxFieldRendering } from '../metadata-box.decorator';
 import { BitstreamDataService } from '../../../../../../../core/data/bitstream-data.service';
-import { hasValue, isEmpty, isNotEmpty } from '../../../../../../../shared/empty.util';
+import { isEmpty, isNotEmpty } from '../../../../../../../shared/empty.util';
 import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
 import { BitstreamRenderingModelComponent } from '../bitstream-rendering-model';
 import { Item } from '../../../../../../../core/shared/item.model';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { getFirstCompletedRemoteData } from '../../../../../../../core/shared/operators';
 import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
+import { getDefaultImageUrlByEntityType } from '../../../../../../../core/shared/image.utils';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
@@ -34,7 +35,7 @@ export class ThumbnailComponent extends BitstreamRenderingModelComponent impleme
   /**
    * Default image to be shown in the thumbnail
    */
-  default: string;
+  default$: Observable<string>;
 
   /**
    * Item rendering initialization state
@@ -61,9 +62,14 @@ export class ThumbnailComponent extends BitstreamRenderingModelComponent impleme
    * 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)) {
@@ -91,19 +97,4 @@ export class ThumbnailComponent extends BitstreamRenderingModelComponent impleme
       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';
-    }
-  }
 }

src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts

@@ -8,7 +8,7 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService
 } from '@ng-dynamic-forms/core';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -61,6 +61,8 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
   public otherInfoValues: string[] = [];
   public otherInfoValuesUnformatted: string[] = [];
 
+  multiValueOnGenerator: boolean;
+
   protected constructor(protected vocabularyService: VocabularyService,
                         protected layoutService: DynamicFormLayoutService,
                         protected validationService: DynamicFormValidationService,
@@ -174,6 +176,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
     this.vocabulary$ = this.vocabularyService.findVocabularyById(this.model.vocabularyOptions.name).pipe(
       getFirstSucceededRemoteDataPayload(),
       distinctUntilChanged(),
+      tap((vocabulary: Vocabulary) => this.multiValueOnGenerator = vocabulary.multiValueOnGenerator),
     );
   }
 
@@ -256,12 +259,14 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
         for (const key in otherInformation) {
           if (otherInformation.hasOwnProperty(key) && key.startsWith('data-')) {
             const fieldId = key.replace('data-', '');
-            const newValue: FormFieldMetadataValueObject = this.getOtherInformationValue(otherInformation[key], key);
-            if (isNotEmpty(newValue)) {
-              const updatedModel = this.formBuilderService.updateModelValue(fieldId, newValue);
-              if (isNotEmpty(updatedModel)) {
-                updatedModels.push(updatedModel);
-              }
+            const newValues: FormFieldMetadataValueObject[] = this.getOtherInformationValue(otherInformation[key], key);
+            if (isNotEmpty(newValues)) {
+              newValues.forEach((newValue) => {
+                const updatedModel = this.formBuilderService.updateModelValue(fieldId, newValue);
+                if (isNotEmpty(updatedModel)) {
+                  updatedModels.push(updatedModel);
+                }
+              });
             }
           }
         }
@@ -276,43 +281,53 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
     }
   }
 
-  getOtherInformationValue(value: string, key: string): FormFieldMetadataValueObject {
+  getOtherInformationValue(value: string, key: string): FormFieldMetadataValueObject[] {
     if (isEmpty(value) || key === 'alternative-names' ) {
       return null;
     }
 
-    let returnValue;
+    let returnValue = [];
+    if (value.indexOf('|||') === -1) {
+      returnValue.push(this.generateFormField(value));
+    } else if (value.indexOf('|||') !== -1 && this.otherInfoValue) {
+      const otherValues: string[] = value.split('|||');
+      if (this.multiValueOnGenerator) {
+        otherValues.forEach((tmpValue) => returnValue.push(this.generateFormField(tmpValue)));
+      } else {
+        const unformattedValue = this.otherInfoValuesUnformatted.find(otherInfoValue => otherInfoValue.includes(this.otherInfoValue || this.otherName));
+        const authorityValue = hasValue(unformattedValue) ? unformattedValue.substring(unformattedValue.lastIndexOf('::') + 2) : null;
+        let otherInfo = {};
+        let alternativeValue: string;
+        otherInfo[key] = value;
+        if (hasValue(this.otherName)) {
+          alternativeValue = otherValues[0].substring(0, otherValues[0].lastIndexOf('::'));
+        }
+        returnValue.push(new FormFieldMetadataValueObject(
+          hasValue(alternativeValue) ? alternativeValue : this.otherInfoValue,
+          null,
+          null,
+          authorityValue,
+          null,
+          null,
+          null,
+          otherInfo
+        ));
+      }
+    }
+    return returnValue;
+  }
+
+  private generateFormField(value: string): FormFieldMetadataValueObject {
     if (value.indexOf('::') === -1) {
-      returnValue = new FormFieldMetadataValueObject(value);
-    } else if (value.indexOf('|||') === -1) {
-      returnValue = new FormFieldMetadataValueObject(
+      return new FormFieldMetadataValueObject(value);
+    } else {
+      return new FormFieldMetadataValueObject(
         value.substring(0, value.lastIndexOf('::')),
         null,
         null,
         value.substring(value.lastIndexOf('::') + 2)
       );
-    } else if (value.indexOf('|||') !== -1 && this.otherInfoValue) {
-      const unformattedValue =  this.otherInfoValuesUnformatted.find(otherInfoValue => otherInfoValue.includes(this.otherInfoValue || this.otherName));
-      const authorityValue = hasValue(unformattedValue) ?  unformattedValue.substring(unformattedValue.lastIndexOf('::') + 2) : null;
-      let otherInfo = {};
-      let alternativeValue;
-      otherInfo[key] = value;
-      if (hasValue(this.otherName)) {
-        const otherValues = value.split('|||');
-        alternativeValue = otherValues[0].substring(0, otherValues[0].lastIndexOf('::'));
-      }
-      returnValue = new FormFieldMetadataValueObject(
-        hasValue(alternativeValue) ? alternativeValue : this.otherInfoValue,
-        null,
-        null,
-        authorityValue,
-        null,
-        null,
-        null,
-        otherInfo
-      );
     }
-    return returnValue;
   }
 
   private hasValidAuthority(formMetadataValue: FormFieldMetadataValueObject) {