feat(notification): Add undoable notification, close #318 (#338)

* 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

Author: ert78gb

electron/src/app.module.ts

@@ -106,6 +106,7 @@ import { AppUpdateRendererService } from './services/app-update-renderer.service
 import { reducer } from './store';
 import { AutoUpdateSettings } from './shared/components/auto-update-settings/auto-update-settings';
 import { angularNotifierConfig } from './shared/models/angular-notifier-config';
+import { UndoableNotifierComponent } from './shared/components/undoable-notifier';
 import { UhkHeader } from './shared/components/uhk-header/uhk-header';
 import { AppRendererService } from './services/app-renderer.service';
 
@@ -166,6 +167,7 @@ import { AppRendererService } from './services/app-renderer.service';
         SafeStylePipe,
         UpdateAvailableComponent,
         AutoUpdateSettings,
+        UndoableNotifierComponent,
         UhkHeader
     ],
     imports: [

shared/src/components/macro/edit/macro-edit.component.html

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

shared/src/components/macro/not-found/macro-not-found.component.html

@@ -1,4 +1,8 @@
-<uhk-header></uhk-header>
-<div class="not-found">
-    You don't have any macros. Try to add one!
+<div class="container-fluid">
+    <uhk-header>
+        <h1>&nbsp;</h1>
+    </uhk-header>
+    <div class="not-found">
+        You don't have any macros. Try to add one!
+    </div>
 </div>

shared/src/components/uhk-header/uhk-header.html

@@ -1,3 +1,12 @@
 <div>
     <ng-content></ng-content>
 </div>
+<div class="row">
+    <div class="col-xs-12">
+        <undoable-notifier [notification]="undoableNotification$ | async"
+                           (close)="onDismissLastNotification()"
+                           (undo)="onUndoLastNotification($event)">
+        </undoable-notifier>
+    </div>
+</div>
+

shared/src/components/uhk-header/uhk-header.ts

@@ -1,9 +1,29 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs/Observable';
+
+import { Notification } from '../../models/notification';
+import { AppState, getUndoableNotification } from '../../store/index';
+import { DismissUndoNotificationAction, UndoLastAction } from '../../store/actions/app.action';
 
 @Component({
     selector: 'uhk-header',
     templateUrl: './uhk-header.html',
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class UhkHeader {
+    undoableNotification$: Observable<Notification>;
+
+    constructor(private store: Store<AppState>) {
+        this.undoableNotification$ = this.store.select(getUndoableNotification);
+    }
+
+    onUndoLastNotification(data: any): void {
+        this.store.dispatch(new UndoLastAction(data));
+    }
+
+    onDismissLastNotification(): void {
+        this.store.dispatch(new DismissUndoNotificationAction());
+    }
+
 }

shared/src/components/undoable-notifier/index.ts

@@ -0,0 +1 @@
+export * from './undoable-notifier.component';

shared/src/components/undoable-notifier/undoable-notifier.component.html

@@ -0,0 +1,12 @@
+<div class="pull-right">
+    <div class="alert alert-warning alert-dismissible" role="alert" [@slideInOut]="slideInOut">
+        <button type="button"
+                class="close"
+                aria-label="Close"
+                (click)="clickOnClose()">
+            <span aria-hidden="true">&times;</span>
+        </button>
+        {{text}}
+        <a *ngIf="undoable" (click)="clickOnUndo()" class="undo-button">Undo</a>
+    </div>
+</div>

shared/src/components/undoable-notifier/undoable-notifier.component.scss

@@ -0,0 +1,13 @@
+.alert {
+    padding: 5px 10px 5px 5px;
+
+    margin-bottom: 0.25em;
+    margin-top: -2em;
+
+    .close {
+        right: -5px;
+    }
+    .undo-button {
+        cursor: pointer;
+    }
+}

shared/src/components/undoable-notifier/undoable-notifier.component.ts

@@ -0,0 +1,52 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
+
+import { Notification } from '../../models/notification';
+
+@Component({
+    selector: 'undoable-notifier',
+    templateUrl: './undoable-notifier.component.html',
+    styleUrls: ['./undoable-notifier.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    animations: [
+        trigger('slideInOut', [
+            state('in', style({
+                transform: 'translate3d(0, 0, 0)'
+            })),
+            state('out', style({
+                transform: 'translate3d(200%, 0, 0)'
+            })),
+            transition('in => out', animate('400ms ease-in-out')),
+            transition('out => in', animate('400ms ease-in-out'))
+        ])
+    ]
+})
+export class UndoableNotifierComponent implements OnChanges {
+    text: string;
+    undoable: boolean;
+    @Input() notification: Notification;
+    @Output() close = new EventEmitter();
+    @Output() undo = new EventEmitter();
+
+    get slideInOut() {
+        return this.notification ? 'in' : 'out';
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['notification']) {
+            const not: Notification = changes['notification'].currentValue;
+            if (not) {
+                this.text = not.message;
+                this.undoable = !!not.extra;
+            }
+        }
+    }
+
+    clickOnClose(): void {
+        this.close.emit();
+    }
+
+    clickOnUndo(): void {
+        this.undo.emit(this.notification.extra);
+    }
+}

shared/src/models/notification.ts

@@ -1,14 +1,17 @@
+import { Action } from '@ngrx/store';
+
 export enum NotificationType {
-    Default,
-    Success,
-    Error,
-    Warning,
-    Info
+    Default = 'default',
+    Success = 'success',
+    Error = 'error',
+    Warning = 'warning',
+    Info = 'info',
+    Undoable = 'undoable'
 }
 
 export interface Notification {
     type: NotificationType;
     title?: string;
     message: string;
-    extra?: any;
+    extra?: Action;
 }