[DURACOM-453] finalize improvement for submission and edit mode

Author: FrancescoMolinaro

src/app/app-routes.ts

@@ -28,6 +28,7 @@ import { ACCESS_CONTROL_MODULE_PATH } from './access-control/access-control-rout
 import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
   ADMIN_MODULE_PATH,
+  EDIT_ITEM_PATH,
   FORGOT_PASSWORD_PATH,
   HEALTH_PAGE_PATH,
   PROFILE_MODULE_PATH,
@@ -279,6 +280,11 @@ export const APP_ROUTES: Route[] = [
           .then((m) => m.ROUTES),
         canActivate: [authenticatedGuard],
       },
+      {
+        path: EDIT_ITEM_PATH,
+        loadChildren: () => import('./edit-item/edit-item-routes').then((m) => m.ROUTES),
+        canActivate: [endUserAgreementCurrentUserGuard],
+      },
       {
         path: 'external-login/:token',
         loadChildren: () => import('./external-login-page/external-login-routes').then((m) => m.ROUTES),

src/app/core/data/remote-data.ts

@@ -12,6 +12,7 @@ import {
   isSuccessStale,
   RequestEntryState,
 } from './request-entry-state.model';
+import { PathableObjectError } from './response-state.model';
 
 /**
  * A class to represent the state of a remote resource
@@ -25,6 +26,7 @@ export class RemoteData<T> {
     public errorMessage?: string,
     public payload?: T,
     public statusCode?: number,
+    public errors?: PathableObjectError[],
   ) {
   }
 

src/app/core/data/response-state.model.ts

@@ -1,13 +1,22 @@
 import { HALLink } from '../shared/hal-link.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';
 
+/**
+ * Interface for rest error associated to a path
+ */
+export interface PathableObjectError {
+  message: string;
+  paths: string[];
+}
+
 /**
  * The response substate in the NgRx store
  */
 export class ResponseState {
   timeCompleted: number;
   statusCode: number;
   errorMessage?: string;
+  errors?: PathableObjectError[];
   payloadLink?: HALLink;
   unCacheableObject?: UnCacheableObject;
 }

src/app/core/submission/models/submission-section-object.model.ts

@@ -75,6 +75,11 @@ export interface SubmissionSectionObject {
    */
   isLoading: boolean;
 
+  /**
+   * A boolean representing if this section removal is pending
+   */
+  removePending: boolean;
+
   /**
    * A boolean representing if this section is valid
    */

src/app/core/submission/submission-rest.service.ts

@@ -91,10 +91,15 @@ export class SubmissionRestService {
    *    The identifier for the object
    * @param collectionId
    *    The owning collection for the object
+   * @param projections
    */
-  protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
+  protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string, projections: string[] = []): string {
     let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
     url = new URLCombiner(url, '?embed=item,sections,collection').toString();
+
+    projections.forEach((projection) => {
+      url = new URLCombiner(url, '&projection=' + projection).toString();
+    });
     if (collectionId) {
       url = new URLCombiner(url, `&owningCollection=${collectionId}`).toString();
     }
@@ -135,9 +140,9 @@ export class SubmissionRestService {
    * @return Observable<SubmitDataResponseDefinitionObject>
    *     server response
    */
-  public getDataById(linkName: string, id: string, useCachedVersionIfAvailable = false): Observable<SubmitDataResponseDefinitionObject> {
+  public getDataById(linkName: string, id: string, useCachedVersionIfAvailable = false, projections: string[] = []): Observable<SubmitDataResponseDefinitionObject> {
     return this.halService.getEndpoint(linkName).pipe(
-      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, id)),
+      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, id, null, projections)),
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       mergeMap((endpointURL: string) => {

src/app/core/submission/submission-scope-type.ts

@@ -1,4 +1,5 @@
 export enum SubmissionScopeType {
   WorkspaceItem = 'WORKSPACE',
   WorkflowItem = 'WORKFLOW',
+  EditItem = 'EDIT'
 }

src/app/core/testing/submission-service.stub.ts

@@ -25,6 +25,7 @@ export class SubmissionServiceStub {
   isSubmissionLoading = jasmine.createSpy('isSubmissionLoading');
   notifyNewSection = jasmine.createSpy('notifyNewSection');
   redirectToMyDSpace = jasmine.createSpy('redirectToMyDSpace');
+  redirectToItemPage = jasmine.createSpy('redirectToItemPage');
   resetAllSubmissionObjects = jasmine.createSpy('resetAllSubmissionObjects');
   resetSubmissionObject = jasmine.createSpy('resetSubmissionObject');
   retrieveSubmission = jasmine.createSpy('retrieveSubmission');

src/app/core/utilities/remote-data.utils.ts

@@ -6,6 +6,7 @@ import {
 
 import { RemoteData } from '../data/remote-data';
 import { RequestEntryState } from '../data/request-entry-state.model';
+import { PathableObjectError } from '../data/response-state.model';
 
 /**
  * A fixed timestamp to use in tests
@@ -45,7 +46,7 @@ export function createSuccessfulRemoteDataObject$<T>(object: T, timeCompleted?:
  * @param statusCode    the status code
  * @param timeCompleted the moment when the remoteData was completed
  */
-export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCode?: number, timeCompleted = 1577836800000): RemoteData<T> {
+export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCode?: number, timeCompleted = 1577836800000, errors: PathableObjectError[] = []): RemoteData<T> {
   return new RemoteData(
     timeCompleted,
     15 * 60 * 1000,
@@ -54,6 +55,7 @@ export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCod
     errorMessage,
     undefined,
     statusCode,
+    errors,
   );
 }
 

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

@@ -0,0 +1,21 @@
+import { Route } from '@angular/router';
+
+import { authenticatedGuard } from '../core/auth/authenticated.guard';
+import { pendingChangesGuard } from '../submission/edit/pending-changes/pending-changes.guard';
+import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
+
+export const ROUTES: Route[] = [
+  {
+    path: ':id',
+    runGuardsAndResolvers: 'always',
+    children: [
+      {
+        path: '',
+        canActivate: [authenticatedGuard],
+        canDeactivate: [pendingChangesGuard],
+        component: ThemedSubmissionEditComponent,
+        data: { title: 'submission.edit.title' },
+      },
+    ],
+  },
+];

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

@@ -415,7 +415,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
     it('should call announceErrorMessages on SAVE_SUBMISSION_FORM_ERROR', () => {
       spyOn(component, 'announceErrorMessages');
-      actions$.next(new SaveSubmissionFormErrorAction('1234'));
+      actions$.next(new SaveSubmissionFormErrorAction('1234', null, null));
       expect(component.announceErrorMessages).toHaveBeenCalled();
     });
 
@@ -427,7 +427,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
     it('should call announceErrorMessages on SAVE_SUBMISSION_SECTION_FORM_ERROR', () => {
       spyOn(component, 'announceErrorMessages');
-      actions$.next(new SaveSubmissionSectionFormErrorAction('1234'));
+      actions$.next(new SaveSubmissionSectionFormErrorAction('1234', null, null));
       expect(component.announceErrorMessages).toHaveBeenCalled();
     });
   });