uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 560 delete bind play macro action when macro delete (#576)

Browse Source 
* fix(config): delete KeyAction binding of deleted macro

* refactor: use sorter import

* fix(macro): read the macro id from route params

* fix(keyAction): use NoneAction in keyAction mapping
This commit is contained in:
Róbert Kiss
2018-02-11 20:12:12 +01:00
committed by László Monda
parent e545c9d67b
commit 1a413c824e
5 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/uhk-web/src/app/store/reducers/user-configuration.ts
View File

@@ -4,7 +4,18 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import 'rxjs/add/operator/map';
import { KeyAction, KeyActionHelper, Keymap, Layer, Macro, Module, SwitchLayerAction, UserConfiguration } from 'uhk-common';
import {
KeyAction,
KeyActionHelper,
Keymap,
Layer,
Macro,
Module,
NoneAction,
PlayMacroAction,
SwitchLayerAction,
UserConfiguration
} from 'uhk-common';
import { KeymapActions, MacroActions } from '../actions';
import { AppState } from '../index';
import { ActionTypes } from '../actions/user-config';
@@ -210,9 +221,34 @@ export function reducer(state = initialState, action: Action & { payload?: any }
changedUserConfiguration.macros = insertItemInNameOrder(state.macros, newMacro, macro => macro.id !== newMacro.id);
break;
}
case MacroActions.REMOVE:
changedUserConfiguration.macros = state.macros.filter((macro: Macro) => macro.id !== action.payload);
const macroId = action.payload;
changedUserConfiguration.macros = state.macros.filter((macro: Macro) => macro.id !== macroId);
for (let k = 0; k < changedUserConfiguration.keymaps.length; k++) {
const keymap = changedUserConfiguration.keymaps[k];
let hasChanges = false;
for (const layer of keymap.layers) {
for (const module of layer.modules) {
for (let ka = 0; ka < module.keyActions.length; ka++) {
const keyAction = module.keyActions[ka];
if (keyAction instanceof PlayMacroAction && keyAction.macroId === macroId) {
hasChanges = true;
module.keyActions[ka] = new NoneAction();
}
}
}
}
if (hasChanges) {
changedUserConfiguration.keymaps[k] = new Keymap(keymap);
}
}
break;
case MacroActions.ADD_ACTION:
changedUserConfiguration.macros = state.macros.map((macro: Macro) => {
if (macro.id === action.payload.id) {