Fix 560 delete bind play macro action when macro delete (#576)

* fix(config): delete KeyAction binding of deleted macro

* refactor: use sorter import

* fix(macro): read the macro id from route params

* fix(keyAction): use NoneAction in keyAction mapping
This commit is contained in:
Róbert Kiss
2018-02-11 20:12:12 +01:00
committed by László Monda
parent e545c9d67b
commit 1a413c824e
5 changed files with 49 additions and 6 deletions

View File

@@ -13,5 +13,5 @@
</ng-template>
<div *ngIf="!macro" class="not-found">
There is no macro with id {{ route.params.select('id') | async }}.
There is no macro with id {{ macroId }}.
</div>

View File

@@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription';
import 'rxjs/add/operator/pluck';
import { MacroActions } from '../../../store/actions';
import { AppState } from '../../../store/index';
import { AppState } from '../../../store';
import { getMacro } from '../../../store/reducers/user-configuration';
@Component({
@@ -21,13 +21,17 @@ import { getMacro } from '../../../store/reducers/user-configuration';
export class MacroEditComponent implements OnDestroy {
macro: Macro;
isNew: boolean;
macroId: number;
private subscription: Subscription;
constructor(private store: Store<AppState>, public route: ActivatedRoute) {
this.subscription = route
.params
.pluck<{}, string>('id')
.switchMap((id: string) => store.let(getMacro(+id)))
.switchMap((id: string) => {
this.macroId = +id;
return store.let(getMacro(this.macroId));
})
.subscribe((macro: Macro) => {
this.macro = macro;
});

View File

@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/Observable';
import { Notification } from 'uhk-common';
import { AppState, getUndoableNotification } from '../../store/index';
import { AppState, getUndoableNotification } from '../../store';
import { DismissUndoNotificationAction, UndoLastAction } from '../../store/actions/app';
@Component({