diff --git a/src/app/common/interfaces/mainflux.interface.ts b/src/app/common/interfaces/mainflux.interface.ts
index b6b2a1b7..9a6eeba4 100644
--- a/src/app/common/interfaces/mainflux.interface.ts
+++ b/src/app/common/interfaces/mainflux.interface.ts
@@ -97,6 +97,7 @@ export interface MsgFilters {
publisher?: string;
subtopic?: string;
name?: string;
+ format?: string;
v?: string;
vs?: string;
vd?: string;
diff --git a/src/app/shared/components/message-monitor/message-monitor.component.html b/src/app/shared/components/message-monitor/message-monitor.component.html
index 14168808..8d9b785d 100644
--- a/src/app/shared/components/message-monitor/message-monitor.component.html
+++ b/src/app/shared/components/message-monitor/message-monitor.component.html
@@ -92,13 +92,23 @@
Value:
-
+
+ [(ngModel)]='value'>
+
+
+
+ {{type}}
+
+
+
+
diff --git a/src/app/shared/components/message-monitor/message-monitor.component.ts b/src/app/shared/components/message-monitor/message-monitor.component.ts
index 82f530f0..f95ececf 100644
--- a/src/app/shared/components/message-monitor/message-monitor.component.ts
+++ b/src/app/shared/components/message-monitor/message-monitor.component.ts
@@ -18,9 +18,11 @@ export class MessageMonitorComponent implements OnInit, OnChanges, OnDestroy {
mode: string = 'json';
modes: string[] = ['json', 'table', 'chart'];
- httpAdaptType: string = 'float';
- httpAdaptVal: any;
- httpAdaptTypes: string[] = ['float', 'bool', 'string', 'data'];
+ value: any;
+ valueType: string = 'float';
+ valueTypes: string[] = ['float', 'bool', 'string', 'data'];
+ format: string = 'senml';
+ formats: string[] = ['senml', 'json'];
msgDatasets: Dataset[] = [];
@@ -29,6 +31,7 @@ export class MessageMonitorComponent implements OnInit, OnChanges, OnDestroy {
limit: 20,
publisher: '',
subtopic: '',
+ format: '',
name: '',
from: 0,
to: 0,
@@ -87,18 +90,27 @@ export class MessageMonitorComponent implements OnInit, OnChanges, OnDestroy {
return;
}
- switch (this.httpAdaptType) {
+ switch (this.valueType) {
case 'string':
- this.filters.vs = this.httpAdaptVal;
+ this.filters.vs = this.value;
break;
case 'data':
- this.filters.vd = this.httpAdaptVal;
+ this.filters.vd = this.value;
break;
case 'bool':
- this.filters.vb = this.httpAdaptVal;
+ this.filters.vb = this.value;
break;
case 'float':
- this.filters.v = this.httpAdaptVal;
+ this.filters.v = this.value;
+ break;
+ }
+
+ switch (this.format) {
+ case 'senml':
+ this.filters.format = 'messages';
+ break;
+ case 'json':
+ this.filters.format = this.format;
break;
}