From 7a6419195576fd500bf1e85e2a65e2f1d502efb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Kiss?= Date: Sun, 11 Feb 2018 20:44:08 +0100 Subject: [PATCH] fix(config): Save reset user configuration in web module (#574) --- packages/uhk-web/src/app/store/effects/device.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/uhk-web/src/app/store/effects/device.ts b/packages/uhk-web/src/app/store/effects/device.ts index 1d707134..986f07a2 100644 --- a/packages/uhk-web/src/app/store/effects/device.ts +++ b/packages/uhk-web/src/app/store/effects/device.ts @@ -35,10 +35,12 @@ import { ShowNotificationAction } from '../actions/app'; import { AppState } from '../index'; import { ActionTypes as UserConfigActions, + ApplyUserConfigurationFromFileAction, LoadConfigFromDeviceAction, LoadResetUserConfigurationAction } from '../actions/user-config'; import { DefaultUserConfigurationService } from '../../services/default-user-configuration.service'; +import { DataStorageRepositoryService } from '../../services/datastorage-repository.service'; @Injectable() export class DeviceEffects { @@ -162,8 +164,16 @@ export class DeviceEffects { }); @Effect() saveResetUserConfigurationToDevice$ = this.actions$ - .ofType(UserConfigActions.LOAD_RESET_USER_CONFIGURATION, UserConfigActions.APPLY_USER_CONFIGURATION_FROM_FILE) - .switchMap(() => Observable.of(new SaveConfigurationAction())); + .ofType( + UserConfigActions.LOAD_RESET_USER_CONFIGURATION, + UserConfigActions.APPLY_USER_CONFIGURATION_FROM_FILE) + .map(action => action.payload) + .switchMap((config: UserConfiguration) => { + this.dataStorageRepository.saveConfig(config); + + return Observable.of(new SaveConfigurationAction()); + }); @Effect({dispatch: false}) updateFirmware$ = this.actions$ .ofType(ActionTypes.UPDATE_FIRMWARE) @@ -193,6 +203,7 @@ export class DeviceEffects { private router: Router, private deviceRendererService: DeviceRendererService, private store: Store, + private dataStorageRepository: DataStorageRepositoryService, private defaultUserConfigurationService: DefaultUserConfigurationService) { }