Merge pull request #17 from Coding/yangzhen/FSAify-actions

hackape · web-flow · commit 9e007fd1c64c · 2016-11-02T14:33:35.000+08:00
FSA-ify Git and Notification
diff --git a/app/components/Git/actions.js b/app/components/Git/actions.js
@@ -4,19 +4,18 @@ import { notify, NOTIFY_TYPE } from '../Notification/actions'
 import { showModal, dismissModal } from '../Modal/actions'
 
 export const GIT_STATUS = 'GIT_STATUS'
-export function updateStatus ({files, isClean}) {
+export function updateStatus (payload) {
   return {
     type: GIT_STATUS,
-    files,
-    isClean
+    payload
   }
 }
 
 export const GIT_UPDATE_COMMIT_MESSAGE = 'GIT_UPDATE_COMMIT_MESSAGE'
-export function updateCommitMessage (commitMessage) {
+export function updateCommitMessage (payload) {
   return {
     type: GIT_UPDATE_COMMIT_MESSAGE,
-    commitMessage
+    payload
   }
 }
 
@@ -28,18 +27,18 @@ export function commit ({files, commitMessage: message}) {
 }
 
 export const GIT_STAGE_FILE = 'GIT_STAGE_FILE'
-export function stageFile (file) {
+export function stageFile (payload) {
   return {
     type: GIT_STAGE_FILE,
-    fileName: file.name
+    payload
   }
 }
 
 export const GIT_UNSTAGE_FILE = 'GIT_UNSTAGE_FILE'
-export function unstageFile (file) {
+export function unstageFile (payload) {
   return {
     type: GIT_UNSTAGE_FILE,
-    fileName: file.name
+    payload
   }
 }
 
@@ -57,7 +56,7 @@ export function getBranches () {
     api.gitBranch().then(data => {
       dispatch({
         type: GIT_BRANCH,
-        branches: data
+        payload: { branches: data }
       })
     })
   }
@@ -99,15 +98,15 @@ export const GIT_CURRENT_BRANCH = 'GIT_CURRENT_BRANCH'
 export function updateCurrentBranch ({ name }) {
   return {
     type: GIT_CURRENT_BRANCH,
-    branch: name,
+    payload: {branch: name},
   }
 }
 
 export const GIT_UPDATE_STASH_MESSAGE = 'GIT_UPDATE_STASH_MESSAGE'
-export function updateStashMessage (stashMessage) {
+export function updateStashMessage (payload) {
   return {
     type: GIT_UPDATE_STASH_MESSAGE,
-    stashMessage,
+    payload,
   }
 }
 
@@ -127,34 +126,34 @@ export function createStash (message) {
 }
 
 export const GIT_UPDATE_STASH_LIST = 'GIT_UPDATE_STASH_LIST'
-export function updateStashList (stashList) {
+export function updateStashList (payload) {
   return {
     type: GIT_UPDATE_STASH_LIST,
-    stashList: stashList
+    payload
   }
 }
 
 export const GIT_UPDATE_UNSTASH_IS_POP = 'GIT_UPDATE_UNSTASH_IS_POP'
-export function updateUnstashIsPop (isPop) {
+export function updateUnstashIsPop (payload) {
   return {
     type: GIT_UPDATE_UNSTASH_IS_POP,
-    isPop
+    payload
   }
 }
 
 export const GIT_UPDATE_UNSTASH_IS_REINSTATE = 'GIT_UPDATE_UNSTASH_IS_REINSTATE'
-export function updateUnstashIsReinstate (isReinstate) {
+export function updateUnstashIsReinstate (payload) {
   return {
     type: GIT_UPDATE_UNSTASH_IS_REINSTATE,
-    isReinstate
+    payload
   }
 }
 
 export const GIT_UPDATE_UNSTASH_BRANCH_NAME = 'GIT_UPDATE_UNSTASH_BRANCH_NAME'
-export function updateUnstashBranchName (newBranchName) {
+export function updateUnstashBranchName (payload) {
   return {
     type: GIT_UPDATE_UNSTASH_BRANCH_NAME,
-    newBranchName
+    payload
   }
 }
 
@@ -165,10 +164,10 @@ export function getStashList () {
 }
 
 export const GIT_SELECT_STASH = 'GIT_SELECT_STASH'
-export function selectStash (selectedStash) {
+export function selectStash (payload) {
   return {
     type: GIT_SELECT_STASH,
-    selectedStash: selectedStash
+    payload
   }
 }
 
diff --git a/app/components/Git/reducer.js b/app/components/Git/reducer.js
@@ -46,68 +46,64 @@ export default function GitReducer (state = _state, action) {
   switch (action.type) {
 
     case GIT_STATUS:
-      var workingDirDelta = {
-        isClean: action.isClean,
-        files: action.files
-      }
-      state.workingDir = Object.assign({}, state.workingDir, workingDirDelta)
+      state.workingDir = Object.assign({}, state.workingDir, action.payload)
       return state
 
     case GIT_UPDATE_COMMIT_MESSAGE:
-      state.stagingArea.commitMessage = action.commitMessage
+      state.stagingArea.commitMessage = action.payload
       return state
 
     case GIT_STAGE_FILE:
-      state.stagingArea.files = _.union(state.stagingArea.files, [action.fileName])
+      state.stagingArea.files = _.union(state.stagingArea.files, [action.payload.name])
       return state
 
     case GIT_UNSTAGE_FILE:
-      state.stagingArea.files = _.without(state.stagingArea.files, action.fileName)
+      state.stagingArea.files = _.without(state.stagingArea.files, action.payload.name)
       return state
 
     case GIT_BRANCH:
-      state.branches = action.branches
+      state.branches = action.payload.branches
       return state
 
     case GIT_CHECKOUT:
       state.branches.current = action.branch
       return state
 
     case GIT_CURRENT_BRANCH:
-      state.branches.current = action.branch
+      state.branches.current = action.payload.branch
       return state
     
     case GIT_UPDATE_STASH_MESSAGE:
-      state.stash.stashMessage = action.stashMessage
+      state.stash.stashMessage = action.payload
       return state
 
     case GIT_UPDATE_UNSTASH_IS_POP:
-      state.unstash.isPop = action.isPop
+      state.unstash.isPop = action.payload
       return state
 
     case GIT_UPDATE_UNSTASH_IS_POP:
       state.unstash.isPop = action.isPop
       return state
 
     case GIT_UPDATE_UNSTASH_IS_REINSTATE:
-      state.unstash.isReinstate = action.isReinstate
+      state.unstash.isReinstate = action.payload
       return state
 
     case GIT_UPDATE_UNSTASH_BRANCH_NAME:
-      state.unstash.newBranchName = action.newBranchName
+      state.unstash.newBranchName = action.payload
       return state
 
     case GIT_UPDATE_STASH_LIST:
-      state.unstash.stashList = action.stashList
-      if (action.stashList.length == 0) {
+      state.unstash.stashList = action.payload
+      if (state.unstash.stashList.length == 0) {
         state.unstash.selectedStash = null
       } else if(!state.unstash.selectedStash) {
-        state.unstash.selectedStash = action.stashList[0]
+        state.unstash.selectedStash = state.unstash.stashList[0]
       }
       return state
 
     case GIT_SELECT_STASH:
-      state.unstash.selectedStash = action.selectedStash
+      state.unstash.selectedStash = action.payload
       return state
       
     default:
diff --git a/app/components/Notification/actions.js b/app/components/Notification/actions.js
@@ -1,6 +1,6 @@
 /* @flow weak */
 export const NOTIFICATION_ADD = 'NOTIFICATION_ADD'
-export function addNotification (_notification) {
+export function addNotification (payload) {
   return dispatch => {
     var notification, defaultNotification
 
@@ -12,19 +12,19 @@ export function addNotification (_notification) {
       onClick: () => dispatch({type: NOTIFICATION_REMOVE, notification})
     }
 
-    let { notifyType } = _notification
+    let { notifyType } = payload
     if (notifyType === NOTIFY_TYPE.ERROR) {
       defaultNotification = {...defaultNotification, ...{ 
         barStyle: { backgroundColor:'red' },
         actionStyle: { color:'white' }
       }}
     }
 
-    notification = {...defaultNotification, ..._notification}
+    payload = {...defaultNotification, ...payload}
 
     dispatch({
       type: NOTIFICATION_ADD,
-      notification
+      payload
     })
   }
 }
@@ -37,9 +37,9 @@ export const NOTIFY_TYPE = {
 }
 
 export const NOTIFICATION_REMOVE = 'NOTIFICATION_REMOVE'
-export function removeNotification (notification) {
+export function removeNotification (payload) {
   return {
     type: NOTIFICATION_REMOVE,
-    notification
+    payload
   }
 }
diff --git a/app/components/Notification/reducer.js b/app/components/Notification/reducer.js
@@ -11,11 +11,11 @@ export default function NotificationReducer (state = {notifications: []}, action
 
   switch (action.type) {
     case NOTIFICATION_ADD:
-      state.notifications.push(action.notification)
+      state.notifications.push(action.payload)
       return state
 
     case NOTIFICATION_REMOVE:
-      _.remove(state.notifications, action.notification)
+      _.remove(state.notifications, action.payload)
       return state
 
     default:

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,18 @@ import { notify, NOTIFY_TYPE } from '../Notification/actions'`
`4`	`4`	`import { showModal, dismissModal } from '../Modal/actions'`
`5`	`5`
`6`	`6`	`export const GIT_STATUS = 'GIT_STATUS'`
`7`		`-export function updateStatus ({files, isClean}) {`
	`7`	`+export function updateStatus (payload) {`
`8`	`8`	`return {`
`9`	`9`	`type: GIT_STATUS,`
`10`		`- files,`
`11`		`- isClean`
	`10`	`+ payload`
`12`	`11`	`}`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`export const GIT_UPDATE_COMMIT_MESSAGE = 'GIT_UPDATE_COMMIT_MESSAGE'`
`16`		`-export function updateCommitMessage (commitMessage) {`
	`15`	`+export function updateCommitMessage (payload) {`
`17`	`16`	`return {`
`18`	`17`	`type: GIT_UPDATE_COMMIT_MESSAGE,`
`19`		`- commitMessage`
	`18`	`+ payload`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
`@@ -28,18 +27,18 @@ export function commit ({files, commitMessage: message}) {`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`export const GIT_STAGE_FILE = 'GIT_STAGE_FILE'`
`31`		`-export function stageFile (file) {`
	`30`	`+export function stageFile (payload) {`
`32`	`31`	`return {`
`33`	`32`	`type: GIT_STAGE_FILE,`
`34`		`- fileName: file.name`
	`33`	`+ payload`
`35`	`34`	`}`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`export const GIT_UNSTAGE_FILE = 'GIT_UNSTAGE_FILE'`
`39`		`-export function unstageFile (file) {`
	`38`	`+export function unstageFile (payload) {`
`40`	`39`	`return {`
`41`	`40`	`type: GIT_UNSTAGE_FILE,`
`42`		`- fileName: file.name`
	`41`	`+ payload`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`
`@@ -57,7 +56,7 @@ export function getBranches () {`
`57`	`56`	`api.gitBranch().then(data => {`
`58`	`57`	`dispatch({`
`59`	`58`	`type: GIT_BRANCH,`
`60`		`- branches: data`
	`59`	`+ payload: { branches: data }`
`61`	`60`	`})`
`62`	`61`	`})`
`63`	`62`	`}`
`@@ -99,15 +98,15 @@ export const GIT_CURRENT_BRANCH = 'GIT_CURRENT_BRANCH'`
`99`	`98`	`export function updateCurrentBranch ({ name }) {`
`100`	`99`	`return {`
`101`	`100`	`type: GIT_CURRENT_BRANCH,`
`102`		`- branch: name,`
	`101`	`+ payload: {branch: name},`
`103`	`102`	`}`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`export const GIT_UPDATE_STASH_MESSAGE = 'GIT_UPDATE_STASH_MESSAGE'`
`107`		`-export function updateStashMessage (stashMessage) {`
	`106`	`+export function updateStashMessage (payload) {`
`108`	`107`	`return {`
`109`	`108`	`type: GIT_UPDATE_STASH_MESSAGE,`
`110`		`- stashMessage,`
	`109`	`+ payload,`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`
`@@ -127,34 +126,34 @@ export function createStash (message) {`
`127`	`126`	`}`
`128`	`127`
`129`	`128`	`export const GIT_UPDATE_STASH_LIST = 'GIT_UPDATE_STASH_LIST'`
`130`		`-export function updateStashList (stashList) {`
	`129`	`+export function updateStashList (payload) {`
`131`	`130`	`return {`
`132`	`131`	`type: GIT_UPDATE_STASH_LIST,`
`133`		`- stashList: stashList`
	`132`	`+ payload`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`export const GIT_UPDATE_UNSTASH_IS_POP = 'GIT_UPDATE_UNSTASH_IS_POP'`
`138`		`-export function updateUnstashIsPop (isPop) {`
	`137`	`+export function updateUnstashIsPop (payload) {`
`139`	`138`	`return {`
`140`	`139`	`type: GIT_UPDATE_UNSTASH_IS_POP,`
`141`		`- isPop`
	`140`	`+ payload`
`142`	`141`	`}`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`export const GIT_UPDATE_UNSTASH_IS_REINSTATE = 'GIT_UPDATE_UNSTASH_IS_REINSTATE'`
`146`		`-export function updateUnstashIsReinstate (isReinstate) {`
	`145`	`+export function updateUnstashIsReinstate (payload) {`
`147`	`146`	`return {`
`148`	`147`	`type: GIT_UPDATE_UNSTASH_IS_REINSTATE,`
`149`		`- isReinstate`
	`148`	`+ payload`
`150`	`149`	`}`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`export const GIT_UPDATE_UNSTASH_BRANCH_NAME = 'GIT_UPDATE_UNSTASH_BRANCH_NAME'`
`154`		`-export function updateUnstashBranchName (newBranchName) {`
	`153`	`+export function updateUnstashBranchName (payload) {`
`155`	`154`	`return {`
`156`	`155`	`type: GIT_UPDATE_UNSTASH_BRANCH_NAME,`
`157`		`- newBranchName`
	`156`	`+ payload`
`158`	`157`	`}`
`159`	`158`	`}`
`160`	`159`
`@@ -165,10 +164,10 @@ export function getStashList () {`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`export const GIT_SELECT_STASH = 'GIT_SELECT_STASH'`
`168`		`-export function selectStash (selectedStash) {`
	`167`	`+export function selectStash (payload) {`
`169`	`168`	`return {`
`170`	`169`	`type: GIT_SELECT_STASH,`
`171`		`- selectedStash: selectedStash`
	`170`	`+ payload`
`172`	`171`	`}`
`173`	`172`	`}`
`174`	`173`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* @flow weak */`
`2`	`2`	`export const NOTIFICATION_ADD = 'NOTIFICATION_ADD'`
`3`		`-export function addNotification (_notification) {`
	`3`	`+export function addNotification (payload) {`
`4`	`4`	`return dispatch => {`
`5`	`5`	`var notification, defaultNotification`
`6`	`6`
`@@ -12,19 +12,19 @@ export function addNotification (_notification) {`
`12`	`12`	`onClick: () => dispatch({type: NOTIFICATION_REMOVE, notification})`
`13`	`13`	`}`
`14`	`14`
`15`		`- let { notifyType } = _notification`
	`15`	`+ let { notifyType } = payload`
`16`	`16`	`if (notifyType === NOTIFY_TYPE.ERROR) {`
`17`	`17`	`defaultNotification = {...defaultNotification, ...{`
`18`	`18`	`barStyle: { backgroundColor:'red' },`
`19`	`19`	`actionStyle: { color:'white' }`
`20`	`20`	`}}`
`21`	`21`	`}`
`22`	`22`
`23`		`- notification = {...defaultNotification, ..._notification}`
	`23`	`+ payload = {...defaultNotification, ...payload}`
`24`	`24`
`25`	`25`	`dispatch({`
`26`	`26`	`type: NOTIFICATION_ADD,`
`27`		`- notification`
	`27`	`+ payload`
`28`	`28`	`})`
`29`	`29`	`}`
`30`	`30`	`}`
`@@ -37,9 +37,9 @@ export const NOTIFY_TYPE = {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`export const NOTIFICATION_REMOVE = 'NOTIFICATION_REMOVE'`
`40`		`-export function removeNotification (notification) {`
	`40`	`+export function removeNotification (payload) {`
`41`	`41`	`return {`
`42`	`42`	`type: NOTIFICATION_REMOVE,`
`43`		`- notification`
	`43`	`+ payload`
`44`	`44`	`}`
`45`	`45`	`}`