Skip to content

Commit

Permalink
Nathandegraaf error snack (#232)
Browse files Browse the repository at this point in the history
* Graph polishing

* Revert "Graph polishing"

This reverts commit 65cfb1b.

* Adds Error Snackbar on Server errors

* fix lint
  • Loading branch information
NathanDeGraaf authored and KrashLeviathan committed Apr 17, 2018
1 parent 92f4033 commit a9e402b
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 76 deletions.
11 changes: 11 additions & 0 deletions src/actions/error.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* eslint import/prefer-default-export: 0 */
import actionCreator from '../utils/actionCreator'
import * as Constants from '../constants'

export function setError(errorMessage) {
return actionCreator(Constants.SET_ERROR, { errorMessage })
}

export function hideError() {
return actionCreator(Constants.HIDE_ERROR)
}
9 changes: 5 additions & 4 deletions src/actions/invite.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import FetchClient from './../utils/fetchClient'
import actionCreator from './../utils/actionCreator'
import * as Constants from './../constants'
import logError from '../utils/error'

export function setUserInvites(invites) {
return actionCreator(Constants.SET_USER_INVITES, { invites })
Expand All @@ -16,10 +17,10 @@ export function getUserInvites(token) {
dispatch(setUserInvites(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -37,10 +38,10 @@ function updateInvite(token, inviteId, action) {
dispatch(setUserInvites([result]))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand Down
55 changes: 28 additions & 27 deletions src/actions/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import download from './../vendor/download'
import FetchClient from './../utils/fetchClient'
import actionCreator from './../utils/actionCreator'
import * as Constants from './../constants'
import logError from '../utils/error'

export function setUserProjects(projects) {
return actionCreator(Constants.SET_USER_PROJECTS, { projects })
Expand Down Expand Up @@ -41,10 +42,10 @@ export function getUserProjects(token) {
dispatch(setUserProjects(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -62,10 +63,10 @@ export function getIssues(token, id, parameters) {
dispatch(setIssues(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -83,10 +84,10 @@ export function getBuildStatuses(token, id, limit) {
dispatch(setBuildStatuses(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -104,10 +105,10 @@ export function getProjectContributors(token, id) {
dispatch(setProjectContributors(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -123,10 +124,10 @@ export function getProjectOwners(token, id) {
dispatch(setProjectOwners(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -142,10 +143,10 @@ export function getProjects(token) {
dispatch(setProjects(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -161,10 +162,10 @@ export function getProject(token, id) {
dispatch(setProjects([result]))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -190,7 +191,7 @@ export function deleteProject(token, id) {
}

export function getProjectFiles(token, id) {
return async () => {
return async (dispatch) => {
try {
const fetchClient = new FetchClient()
fetchClient.setAuthToken(token)
Expand All @@ -205,10 +206,10 @@ export function getProjectFiles(token, id) {
download(result, 'project.zip')
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -226,10 +227,10 @@ export function addContributor(token, info) {
dispatch(setProjectContributors(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -247,10 +248,10 @@ export function addOwner(token, info) {
dispatch(setProjectOwners(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -268,10 +269,10 @@ export function removeContributor(token, info) {
dispatch(setProjectContributors(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -289,10 +290,10 @@ export function removeOwner(token, info) {
dispatch(setProjectOwners(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand All @@ -311,10 +312,10 @@ export function addProject(token, project) {
dispatch(setProject(result))
return { result, error }
}
console.error(error)
logError(dispatch, error)
return { result: null, error }
} catch (error) {
console.error(error)
logError(dispatch, error)
return { result: null, error }
}
}
Expand Down
Loading

0 comments on commit a9e402b

Please sign in to comment.