From c407ce1e96d48005a2d4c7338ac072baaf63f537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Thu, 31 May 2018 12:24:34 +0200
Subject: [PATCH] Refactor Messages API with new types and conventions

---
 ....control.command.ts => messages.control.command.ts} |  5 ++---
 src/app/messages/messages.component.ts                 | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename src/app/message.types/{message.control.command.ts => messages.control.command.ts} (53%)

diff --git a/src/app/message.types/message.control.command.ts b/src/app/message.types/messages.control.command.ts
similarity index 53%
rename from src/app/message.types/message.control.command.ts
rename to src/app/message.types/messages.control.command.ts
index ac2a99c..3427501 100644
--- a/src/app/message.types/message.control.command.ts
+++ b/src/app/message.types/messages.control.command.ts
@@ -2,7 +2,6 @@
 // All Rights Reserved. See LICENSE file for details.
 
 import { CommandMessage } from './command.message';
+import { SetValueCommand } from './set.value.command';
 
-export interface MessageControlCommand extends CommandMessage {
-  next_visibility?: boolean;
-}
+export interface MessagesControlCommand extends CommandMessage, SetValueCommand<boolean> {}
diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts
index 59b4746..55e1813 100644
--- a/src/app/messages/messages.component.ts
+++ b/src/app/messages/messages.component.ts
@@ -6,7 +6,7 @@ import { MarkdownService } from '../services/markdown.service';
 import { WebSocketService } from '../services/websocket.service';
 
 import { MessagesMessage } from '../message.types/messages.message';
-import { MessageControlCommand } from '../message.types/message.control.command';
+import { MessagesControlCommand } from '../message.types/messages.control.command';
 import { config } from '../config';
 import { CommandMessage } from '../message.types/command.message';
 
@@ -18,7 +18,9 @@ import { CommandMessage } from '../message.types/command.message';
 export class MessagesComponent implements OnInit {
   messages: MessagesMessage[] = [];
   showNextButton: boolean = config.messages.showNextButton;
-  command_handlers = {'showbutton': this.showButtonHandler.bind(this)};
+  command_handlers = {
+    'showNextButton': this.showButtonHandler.bind(this)
+  };
 
   constructor(
     private markdownService: MarkdownService,
@@ -44,8 +46,8 @@ export class MessagesComponent implements OnInit {
     return this.markdownService.convertToHtml(text);
   }
 
-  showButtonHandler(data: MessageControlCommand) {
-    this.showNextButton = data.next_visibility;
+  showButtonHandler(data: MessagesControlCommand) {
+    this.showNextButton = data.value;
   }
 
   stepFSM() {