Merge branch 'release/3.2.3'

web-pal · May 6, 2019 · 4e4738e · 4e4738e
2 parents 50763e3 + 2be2fdf
commit 4e4738e
Show file tree

Hide file tree

Showing 26 changed files with 443 additions and 248 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,19 +1,19 @@
 {
   "name": "Chronos",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "Native app for time-tracking fully integrated with JIRA",
   "main": "./dist/main.prod.js",
   "author": {
     "name": "Webpal",
     "url": "https://github.com/web-pal"
   },
-  "license": "CCL",
+  "license": "ISC",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-pal/chronos-timetracker.git"
   },
   "dependencies": {
     "desktop-idle": "1.1.2",
-    "keytar": "4.4.1"
+    "keytar": "4.6.0"
   }
 }
diff --git a/app/renderer/api/enhancedFetch.js b/app/renderer/api/enhancedFetch.js
@@ -13,12 +13,19 @@ function EnhancedFetchError({
   response,
 }) {
   if (Error.captureStackTrace) {
+    Error.call(this);
     Error.captureStackTrace(this, this.constructor);
   } else {
     this.stack = (new Error()).stack || '';
   }
+  this.name = this.constructor.name;
   this.json = json;
   this.response = response;
+  this.extra = {
+    json,
+    response,
+  };
+  this.error = new Error('Custom fetch error');
 }
 
 

