Merge branch 'refs/heads/dspace-cris-2023_02_x' into ux-plus-2023_02_x

# Conflicts:
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

Author: atarix83

src/app/collection-page/collection-form/collection-form.component.ts

@@ -136,20 +136,23 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
 
     // retrieve all entity types and submission definitions to populate the dropdowns selection
     combineLatest([entities$, definitions$])
-      .subscribe(([entityTypes, definitions]: [ItemType[], SubmissionDefinitionModel[]]) => {
-
-      entityTypes = entityTypes.filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE);
-          entityTypes.forEach((type: ItemType, index: number) => {
-          this.entityTypeSelection.add({
-            disabled: false,
-            label: type.label,
-            value: type.label
-          } as DynamicFormOptionConfig<string>);
-          if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
-            this.entityTypeSelection.select(index);
-            this.entityTypeSelection.disabled = true;
-          }
-        });
+        .subscribe(([entityTypes, definitions]: [ItemType[], SubmissionDefinitionModel[]]) => {
+
+          const sortedEntityTypes = entityTypes
+              .filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE)
+              .sort((a, b) => a.label.localeCompare(b.label));
+
+          sortedEntityTypes.forEach((type: ItemType, index: number) => {
+            this.entityTypeSelection.add({
+              disabled: false,
+              label: type.label,
+              value: type.label
+            } as DynamicFormOptionConfig<string>);
+            if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
+              this.entityTypeSelection.select(index);
+              this.entityTypeSelection.disabled = true;
+            }
+          });
 
         definitions.forEach((definition: SubmissionDefinitionModel, index: number) => {
           this.submissionDefinitionSelection.add({

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

@@ -1,4 +1,4 @@
-<div class="bern-component-container mt-4">
+<div class="container">
     <div class="row">
         <div class="col-12">
             <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>

src/app/search-navbar/search-navbar.component.scss

@@ -21,15 +21,9 @@ input[type="text"] {
 }
 
 @media screen and (max-width: map-get($grid-breakpoints, md)) {
-  .query:focus {
+  .search-input {
     max-width: 250px !important;
     width: 40vw !important;
   }
 
 }
-
-@media screen and (max-width: map-get($grid-breakpoints, sm)) {
-  .search-input {
-    width: 55vw !important;
-  }
-}

src/app/search-page/configuration-search-page.component.ts

@@ -9,6 +9,7 @@ import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { Router } from '@angular/router';
 import { SearchManager } from '../core/browse/search-manager';
+import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -35,7 +36,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               @Inject(PLATFORM_ID) public platformId: any,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
-    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router);
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,) {
+    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router, appConfig);
   }
 }

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -3,8 +3,7 @@ import {
   Component,
   ComponentFactoryResolver,
   ContentChildren,
-  EventEmitter,
-  Inject,
+  EventEmitter, Inject,
   Input,
   NgZone,
   OnChanges,
@@ -59,9 +58,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
 
 import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
-import {
-  DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN
-} from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
@@ -73,9 +70,7 @@ import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
 import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
 import { DsDynamicListComponent } from './models/list/dynamic-list.component';
 import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
-import {
-  DsDynamicScrollableDropdownComponent
-} from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
@@ -87,9 +82,7 @@ import { CustomSwitchComponent } from './models/custom-switch/custom-switch.comp
 import { find, map, startWith, switchMap, take } from 'rxjs/operators';
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import {
-  DsDynamicRelationInlineGroupComponent
-} from './models/relation-inline-group/dynamic-relation-inline-group.components';
+import { DsDynamicRelationInlineGroupComponent } from './models/relation-inline-group/dynamic-relation-inline-group.components';
 import { SearchResult } from '../../../search/models/search-result.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -130,6 +123,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interfac
 import { itemLinksToFollow } from '../../../utils/relation-query.utils';
 import { DynamicConcatModel } from './models/ds-dynamic-concat.model';
 import { Metadata } from '../../../../core/shared/metadata.utils';
+import { DynamicLinkModel } from './models/ds-dynamic-link.model';
 import { DsDynamicMarkdownComponent } from './models/markdown/dynamic-markdown.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_MARKDOWN } from './models/markdown/dynamic-markdown.model';
 
@@ -560,13 +554,13 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   addSecurityLevelToMetadata($event) {
     this.model.securityLevel = $event;
     this.securityLevel = $event;
-    if (this.model.parent && this.model.parent instanceof DynamicConcatModel) {
+    if (this.model.parent && (this.model.parent instanceof DynamicConcatModel || this.model.parent instanceof DynamicLinkModel)) {
       this.model.parent.securityLevel = $event;
     }
     if (this.model.value) {
       this.model.securityLevel = $event;
       this.securityLevel = $event;
-      if (this.model.parent && this.model.parent instanceof DynamicConcatModel) {
+      if (this.model.parent && (this.model.parent instanceof DynamicConcatModel || this.model.parent instanceof DynamicLinkModel)) {
         this.model.parent.securityLevel = $event;
       }
       this.change.emit(

src/app/shared/form/builder/ds-dynamic-form-ui/models/link/dynamic-link.model.ts

@@ -28,6 +28,8 @@ import { DynamicRowGroupModel } from './builder/ds-dynamic-form-ui/models/ds-dyn
 import {
   DynamicRelationGroupModel
 } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DynamicLinkModel } from './builder/ds-dynamic-form-ui/models/ds-dynamic-link.model';
+import { DynamicConcatModel } from './builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 
 export interface MetadataFields {
   [key: string]: FormFieldMetadataValueObject[]
@@ -78,7 +80,7 @@ export class FormComponent implements OnDestroy, OnInit {
   @Input() submitLabel = 'form.submit';
 
   /**
-   * i18n key for the reset button
+   * i18n key for the cancel button
    */
   @Input() resetLabel = 'form.reset';
 
@@ -355,7 +357,12 @@ export class FormComponent implements OnDestroy, OnInit {
     if (index === 0 && formArrayControl.value?.length === 1) {
       event.model = cloneDeep(event.model);
       const fieldId = event.model.id;
-      formArrayControl.at(0).get(fieldId).setValue(null);
+
+      if (event.model instanceof DynamicLinkModel || event.model instanceof DynamicConcatModel) {
+        formArrayControl.at(0).get(fieldId).reset();
+      } else {
+        formArrayControl.at(0).get(fieldId).setValue(null);
+      }
     } else {
       this.formBuilderService.removeFormArrayGroup(index, formArrayControl, arrayContext);
     }
@@ -424,18 +431,18 @@ export class FormComponent implements OnDestroy, OnInit {
 
   private updateMetadataValue(metadataFields: MetadataFields): void {
     const metadataKeys = hasValue(metadataFields) ? Object.keys(metadataFields) : [];
-    const formKeys = hasValue(this.formGroup.value) ? Object.keys(this.formGroup.value) : [];
+    const formKeys = hasValue(this.formGroup.value) ? Object.keys(this.formGroup.value).map(key => key.replace('_array', '')) : [];
 
     formKeys
       .filter((key) => isNotEmpty(this.formGroup.value[key]))
       .forEach((key) => {
-        const innerObjectKeys = (Object.keys(this.formGroup.value[key]) as any[]).map((oldKey) => oldKey.replaceAll('_', '.'));
+        const innerObjectKeys = (Object.keys(this.formGroup.value[key] ?? {} ) as any[]).map((oldKey) => oldKey.replaceAll('_', '.'));
         const filteredKeys = innerObjectKeys.filter(innerKey => metadataKeys.includes(innerKey));
         const oldValue = this.formGroup.value[key];
 
         if (filteredKeys.length > 0) {
           filteredKeys.forEach((oldValueKey) => {
-            const newValue = { ...oldValue };
+            const newValue = {...oldValue};
             const formattedKey = (oldValueKey as any).replaceAll('.', '_');
             const patchValue = {};
 
@@ -447,6 +454,6 @@ export class FormComponent implements OnDestroy, OnInit {
             }
           });
         }
-      });
+    });
   }
 }

src/app/shared/form/form.component.ts

@@ -21,6 +21,7 @@ import {
 } from './form.actions';
 import { FormEntry, FormError, FormTouchedState } from './form.reducer';
 import { environment } from '../../../environments/environment';
+import { DynamicLinkModel } from './builder/ds-dynamic-form-ui/models/ds-dynamic-link.model';
 
 @Injectable()
 export class FormService {
@@ -137,6 +138,7 @@ export class FormService {
   }
 
   public addErrorToField(field: AbstractControl, model: DynamicFormControlModel, message: string) {
+
     const error = {}; // create the error object
     const errorKey = this.getValidatorNameFromMap(message);
     let errorMsg = message;
@@ -163,9 +165,9 @@ export class FormService {
     }
 
     // if the field in question is a concat group, pass down the error to its fields
-    if (field instanceof UntypedFormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) {
+    if ((field instanceof UntypedFormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) || model instanceof DynamicLinkModel) {
       model.group.forEach((subModel) => {
-        const subField = field.controls[subModel.id];
+        const subField = (field as UntypedFormGroup).controls[subModel.id];
 
         this.addErrorToField(subField, subModel, message);
       });

src/app/shared/form/form.service.ts

@@ -7,6 +7,8 @@ import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-transla
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 
 import { LoadingComponent } from './loading.component';
+import { Router } from '@angular/router';
+import { RouterMock } from '../mocks/router.mock';
 
 describe('LoadingComponent (inline template)', () => {
 
@@ -26,8 +28,12 @@ describe('LoadingComponent (inline template)', () => {
         }),
       ],
       declarations: [LoadingComponent], // declare the test component
-      providers: [TranslateService]
+      providers: [
+        TranslateService,
+        {provide: Router, useValue: new RouterMock()},
+      ]
     }).compileComponents();  // compile template and css
+
   }));
 
   beforeEach(() => {
@@ -75,4 +81,14 @@ describe('LoadingComponent (inline template)', () => {
     expect(de).toBeTruthy();
   });
 
+  it('should add time if the page has been automatically reloaded', () => {
+    comp.pageReloadCount = 1;
+    comp.errorMessageDelay = 1000;
+    comp.warningMessageDelay = 500;
+    comp.numberOfAutomaticPageReloads = 2;
+    comp.ngOnInit();
+
+    expect(comp.errorTimeoutWithRetriesDelay).toBe(1500);
+  });
+
 });