* feat(notification): Add undoable notification * feat(notification): Add undoable notification * feat(notification): Use uhk-header to the notification * half ready solution * - fix: "Keymap has been deleted" is displayed for macros. - When a keymap/macro deletion gets undone, please set the route of the restored keymap/macro. - When the user switches to another route, please make the undo notification disappear. * fix(keymap): Store prev user configuration in the application reducer Store the previous state in application reducer, because refactoring the user-config reducer is not easy * feat(keymap): Fix review request
106 lines
4.6 KiB
TypeScript
106 lines
4.6 KiB
TypeScript
import { Inject, Injectable } from '@angular/core';
|
|
import { go } from '@ngrx/router-store';
|
|
import { Actions, Effect, toPayload } from '@ngrx/effects';
|
|
import { Observable } from 'rxjs/Observable';
|
|
import { Action, Store } from '@ngrx/store';
|
|
|
|
import 'rxjs/add/operator/map';
|
|
import 'rxjs/add/operator/switchMap';
|
|
import 'rxjs/add/operator/startWith';
|
|
import 'rxjs/add/operator/withLatestFrom';
|
|
import 'rxjs/add/operator/mergeMap';
|
|
import 'rxjs/add/observable/of';
|
|
|
|
import {
|
|
ActionTypes,
|
|
LoadUserConfigAction,
|
|
LoadUserConfigSuccessAction,
|
|
SaveUserConfigSuccessAction
|
|
} from '../actions/user-config';
|
|
|
|
import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
|
|
import { DATA_STORAGE_REPOSITORY, DataStorageRepositoryService } from '../../services/datastorage-repository.service';
|
|
import { DefaultUserConfigurationService } from '../../services/default-user-configuration.service';
|
|
import { AppState, getPrevUserConfiguration, getUserConfiguration } from '../index';
|
|
import { KeymapActions } from '../actions/keymap';
|
|
import { MacroActions } from '../actions/macro';
|
|
import { DismissUndoNotificationAction, ShowNotificationAction } from '../actions/app.action';
|
|
import { NotificationType } from '../../models/notification';
|
|
import { UndoUserConfigData } from '../../models/undo-user-config-data';
|
|
|
|
@Injectable()
|
|
export class UserConfigEffects {
|
|
|
|
@Effect() loadUserConfig$: Observable<Action> = this.actions$
|
|
.ofType(ActionTypes.LOAD_USER_CONFIG)
|
|
.startWith(new LoadUserConfigAction())
|
|
.switchMap(() => Observable.of(new LoadUserConfigSuccessAction(this.getUserConfiguration())));
|
|
|
|
@Effect() saveUserConfig$: Observable<Action> = this.actions$
|
|
.ofType(
|
|
KeymapActions.ADD, KeymapActions.DUPLICATE, KeymapActions.EDIT_NAME, KeymapActions.EDIT_ABBR,
|
|
KeymapActions.SET_DEFAULT, KeymapActions.REMOVE, KeymapActions.SAVE_KEY,
|
|
MacroActions.ADD, MacroActions.DUPLICATE, MacroActions.EDIT_NAME, MacroActions.REMOVE, MacroActions.ADD_ACTION,
|
|
MacroActions.SAVE_ACTION, MacroActions.DELETE_ACTION, MacroActions.REORDER_ACTION)
|
|
.withLatestFrom(this.store.select(getUserConfiguration), this.store.select(getPrevUserConfiguration))
|
|
.mergeMap(([action, config, prevUserConfiguration]) => {
|
|
this.dataStorageRepository.saveConfig(config);
|
|
|
|
if (action.type === KeymapActions.REMOVE || action.type === MacroActions.REMOVE) {
|
|
const text = action.type === KeymapActions.REMOVE ? 'Keymap' : 'Macro';
|
|
const pathPrefix = action.type === KeymapActions.REMOVE ? 'keymap' : 'macro';
|
|
const payload: UndoUserConfigData = {
|
|
path: `/${pathPrefix}/${action.payload}`,
|
|
config: prevUserConfiguration.toJsonObject()
|
|
};
|
|
|
|
return [
|
|
new SaveUserConfigSuccessAction(config),
|
|
new ShowNotificationAction({
|
|
type: NotificationType.Undoable,
|
|
message: `${text} has been deleted`,
|
|
extra: {
|
|
payload,
|
|
type: KeymapActions.UNDO_LAST_ACTION
|
|
}
|
|
})
|
|
];
|
|
}
|
|
|
|
return [new SaveUserConfigSuccessAction(config), new DismissUndoNotificationAction()];
|
|
});
|
|
|
|
@Effect() undoUserConfig$: Observable<Action> = this.actions$
|
|
.ofType(KeymapActions.UNDO_LAST_ACTION)
|
|
.map(toPayload)
|
|
.mergeMap((payload: UndoUserConfigData) => {
|
|
const config = new UserConfiguration().fromJsonObject(payload.config);
|
|
this.dataStorageRepository.saveConfig(config);
|
|
return [new LoadUserConfigSuccessAction(config), go(payload.path)];
|
|
});
|
|
|
|
constructor(private actions$: Actions,
|
|
@Inject(DATA_STORAGE_REPOSITORY) private dataStorageRepository: DataStorageRepositoryService,
|
|
private store: Store<AppState>,
|
|
private defaultUserConfigurationService: DefaultUserConfigurationService) {
|
|
}
|
|
|
|
private getUserConfiguration() {
|
|
const configJsonObject = this.dataStorageRepository.getConfig();
|
|
let config: UserConfiguration;
|
|
|
|
if (configJsonObject) {
|
|
if (configJsonObject.dataModelVersion === this.defaultUserConfigurationService.getDefault().dataModelVersion) {
|
|
config = new UserConfiguration().fromJsonObject(configJsonObject);
|
|
}
|
|
}
|
|
|
|
if (!config) {
|
|
config = this.defaultUserConfigurationService.getDefault();
|
|
}
|
|
|
|
return config;
|
|
|
|
}
|
|
}
|