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

fix(user-config): Validate device, keymap, and macro names (#543)

Browse Source 
* fix(user-config): Validate device, keymap, and macro names

* fix device name renaming
This commit is contained in:
Róbert Kiss
2018-01-03 21:06:08 +01:00
committed by László Monda
parent 13f064229f
commit bbce1e0e0f
8 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/uhk-web/src/app/store/index.ts
View File

@@ -39,9 +39,10 @@ export const metaReducers: MetaReducer<AppState>[] = environment.production
: [storeFreeze];
export const getUserConfiguration = (state: AppState) => state.userConfiguration;
export const getDeviceName = (state: AppState) => state.userConfiguration.deviceName;
export const getDeviceName = createSelector(getUserConfiguration, fromUserConfig.getDeviceName);
export const appState = (state: AppState) => state.app;
export const showAddonMenu = createSelector(appState, fromApp.showAddonMenu);
export const autoWriteUserConfiguration = createSelector(appState, fromApp.autoWriteUserConfiguration);
export const getUndoableNotification = createSelector(appState, fromApp.getUndoableNotification);

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

@@ -4,10 +4,11 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import 'rxjs/add/operator/map';
import { KeyAction, Keymap, KeyActionHelper, Layer, Macro, Module, SwitchLayerAction, UserConfiguration } from 'uhk-common';
import { KeyAction, KeyActionHelper, Keymap, Layer, Macro, Module, SwitchLayerAction, UserConfiguration } from 'uhk-common';
import { KeymapActions, MacroActions } from '../actions';
import { AppState } from '../index';
import { ActionTypes } from '../actions/user-config';
import { isValidName } from '../../util';
export const initialState: UserConfiguration = new UserConfiguration();
@@ -31,7 +32,11 @@ export function reducer(state = initialState, action: Action & { payload?: any }
break;
}
case KeymapActions.EDIT_NAME: {
const name: string = action.payload.name;
if (!isValidName(action.payload.name)) {
break;
}
const name: string = action.payload.name.trim();
const duplicate = state.keymaps.some((keymap: Keymap) => {
return keymap.name === name && keymap.abbreviation !== action.payload.abbr;
@@ -169,7 +174,11 @@ export function reducer(state = initialState, action: Action & { payload?: any }
break;
}
case MacroActions.EDIT_NAME: {
const name: string = action.payload.name;
if (!isValidName(action.payload.name)) {
break;
}
const name: string = action.payload.name.trim();
const duplicate = state.macros.some((macro: Macro) => {
return macro.id !== action.payload.id && macro.name === name;
@@ -242,7 +251,9 @@ export function reducer(state = initialState, action: Action & { payload?: any }
break;
case ActionTypes.RENAME_USER_CONFIGURATION: {
changedUserConfiguration.deviceName = action.payload;
if (isValidName(action.payload)) {
changedUserConfiguration.deviceName = action.payload.trim();
}
break;
}
@@ -399,3 +410,5 @@ function setKeyActionToLayer(newLayer: Layer, moduleIndex: number, keyIndex: num
newModule.keyActions = newModule.keyActions.slice();
newModule.keyActions[keyIndex] = newKeyAction;
}
export const getDeviceName = (state: UserConfiguration) => state.deviceName;