use IApplicationShell to show failures on actionRef and actionCommit requests

Author: ole1986

browser/src/actions/results.ts

@@ -45,6 +45,8 @@ export const actionCommit = (logEntry: LogEntry, name: string = '', value: strin
                     break;
             }
             dispatch(updateCommitInList(result.data as LogEntry));
+        }).catch(ex => {
+            dispatch(updateCommitInList(logEntry));
         });
     };
 };
@@ -63,6 +65,8 @@ export const actionRef = (logEntry: LogEntry, ref: Ref, name: string = '') => {
 
             dispatch(getBranches());
             dispatch(updateCommitInList(logEntry));
+        }).catch(ex => {
+            dispatch(updateCommitInList(logEntry));
         });
     };
 };

src/adapter/repository/git.ts

@@ -304,7 +304,11 @@ export class Git implements IGitService {
     }
 
     public async createBranch(branchName: string, hash: string): Promise<void> {
-        await this.repo.createBranch(branchName, false, hash);
+        try {
+            await this.repo.createBranch(branchName, false, hash);
+        } catch (ex) {
+            throw ex.stderr;
+        }
     }
 
     public async createTag(tagName: string, hash: string): Promise<any> {
@@ -316,7 +320,11 @@ export class Git implements IGitService {
     }
 
     public async removeBranch(branchName: string) {
-        await this.repo.deleteBranch(branchName);
+        try {
+            await this.repo.deleteBranch(branchName);
+        } catch (ex) {
+            throw ex.stderr;
+        }
     }
 
     public async removeRemoteBranch(remoteBranchName: string) {

src/server/apiController.ts

@@ -9,18 +9,21 @@ import { CommitDetails, FileCommitDetails } from '../common/types';
 import { IServiceContainer } from '../ioc/types';
 import { Avatar, CommittedFile, IGitService, IGitServiceFactory, LogEntries, LogEntriesResponse, LogEntry, Ref, RefType } from '../types';
 import { IApiRouteHandler } from './types';
+import { IApplicationShell } from '../application/types';
 
 // tslint:disable-next-line:no-require-imports no-var-requires
 
 @injectable()
 export class ApiController implements IApiRouteHandler {
     private readonly commitViewer: IGitCommitViewDetailsCommandHandler;
+    private readonly applicationShell: IApplicationShell;
     constructor(private app: Express,
         private gitServiceFactory: IGitServiceFactory,
         private serviceContainer: IServiceContainer,
         private commandManager: ICommandManager) {
 
         this.commitViewer = this.serviceContainer.get<IGitCommitViewDetailsCommandHandler>(IGitCommitViewDetailsCommandHandler);
+        this.applicationShell = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
 
         this.app.get('/log', this.handleRequest(this.getLogEntries.bind(this)));
         this.app.get('/branches', this.handleRequest(this.getBranches.bind(this)));
@@ -167,6 +170,7 @@ export class ApiController implements IApiRouteHandler {
             }
             response.status(200).send('');
         } catch (err) {
+            this.applicationShell.showErrorMessage(err);
             response.status(500).send(err);
         }
     }
@@ -204,6 +208,7 @@ export class ApiController implements IApiRouteHandler {
             }
             response.status(200).send(logEntry);
         } catch(err) {
+            this.applicationShell.showErrorMessage(err);
             response.status(500).send(err);
         }
     }