[DURACOM-235] improvement of redirects logic

Author: atarix83

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts

@@ -91,8 +91,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   @Output() submitForm: EventEmitter<{
     dso: T,
     operations: Operation[],
-    uploader?: FileUploader,
-    deleteLogo?: boolean,
+    uploader?: FileUploader
   }> = new EventEmitter();
 
   /**
@@ -210,17 +209,15 @@ export class ComColFormComponent<T extends Collection | Community> implements On
       }
     });
 
-    if (!this.isCreation) {
+    if (this.isCreation) {
       this.submitForm.emit({
         dso: updatedDSO,
+        uploader: hasValue(this.uploaderComponent) ? this.uploaderComponent.uploader : undefined,
         operations: operations,
       });
-      this.finish.emit();
     } else {
       this.submitForm.emit({
         dso: updatedDSO,
-        deleteLogo: false,
-        uploader: hasValue(this.uploaderComponent) ? this.uploaderComponent.uploader : undefined,
         operations: operations,
       });
     }
@@ -262,6 +259,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     modalRef.componentInstance.cancelLabel = 'form.cancel';
     modalRef.componentInstance.confirmLabel = 'community-collection.edit.logo.delete.title';
     modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+    modalRef.componentInstance.brandColor = 'danger';
     return modalRef;
   }
 

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts

@@ -5,7 +5,7 @@ import { RemoteData } from '../../../../../core/data/remote-data';
 import { ActivatedRoute, Router } from '@angular/router';
 import { map, take } from 'rxjs/operators';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
-import { hasValue, isEmpty } from '../../../../empty.util';
+import { isEmpty } from '../../../../empty.util';
 import { ResourceType } from '../../../../../core/shared/resource-type';
 import { ComColDataService } from '../../../../../core/data/comcol-data.service';
 import { NotificationsService } from '../../../../notifications/notifications.service';
@@ -50,29 +50,20 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
    * @param event   The event returned by the community/collection form. Contains the new dso and logo uploader
    */
   onSubmit(event) {
-
-    const uploader = event.uploader;
-    const deleteLogo = event.deleteLogo;
-
-    const newLogo = hasValue(uploader) && uploader.queue.length > 0;
-    if (newLogo) {
-      this.dsoDataService.getLogoEndpoint(event.dso.uuid).pipe(take(1)).subscribe((href: string) => {
-        uploader.options.url = href;
-        uploader.uploadAll();
-      });
-    }
-
     if (!isEmpty(event.operations)) {
       this.dsoDataService.patch(event.dso, event.operations).pipe(getFirstCompletedRemoteData())
         .subscribe(async (response: RemoteData<DSpaceObject>) => {
           if (response.hasSucceeded) {
+            await this.router.navigate([this.frontendURL + event.dso.uuid]);
             this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
           } else if (response.statusCode === 403) {
             this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
           } else {
             this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
           }
         });
+    } else {
+      this.router.navigate([this.frontendURL + event.dso.uuid]);
     }
   }