diff options
author | Stefan <stefan@adlk.io> | 2019-06-04 14:26:56 +0200 |
---|---|---|
committer | Stefan <stefan@adlk.io> | 2019-06-04 14:26:56 +0200 |
commit | fd6a1e9ba24c7947af08a30829c860cad4726f67 (patch) | |
tree | 0b6276700ced8d13eaf0a1e3b706a69a5a47b1da /src/actions | |
parent | fix(Windows): Replace tray icon with high-res version (diff) | |
parent | Merge pull request #1443 from meetfranz/feature/multilingual-announcements (diff) | |
download | ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.gz ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.zst ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.zip |
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/index.js | 2 | ||||
-rw-r--r-- | src/actions/lib/actions.js | 2 | ||||
-rw-r--r-- | src/actions/service.js | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/actions/index.js b/src/actions/index.js index 00f843cd6..fc525afeb 100644 --- a/src/actions/index.js +++ b/src/actions/index.js | |||
@@ -11,6 +11,7 @@ import payment from './payment'; | |||
11 | import news from './news'; | 11 | import news from './news'; |
12 | import settings from './settings'; | 12 | import settings from './settings'; |
13 | import requests from './requests'; | 13 | import requests from './requests'; |
14 | import announcements from '../features/announcements/actions'; | ||
14 | import workspaces from '../features/workspaces/actions'; | 15 | import workspaces from '../features/workspaces/actions'; |
15 | 16 | ||
16 | const actions = Object.assign({}, { | 17 | const actions = Object.assign({}, { |
@@ -28,5 +29,6 @@ const actions = Object.assign({}, { | |||
28 | 29 | ||
29 | export default Object.assign( | 30 | export default Object.assign( |
30 | defineActions(actions, PropTypes.checkPropTypes), | 31 | defineActions(actions, PropTypes.checkPropTypes), |
32 | { announcements }, | ||
31 | { workspaces }, | 33 | { workspaces }, |
32 | ); | 34 | ); |
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js index 2bc7d2711..b38db9946 100644 --- a/src/actions/lib/actions.js +++ b/src/actions/lib/actions.js | |||
@@ -1,7 +1,7 @@ | |||
1 | export const createActionsFromDefinitions = (actionDefinitions, validate) => { | 1 | export const createActionsFromDefinitions = (actionDefinitions, validate) => { |
2 | const actions = {}; | 2 | const actions = {}; |
3 | Object.keys(actionDefinitions).forEach((actionName) => { | 3 | Object.keys(actionDefinitions).forEach((actionName) => { |
4 | const action = (params) => { | 4 | const action = (params = {}) => { |
5 | const schema = actionDefinitions[actionName]; | 5 | const schema = actionDefinitions[actionName]; |
6 | validate(schema, params, actionName); | 6 | validate(schema, params, actionName); |
7 | action.notify(params); | 7 | action.notify(params); |
diff --git a/src/actions/service.js b/src/actions/service.js index ceaabc31e..68c62d594 100644 --- a/src/actions/service.js +++ b/src/actions/service.js | |||
@@ -4,7 +4,9 @@ import ServiceModel from '../models/Service'; | |||
4 | export default { | 4 | export default { |
5 | setActive: { | 5 | setActive: { |
6 | serviceId: PropTypes.string.isRequired, | 6 | serviceId: PropTypes.string.isRequired, |
7 | keepActiveRoute: PropTypes.bool, | ||
7 | }, | 8 | }, |
9 | blurActive: {}, | ||
8 | setActiveNext: {}, | 10 | setActiveNext: {}, |
9 | setActivePrev: {}, | 11 | setActivePrev: {}, |
10 | showAddServiceInterface: { | 12 | showAddServiceInterface: { |