[DURACOM-453] add back button to footer, add breadcrumb in edit page, fix issue with dso edit loader, minor restyle in submission footer

Author: FrancescoMolinaro

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

@@ -39,7 +39,7 @@ import {
 } from '@ngx-translate/core';
 import {
   catchError,
-  combineLatest,
+  forkJoin,
   Observable,
   of,
 } from 'rxjs';
@@ -155,46 +155,47 @@ 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[]]) => {
-
-        const sortedEntityTypes = entityTypes
-          .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.filter(def => !def.id.includes('-edit')).forEach((definition: SubmissionDefinitionModel, index: number) => {
-          this.submissionDefinitionSelection.add({
-            disabled: false,
-            label: definition.name,
-            value: definition.name,
-          } as DynamicFormOptionConfig<string>);
-          if (currentDefinitionValue && currentDefinitionValue.length > 0 && currentDefinitionValue[0].value === definition.name) {
-            this.submissionDefinitionSelection.select(index);
-          }
-        });
-
-        this.formModel = entityTypes.length === 0 ?
-          [...collectionFormModels, this.submissionDefinitionSelection, this.sharedWorkspaceChekbox] :
-          [...collectionFormModels, this.entityTypeSelection, this.submissionDefinitionSelection, this.sharedWorkspaceChekbox];
-
-        super.ngOnInit();
-
-        if (currentSharedWorkspaceValue && currentSharedWorkspaceValue.length > 0) {
-          this.sharedWorkspaceChekbox.value = currentSharedWorkspaceValue[0].value === 'true';
+    forkJoin({
+      entityTypes: entities$,
+      definitions: definitions$,
+    }).subscribe(({ entityTypes, definitions }:  {entityTypes: ItemType[]; definitions: ConfigObject[]}) => {
+      const sortedEntityTypes = entityTypes
+        .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;
         }
-        this.chd.detectChanges();
       });
 
+      definitions.filter(def => !def.id.includes('-edit')).forEach((definition: SubmissionDefinitionModel, index: number) => {
+        this.submissionDefinitionSelection.add({
+          disabled: false,
+          label: definition.name,
+          value: definition.name,
+        } as DynamicFormOptionConfig<string>);
+        if (currentDefinitionValue && currentDefinitionValue.length > 0 && currentDefinitionValue[0].value === definition.name) {
+          this.submissionDefinitionSelection.select(index);
+        }
+      });
+
+      this.formModel = entityTypes.length === 0 ?
+        [...collectionFormModels, this.submissionDefinitionSelection, this.sharedWorkspaceChekbox] :
+        [...collectionFormModels, this.entityTypeSelection, this.submissionDefinitionSelection, this.sharedWorkspaceChekbox];
+
+      super.ngOnInit();
+
+      if (currentSharedWorkspaceValue && currentSharedWorkspaceValue.length > 0) {
+        this.sharedWorkspaceChekbox.value = currentSharedWorkspaceValue[0].value === 'true';
+      }
+      this.chd.detectChanges();
+    });
+
   }
 }

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts

