fix: show specific error message on bulk delete error

kaltura · Oct 2, 2017 · 90a99fc · 90a99fc
1 parent 82429c6
commit 90a99fc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/applications/content-entries-app/entries/bulk-actions/bulk-actions.component.ts b/src/applications/content-entries-app/entries/bulk-actions/bulk-actions.component.ts
@@ -12,6 +12,7 @@ import { environment } from 'app-environment';
 import { KalturaUser } from 'kaltura-typescript-client/types/KalturaUser';
 import { KalturaMediaType } from 'kaltura-typescript-client/types/KalturaMediaType';
 import { KalturaAccessControl } from 'kaltura-typescript-client/types/KalturaAccessControl';
+import { BulkDeleteError } from './services/bulk-delete.service';
 @Component({
   selector: 'kBulkActions',
   templateUrl: './bulk-actions.component.html',
@@ -155,7 +156,10 @@ export class BulkActionsComponent implements OnInit, OnDestroy {
           this.onBulkChange.emit({ reload: reloadEntries });
         },
         error => {
-          this._browserService.setAppStatus({ isBusy: false, errorMessage: this._appLocalization.get('applications.content.bulkActions.error') });
+          const message = error.type === 'bulkDelete'
+            ? error.message
+            : this._appLocalization.get('applications.content.bulkActions.error');
+          this._browserService.setAppStatus({ isBusy: false, errorMessage: message });
         }
       );
     };

diff --git a/...pplications/content-entries-app/entries/bulk-actions/services/bulk-action-base.service.ts b/...pplications/content-entries-app/entries/bulk-actions/services/bulk-action-base.service.ts
@@ -37,10 +37,13 @@ export abstract class BulkActionBaseService<T> {
 
     return Observable.forkJoin(multiRequests)
       .map(responses => {
-        const mergedResponses = [].concat.apply([], responses);
-        let hasFailure = mergedResponses.filter(function ( response ) {return response.error}).length > 0;
-        if (hasFailure) {
-          throw new Error("error");
+        const errorMessage = [].concat.apply([], responses)
+          .filter(response => !!response.error)
+          .reduce((acc, { error }) => `${acc}\n${error.message}`, '')
+          .trim();
+
+        if (!!errorMessage) {
+          throw new Error(errorMessage);
         } else {
           return {};
         }

diff --git a/src/applications/content-entries-app/entries/bulk-actions/services/bulk-delete.service.ts b/src/applications/content-entries-app/entries/bulk-actions/services/bulk-delete.service.ts
@@ -6,6 +6,14 @@ import { KalturaMediaEntry } from 'kaltura-typescript-client/types/KalturaMediaE
 import { BaseEntryDeleteAction } from 'kaltura-typescript-client/types/BaseEntryDeleteAction';
 import { BulkActionBaseService } from './bulk-action-base.service';
 
+export class BulkDeleteError extends Error {
+  type = 'bulkDelete';
+
+  constructor(message: string) {
+    super(message);
+  }
+}
+
 @Injectable()
 export class BulkDeleteService extends BulkActionBaseService<{}> {
 
@@ -30,7 +38,7 @@ export class BulkDeleteService extends BulkActionBaseService<{}> {
           observer.complete();
         },
         error => {
-          observer.error(error);
+          observer.error(new BulkDeleteError(error.message));
         }
       );
     });