diff --git a/app/renderer/api/jiraApi/index.js b/app/renderer/api/jiraApi/index.js
@@ -39,6 +39,9 @@ function apiFactory({ makeRequest }) {
     ['getBoardProjects', '/board/{boardId}/project', 'GET', '/rest/agile/1.0'],
     ['getBoardSprints', '/board/{boardId}/sprint', 'GET', '/rest/agile/1.0'],
     ['getSprintById', '/sprint/{sprintId}', 'GET', '/rest/agile/1.0'],
+    ['saveWorklogActivity', '/worklogActivity', 'POST', '/plugins/servlet/chronos'],
+    ['getWorklogActivity', '/worklogActivity', 'GET', '/plugins/servlet/chronos'],
+    ['deleteScreenshot', '/deleteScreenshot', 'POST', '/plugins/servlet/chronos'],
   ];
 
   let headers = {
@@ -147,6 +150,24 @@ function apiFactory({ makeRequest }) {
       return mockMethods;
     },
 
+    uploadScreenshotOnSelfServer({
+      image,
+      filename,
+    }) {
+      const formData = new FormData();
+      formData.append(
+        'file',
+        new File([image], filename),
+      );
+      return makeRequest(
+        `${rootApiUrl}/plugins/servlet/chronos/screenshots`,
+        {
+          method: 'POST',
+          body: formData,
+        },
+      );
+    },
+
     ...(
       apiCommonMethods.reduce((
         acc,

diff --git a/...tainers/AuthForm/CloudLoginStep/index.jsx → ...ntainers/AuthForm/CloudLoginStep/index.js b/...tainers/AuthForm/CloudLoginStep/index.jsx → ...ntainers/AuthForm/CloudLoginStep/index.js
diff --git a/app/renderer/containers/AuthForm/TeamStep/TeamStep.jsx b/app/renderer/containers/AuthForm/TeamStep/TeamStep.jsx
@@ -91,6 +91,7 @@ class TeamStep extends Component<Props> {
           {accounts.length > 0
           && (
             <S.DefaultButton
+              type="button"
               onClick={() => {
                 dispatch(uiActions.setUiState({
                   authFormStep: 0,

diff --git a/app/renderer/containers/FlagsContainer/FlagsContainer.jsx b/app/renderer/containers/FlagsContainer/FlagsContainer.jsx
@@ -104,6 +104,10 @@ const FlagsContainer: StatelessFunctionalComponent<Props> = ({
                       ? <SpinnerContainer spinnerTitle={flag.spinnerTitle} />
                       : flag.title
                   }
+                  isDismissAllowed
+                  onDismissed={() => {
+                    dispatch(uiActions.deleteFlag(flag.id));
+                  }}
                   actions={flag.actions}
                   appearance={flag.appearance}
                   description={flag.description}

diff --git a/app/renderer/containers/Modals/WorklogModal/WorklogModal.jsx b/app/renderer/containers/Modals/WorklogModal/WorklogModal.jsx
@@ -179,7 +179,12 @@ class WorklogModal extends Component<Props, State> {
   validateJiraTime = value => /^(?:\d{1,2}d{1}(?:\s{1}|$))?(?:\d{1,2}h{1}(?:\s{1}|$))?(?:\d{1,2}m{1}(?:\s{1}|$))?(?:\d{1,2}s{1}(?:\s{1}|$))?$/.test(value);
 
   validate = () => {
-    const { errors, comment, timeSpent } = this.state;
+    const {
+      errors,
+      comment,
+      timeSpent,
+      startTime,
+    } = this.state;
     let valid = true;
 
     if (comment === '' && !this.props.allowEmptyComment) {
@@ -197,6 +202,9 @@ class WorklogModal extends Component<Props, State> {
     } else {
       errors.timeSpent = '';
     }
+    if (!startTime) {
+      valid = false;
+    }
 
     this.setState({ errors });
 

diff --git a/app/renderer/index.jsx b/app/renderer/index.jsx
@@ -23,6 +23,25 @@ if (process.env.NODE_ENV === 'production') {
     dsn: process.env.SENTRY_DSN,
     release: `${pjson.version}_${process.platform}`,
     enableNative: false,
+    beforeSend(event, hint) {
+      if (
+        event.message.startsWith('Non-Error exception captured')
+        && hint.originalException.error
+        && hint.originalException.extra
+      ) {
+        Sentry.withScope((scope) => {
+          scope.setExtra('nonErrorException', true);
+          Sentry.captureException(
+            hint.originalException.error,
+            {
+              extra: hint.originalException.extra,
+            },
+          );
+        });
+        return null;
+      }
+      return event;
+    },
   });
 }
 

diff --git a/app/renderer/issueFormPreload.js b/app/renderer/issueFormPreload.js
@@ -66,12 +66,14 @@ function* takeShowForm(): Generator<*, *, *> {
               document.getElementsByClassName('jira-dialog')[0].style.display = 'none';
               const formBody = issueForm.$form.children()[0];
               const jiraDialog = issueForm.$popup[0];
-              formBody.style.maxHeight = (
-                `${(parseInt(formBody.style.maxHeight.replace('px', ''), 10) + 120).toString()}px`
-              );
-              jiraDialog.style.marginTop = (
-                `${(parseInt(jiraDialog.style.marginTop.replace('px', ''), 10) - 65).toString()}px`
-              );
+              if (formBody) {
+                formBody.style.maxHeight = (
+                  `${(parseInt(formBody.style.maxHeight.replace('px', ''), 10) + 120).toString()}px`
+                );
+                jiraDialog.style.marginTop = (
+                  `${(parseInt(jiraDialog.style.marginTop.replace('px', ''), 10) - 65).toString()}px`
+                );
+              }
               issueForm.$popupHeading[0].lastElementChild.style.display = 'none';
             }, 0);
             setTimeout(() => {

diff --git a/app/renderer/sagas/auth.js b/app/renderer/sagas/auth.js
@@ -69,15 +69,19 @@ export function* authSelfHostedFlow(): Generator<*, *, *> {
       }));
     } catch (err) {
       if (err && err.message) {
-        yield eff.put(uiActions.setUiState('authError', err.message));
+        yield eff.put(uiActions.setUiState({
+          authError: err.message,
+        }));
       } else {
         yield eff.put(uiActions.setUiState(
           'authError',
           'Can not authenticate user. Please try again',
         ));
       }
-      yield eff.call(throwError, err);
-      yield eff.put(uiActions.setUiState('authRequestInProcess', false));
+      throwError(err);
+      yield eff.put(uiActions.setUiState({
+        authRequestInProcess: false,
+      }));
     }
   }
 }
@@ -196,14 +200,7 @@ export function* authFlow(): Generator<*, *, *> {
       trackMixpanel('Jira login');
       incrementMixpanel('Jira login', 1);
     } catch (err) {
-      if (err.debug) {
-        console.log(err.debug);
-        yield eff.put(authActions.addAuthDebugMessage([
-          {
-            json: err.debug,
-          },
-        ]));
-      }
+      throwError(err);
       yield eff.put(uiActions.setUiState({
         authRequestInProcess: false,
         authFormStep: 1,
@@ -212,7 +209,6 @@ export function* authFlow(): Generator<*, *, *> {
         authorized: false,
         authError: 'Can not authenticate user. Please try again',
       }));
-      yield eff.call(throwError, err.result ? err.result : err);
     }
   }
 }
@@ -301,7 +297,7 @@ export function* logoutFlow(): Generator<*, *, *> {
       trackMixpanel('Logout');
       incrementMixpanel('Logout', 1);
     } catch (err) {
-      yield eff.call(throwError, err);
+      throwError(err);
     }
   }
 }
@@ -381,7 +377,7 @@ export function* switchAccountFlow(): Generator<*, *, *> {
       yield eff.put(uiActions.setUiState({
         initializeInProcess: false,
       }));
-      yield eff.call(throwError, err);
+      throwError(err);
     }
   }
 }
diff --git a/app/renderer/sagas/boards.js b/app/renderer/sagas/boards.js
@@ -195,8 +195,8 @@ export function* fetchBoards(): Generator<*, void, *> {
       ),
     }));
   } catch (err) {
-    yield eff.call(throwError, err);
-    if (err.response.statusCode === 403) {
+    throwError(err);
+    if (err?.response?.statusCode === 403) {
       const helpUrl = (
         'https://web-pal.atlassian.net/wiki/spaces/CHRONOS/pages/173899778/Problem+with+loading+boards'
       );

diff --git a/app/renderer/sagas/comments.js b/app/renderer/sagas/comments.js
@@ -60,7 +60,7 @@ export function* getIssueComments(issueId: Id): Generator<*, void, *> {
     }));
     yield eff.call(infoLog, `got comments for issue ${issueId}`, comments);
   } catch (err) {
-    yield eff.call(throwError, err);
+    throwError(err);
   }
 }
 