@@ -363,6 +363,10 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges, OnDestr
    * @param {SimpleChanges} changes
    */
   ngOnChanges(changes: SimpleChanges): void {
+    if (changes.mdField) {
+      this.fieldType$ = this.getFieldType();
+    }
+
     if (isNotEmpty(changes.mdField) && !changes.mdField.firstChange) {
       if (isNotEmpty(changes.mdField.currentValue) ) {
         if (isNotEmpty(changes.mdField.previousValue) &&

src/app/edit-item/edit-item-routes.ts

@@ -1,4 +1,5 @@
 import { Route } from '@angular/router';
+import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
 
 import { authenticatedGuard } from '../core/auth/authenticated.guard';
 import { pendingChangesGuard } from '../submission/edit/pending-changes/pending-changes.guard';
@@ -14,7 +15,13 @@ export const ROUTES: Route[] = [
         canActivate: [authenticatedGuard],
         canDeactivate: [pendingChangesGuard],
         component: ThemedSubmissionEditComponent,
-        data: { title: 'submission.edit.title' },
+        resolve: {
+          breadcrumb: i18nBreadcrumbResolver,
+        },
+        data: {
+          title: 'submission.edit.title',
+          breadcrumbKey: 'submission.edit.item',
+        },
       },
     ],
   },

src/app/shared/form/builder/parsers/concat-field-parser.ts

@@ -41,7 +41,7 @@ export class ConcatFieldParser extends FieldParser {
     protected separator: string,
     protected firstPlaceholder: string = null,
     protected secondPlaceholder: string = null) {
-    super(submissionId, configData, initFormValues, parserOptions, translate, securityConfig);
+    super(submissionId, configData, initFormValues, parserOptions, securityConfig, translate);
 
     this.separator = separator;
     this.firstPlaceholder = firstPlaceholder;

src/app/shared/form/builder/parsers/field-parser.ts

@@ -7,6 +7,7 @@ import { FormFieldMetadataValueObject } from '@dspace/core/shared/form/models/fo
 import { MetadataValue } from '@dspace/core/shared/metadata.models';
 import { Metadata } from '@dspace/core/shared/metadata.utils';
 import { RelationshipOptions } from '@dspace/core/shared/relationship-options.model';
+import { MetadataSecurityConfiguration } from '@dspace/core/submission/models/metadata-security-configuration';
 import { SectionVisibility } from '@dspace/core/submission/models/section-visibility.model';
 import { SubmissionScopeType } from '@dspace/core/submission/submission-scope-type';
 import { VisibilityType } from '@dspace/core/submission/visibility-type';
@@ -46,7 +47,7 @@ export const PARSER_OPTIONS: InjectionToken<ParserOptions> = new InjectionToken<
  * The regex itself is encapsulated inside a `RegExp` object, that will validate the pattern syntax.
  */
 export const REGEX_FIELD_VALIDATOR = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i');
-export const SECURITY_CONFIG: InjectionToken<any> = new InjectionToken<any>('securityConfig');
+export const SECURITY_CONFIG: InjectionToken<MetadataSecurityConfiguration> = new InjectionToken<MetadataSecurityConfiguration>('securityConfig');
 
 export abstract class FieldParser {
 
@@ -62,7 +63,7 @@ export abstract class FieldParser {
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
-    @Inject(SECURITY_CONFIG) protected securityConfig: any = null,
+    @Inject(SECURITY_CONFIG) protected securityConfig: MetadataSecurityConfiguration = null,
     protected translate: TranslateService,
   ) {
   }
@@ -456,7 +457,7 @@ export abstract class FieldParser {
     // look to find security for metadata
     if (this.securityConfig && metadata) {
       if (this.securityConfig.metadataCustomSecurity) {
-        const metadataConfig = (this.securityConfig.metadataCustomSecurity as any)[metadata];
+        const metadataConfig = this.securityConfig.metadataCustomSecurity[metadata];
         if (metadataConfig) {
           return metadataConfig;
         } else {

src/app/submission/form/footer/submission-form-footer.component.html

@@ -11,9 +11,19 @@
           (click)="$event.preventDefault();confirmDiscard(content)">
           <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
         </button>
+      } @else {
+        <button
+          type="button"
+          id="cancel"
+          [attr.data-test]="'cancel' | dsBrowserOnly"
+          class="btn btn-outline-primary"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          (click)="navigateBack()">
+          <i class="fas fa-arrow-left"></i> {{'submission.general.back.submit' | translate}}
+        </button>
       }
     </div>
-    <div class="text-end d-flex justify-content-end align-items-center flex-sm-row flex-column">
+    <div class="text-end d-flex justify-content-end align-items-center flex-sm-row flex-column gap-1">
       @if ((hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true && (submissionIsInvalid | async)) {
         <span>
           <i class="fas fa-warning"></i> {{'submission.general.info.invalid' | translate}}

src/app/submission/form/footer/submission-form-footer.component.ts

@@ -1,4 +1,7 @@
-import { AsyncPipe } from '@angular/common';
+import {
+  AsyncPipe,
+  Location,
+} from '@angular/common';
 import {
   Component,
   Input,
@@ -79,8 +82,8 @@ export class SubmissionFormFooterComponent implements OnChanges {
    * @param {SubmissionService} submissionService
    */
   constructor(private modalService: NgbModal,
-              private restService: SubmissionRestService,
-              private submissionService: SubmissionService) {
+              private submissionService: SubmissionService,
+              private location: Location) {
   }
 
   /**
@@ -143,4 +146,11 @@ export class SubmissionFormFooterComponent implements OnChanges {
     return 'submission.general.save-later';
   }
 
+  /**
+   * When back button is pressed go to previous location
+   */
+  navigateBack(): void {
+    this.location.back();
+  }
+
 }

src/assets/i18n/en.json5

@@ -5237,6 +5237,8 @@
 
   "submission.edit.title": "Edit Submission",
 
+  "submission.edit.item.breadcrumbs": "Edit item",
+
   "submission.general.cancel": "Cancel",
 
   "submission.general.cannot_submit": "You don't have permission to make a new submission.",