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

Add the whole user configuration to the AppState

Browse Source 
Closes #252
Fixes #219
This commit is contained in:
Farkas József
2017-02-07 23:43:34 +01:00
committed by József Farkas
parent e41a62be13
commit f1f8a8d64e
19 changed files with 374 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/src/components/keymap/edit/keymap-edit-guard.service.ts
View File

@@ -10,8 +10,9 @@ import 'rxjs/add/operator/switchMap';
import { Store } from '@ngrx/store';
import { Keymap } from './../../../config-serializer/config-items/Keymap';
import { AppState } from '../../../store/index';
import { getKeymapEntities } from '../../../store/reducers';
import { getKeymaps } from '../../../store/reducers/user-configuration';
@Injectable()
export class KeymapEditGuard implements CanActivate {
@@ -20,8 +21,8 @@ export class KeymapEditGuard implements CanActivate {
canActivate(): Observable<boolean> {
return this.store
.let(getKeymapEntities())
.do(keymaps => {
.let(getKeymaps())
.do((keymaps: Keymap[]) => {
const defaultKeymap = keymaps.find(keymap => keymap.isDefault);
this.router.navigate(['/keymap', defaultKeymap.abbreviation]);
})

4
shared/src/components/keymap/edit/keymap-edit.component.ts
View File

@@ -11,7 +11,7 @@ import { Observable } from 'rxjs/Observable';
import { Keymap } from '../../../config-serializer/config-items/Keymap';
import { AppState } from '../../../store';
import { getKeymap, getKeymapEntities } from '../../../store/reducers/keymap';
import { getKeymap, getKeymaps } from '../../../store/reducers/user-configuration';
@Component({
selector: 'keymap-edit',
@@ -37,7 +37,7 @@ export class KeymapEditComponent {
.publishReplay(1)
.refCount();
this.deletable$ = store.let(getKeymapEntities())
this.deletable$ = store.let(getKeymaps())
.map((keymaps: Keymap[]) => keymaps.length > 1);
}