@@ -100,14 +100,14 @@ export function* addIssueComment({
       commentAdding: false,
     }));
   } catch (err) {
+    throwError(err);
     yield eff.put(uiActions.setUiState({
       commentAdding: false,
     }));
     yield eff.fork(notify, {
 
       title: 'failed to add comment',
     });
-    yield eff.call(throwError, err);
   }
 }
 

diff --git a/app/renderer/sagas/filters.js b/app/renderer/sagas/filters.js
@@ -34,10 +34,10 @@ export function* fetchFilters(): Generator<*, *, *> {
       resources: filters,
     }));
   } catch (err) {
+    throwError(err);
     yield err.fork(notify, {
       title: 'Failed to load filters, check your permissions',
     });
-    yield eff.call(throwError, err);
   }
 }
 
@@ -109,6 +109,7 @@ export function* saveFilter({
     }));
     yield eff.put(issuesActions.refetchIssuesRequest());
   } catch (err) {
+    throwError(err);
     yield eff.put(actions.failed());
     const errObj = JSON.parse(err);
     if (errObj.body.errorMessages.length > 0) {
@@ -125,7 +126,6 @@ export function* saveFilter({
         description: R.values(errObj.body.errors).join('\n'),
       });
     }
-    yield eff.call(throwError, err);
   }
 }
 

diff --git a/app/renderer/sagas/helpers.js b/app/renderer/sagas/helpers.js
@@ -1,7 +1,6 @@
 import * as eff from 'redux-saga/effects';
 import storage from 'electron-json-storage';
 
-import config from 'config';
 import {
   getUiState,
 } from 'selectors';
@@ -35,6 +34,17 @@ export const removeElectronStorage = key => (
   })
 );
 
+export const clearElectronStorage = () => (
+  new Promise((resolve, reject) => {
+    storage.clear((err) => {
+      if (err) {
+        reject(new Error('Error clear storage'));
+      }
+      resolve();
+    });
+  })
+);
+
 export const getElectronStorage = (key, defaultValue) => (
   new Promise((resolve, reject) => {
     storage.get(key, (err, data) => {