Merge branch 'QA'

package.json

@@ -48,11 +48,11 @@
     "custom-event-polyfill": "^0.3.0",
     "es6-promise": "^4.1.0",
     "html-to-element": "^1.0.0",
-    "node-uuid": "^1.4.8",
+    "uuid": "^3.0.1",
     "stylenames": "^1.1.5",
     "whatwg-fetch": "^2.0.3"
   },
   "optionalDependencies": {
-    "chayns-logger": "^2.5.1"
+    "chayns-logger": "^2.6.0"
   }
 }

src/index.js

@@ -4,7 +4,6 @@ import { getUrlParameters } from './utils/helper';
 import ConsoleLogger from './utils/console-logger';
 import './polyfill/index';
 import './tapp/custom-tapp-communication';
-import './json-call/json-call-functions';
 import './chayns-web';
 import './constants/system-url-parameter';
 import './window-objects';
@@ -19,6 +18,7 @@ logger.init({
     overrideOnError: true,
     throttleTime: 100,
     useDevServer: !isLIVE,
+    version: VERSION,
     middleware: (payload) => {
         if (payload.customText) {
             payload.data = {
@@ -53,16 +53,6 @@ logger.init({
     }
 });
 
-const defaults = {
-    version: VERSION
-};
-
-if (!isLIVE) {
-    defaults.env = process.env.NODE_ENV;
-}
-
-logger.setDefaults(defaults);
-
 const logLevelParameter = parseInt(getUrlParameters().loglevel, 10);
 
 if (!isNaN(logLevelParameter)) {

src/json-chayns-call/calls/add-chayns-call-error-listener.js

@@ -0,0 +1,3 @@
+export default function addChaynsCallErrorListener(req, res) {
+    req.addJsonCallEventListener(75);
+}

src/json-chayns-call/calls/close-window.js

@@ -0,0 +1,10 @@
+import { closeWindow as closeWindowCall } from '../../json-native-calls/calls/index';
+
+export default function closeWindow(req, res) {
+    closeWindowCall(req.value.data).then((retVal) => {
+        res.answer({
+            status: retVal.status.code,
+            data: retVal.data
+        });
+    });
+}

src/json-chayns-call/calls/dialogs/alert.js

@@ -0,0 +1,13 @@
+import Dialog from '../../../ui/dialog/dialog';
+
+export default function showAlert(req, res) {
+    if (!req.value || req.value.dialog === undefined) {
+        return res.event(2, 'Field dialog missing.');
+    }
+    if ((req.value.dialog.buttons || []).length === 0) {
+        return res.event(2, 'Field dialog.buttons missing.');
+    }
+
+    Dialog.show(Dialog.type.ALERT, req.value.dialog)
+        .then(buttonType => res.answer(buttonType));
+}