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

Fixed deletion change (#177)

Browse Source 
Closes #140 #194
This commit is contained in:
Nejc Zdovc
2016-11-30 09:04:28 +01:00
committed by József Farkas
parent 01214e58b5
commit f2ce7398d0
4 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/store/effects/keymap.ts
View File

@@ -5,6 +5,7 @@ import { Actions, Effect } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import 'rxjs/add/operator/do';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/withLatestFrom';
import { KeymapActions } from '../actions';

7
src/store/effects/macro.ts
View File

@@ -5,11 +5,12 @@ import { Actions, Effect } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import 'rxjs/add/operator/do';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/withLatestFrom';
import { Macro } from '../../config-serializer/config-items/Macro';
import { MacroActions } from '../actions';
import { KeymapActions, MacroActions } from '../actions';
import { AppState } from '../index';
@Injectable()
@@ -17,14 +18,16 @@ export class MacroEffects {
@Effect({dispatch: false}) remove$: any = this.actions$
.ofType(MacroActions.REMOVE)
.map(action => this.store.dispatch(KeymapActions.checkMacro(action.payload)))
.withLatestFrom(this.store)
.do((latest) => {
const state: AppState = latest[1];
const macro: Macro[] = state.macros.entities;
if (state.macros.entities.length === 0) {
this.router.navigate(['/macro/add']);
} else {
this.router.navigate(['/macro', '0']);
this.router.navigate(['/macro', macro[0].id]);
}
});