fix(jira): sometimes crashing app for wrong config #253

johannesjo · Nov 1, 2019 · d23d98f · d23d98f
1 parent 754beb2
commit d23d98f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/electron/jira.ts b/electron/jira.ts
@@ -93,6 +93,6 @@ const parseHostAndPort = (config: JiraCfg) => {
     protocol = 'https';
   }
 
-  console.log({host, protocol, port});
+  // console.log({host, protocol, port});
   return {host, protocol, port};
 };
diff --git a/src/app/core/error-handler/global-error-handler.class.ts b/src/app/core/error-handler/global-error-handler.class.ts
@@ -41,7 +41,10 @@ const _createErrorAlert = (eSvc: ElectronService, err: string, stackTrace: strin
 
 
 const isHandledError = (err): boolean => {
-  return (err && err.hasOwnProperty(HANDLED_ERROR_PROP_STR));
+  const errStr = (typeof err === 'string') ? err : err.toString();
+  // NOTE: for some unknown reason sometimes err is undefined while err.toString is not...
+  // this is why we also check the string value
+  return (err && err.hasOwnProperty(HANDLED_ERROR_PROP_STR)) || (errStr.match(HANDLED_ERROR_PROP_STR));
 };
 
 @Injectable()
@@ -62,6 +65,7 @@ export class GlobalErrorHandler implements ErrorHandler {
     const errStr = (typeof err === 'string') ? err : err.toString();
     // tslint:disable-next-line
     const stack = err && err.stack;
+    console.log(isHandledError(err), err[HANDLED_ERROR_PROP_STR], errStr);
 
     // if not our custom error handler we have a critical error on our hands
     if (!isHandledError(err)) {

diff --git a/src/app/features/issue/jira/jira-api.service.ts b/src/app/features/issue/jira/jira-api.service.ts
@@ -9,13 +9,7 @@ import {
   JIRA_REQUEST_TIMEOUT_DURATION
 } from './jira.const';
 import {ProjectService} from '../../project/project.service';
-import {
-  mapIssueResponse,
-  mapIssuesResponse,
-  mapResponse,
-  mapToSearchResults,
-  mapTransitionResponse
-} from './jira-issue/jira-issue-map.util';
+import {mapIssueResponse, mapIssuesResponse, mapResponse, mapToSearchResults, mapTransitionResponse} from './jira-issue/jira-issue-map.util';
 import {JiraOriginalStatus, JiraOriginalTransition, JiraOriginalUser} from './jira-api-responses';
 import {JiraCfg} from './jira';
 import {ElectronService} from 'ngx-electron';
@@ -314,8 +308,8 @@ export class JiraApiService {
     return fromPromise(promise)
       .pipe(
         catchError((err) => {
-          const errTxt = getJiraResponseErrorTxt(err);
-          this._snackService.open({type: 'ERROR', msg: `Jira: ${errTxt}`});
+          const errTxt = `Jira: ${getJiraResponseErrorTxt(err)}`;
+          this._snackService.open({type: 'ERROR', msg: errTxt});
           return throwError({[HANDLED_ERROR_PROP_STR]: errTxt});
         }),
         first(),