@agilemotion/oui-react-js 1.3.8 → 1.4.0

package/dist/DynamicJS.js

@@ -5,22 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.TEMPLATE_REGEX = void 0;
 
-var _ApplicationContext = _interopRequireWildcard(require("./ApplicationContext"));
+var _ApplicationManager = _interopRequireWildcard(require("./ApplicationManager"));
 
 var _Utils = _interopRequireDefault(require("./Utils"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const TEMPLATE_REGEX = new RegExp('[@]{1}([#@]{1}{)(([a-zA-Z0-9_.[\\]]*)+){1}}((\\(([^)]*)\\))*)', 'g');
@@ -28,36 +22,31 @@ exports.TEMPLATE_REGEX = TEMPLATE_REGEX;
 
 class DynamicJS {
   constructor() {
+    _defineProperty(this, "removeKey", (k = "", {
+      [k]: _,
+      ...o
+    } = {}) => o);
+
+    _defineProperty(this, "removeKeys", (keys = [], o = {}) => o ? keys.reduce((r, k) => this.removeKey(k, r), o) : null);
+
     _defineProperty(this, "evaluateExpression", expression => {
-      return _ApplicationContext.default.resolveExpressionValue(expression);
+      return _ApplicationManager.default.resolveExpressionValue(expression);
     });
 
     _defineProperty(this, "parseScript", (script, componentId, isScriptlet) => {
-      let parsedScript = script.replace(/#this/g, '#' + componentId).replace(/isNull/g, 'this.isNull').replace(/\$application/g, _ApplicationContext.APP_VARIABLE).replace(/isEmpty/g, 'this.isEmpty');
+      let parsedScript = script.replace(/#this/g, '#' + componentId).replace(/isNull/g, 'this.isNull').replace(/removeKeys/g, 'this.removeKeys').replace(/\$application/g, '@#{' + _ApplicationManager.APP_VARIABLE + "}").replace(/isEmpty/g, 'this.isEmpty');
       let matches = parsedScript.match(TEMPLATE_REGEX);
 
       if (!_Utils.default.isNull(matches)) {
         let expressions = [];
 
-        var _iterator = _createForOfIteratorHelper(matches),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            const match = _step.value;
-
-            if (!expressions.includes(match.trim())) {
-              expressions.push(match.trim());
-            }
+        for (const match of matches) {
+          if (!expressions.includes(match.trim())) {
+            expressions.push(match.trim());
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
 
-        for (var _i = 0, _expressions = expressions; _i < _expressions.length; _i++) {
-          const expression = _expressions[_i];
+        for (const expression of expressions) {
           var replaceRegex = new RegExp("".concat(expression), 'g');
           parsedScript = parsedScript.replace(replaceRegex, "this.evaluateExpression(\"".concat(expression, "\")"));
         }
@@ -85,9 +74,8 @@ class DynamicJS {
           return result;
         }
       } catch (e) {
-        console.error("Error Executing script : " + name + " - " + parsedScript);
         console.error(e);
-        throw e;
+        throw new Error("Error Executing script : " + parsedScript + " - " + e.message);
       }
 
       return null;
@@ -96,18 +84,12 @@ class DynamicJS {
     _defineProperty(this, "executeScriptObject", (name, script, componentId = null, valuesMap = {}, event = null) => {
       let scriptBody = '';
 
-      var _iterator2 = _createForOfIteratorHelper(script.lines),
-          _step2;
+      for (const line of script.lines) {
+        scriptBody += this.parseScriptLine(line, valuesMap);
 
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          const line = _step2.value;
-          scriptBody += this.parseScriptLine(line, valuesMap);
+        if (!line.endsWith(";")) {
+          scriptBody += ";";
         }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
       }
 
       return this.executeScript(name, scriptBody, componentId, false, event);
@@ -138,20 +120,10 @@ class DynamicJS {
     if (!_Utils.default.isNull(valuesMap)) {
       const properties = Object.getOwnPropertyNames(valuesMap);
 
-      var _iterator3 = _createForOfIteratorHelper(properties),
-          _step3;
-
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          const property = _step3.value;
-          var replaceRegex = new RegExp("@{".concat(property, "}"), 'g');
-          let propertyValue = valuesMap[property];
-          parsedLine = parsedLine.replace(replaceRegex, propertyValue);
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+      for (const property of properties) {
+        var replaceRegex = new RegExp("@{".concat(property, "}"), 'g');
+        let propertyValue = valuesMap[property];
+        parsedLine = parsedLine.replace(replaceRegex, propertyValue);
       }
     }
 

package/dist/RestUtils.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.invokeRest = exports.invokeRpc = exports.download = exports.sendRequest = exports.postData = void 0;
+exports.invokeRest = exports.invokeRpc = exports.download = exports.sendRequest = exports.postData = exports.location = void 0;
 
 var _Utils = _interopRequireDefault(require("./Utils"));
 
 var _reactPromiseTracker = require("react-promise-tracker");
 
-var _ApplicationContext = _interopRequireDefault(require("./ApplicationContext"));
+var _ApplicationManager = _interopRequireDefault(require("./ApplicationManager"));
 
 var _Event = _interopRequireDefault(require("./event/Event"));
 
@@ -19,13 +19,8 @@ var _EventType = _interopRequireDefault(require("./event/EventType"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-const location = window.location.protocol + "//" + window.location.hostname;
+const location = window.location.protocol + '//' + window.location.hostname;
+exports.location = location;
 
 const status = response => {
   if (response.ok) {
@@ -51,85 +46,75 @@ class RestUtils {
   }
 
   invokeRest(service, component, viewId, successCallback, errorCallback, invalidParamCallback, returnValueBinding, successMessage, event = null) {
-    let url = service.url.startsWith('http://') || service.url.startsWith('https://') ? service.url : location + "".concat(_ApplicationContext.default.getContextRoot() + service.url);
+    let url = service.url.startsWith('http://') || service.url.startsWith('https://') ? service.url : location + "".concat(_ApplicationManager.default.getContextRoot() + service.url);
     let requestBody = null;
 
     if (!_Utils.default.isNull(service.parameters)) {
-      let queryString = "";
-      let pathParameters = "";
+      let queryString = '';
+      let pathParameters = '';
       let requestBodyParamFound = false;
 
-      var _iterator = _createForOfIteratorHelper(service.parameters),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          const parameter = _step.value;
-
-          let parameterValue = _ApplicationContext.default.resolveParameterValue(parameter, event ? event.data : null);
+      for (const parameter of service.parameters) {
+        let parameterValue = _ApplicationManager.default.resolveParameterValue(parameter, event ? event.data : null);
 
-          if (!_Utils.default.isNull(parameter.validator) && !_Utils.default.evaluateBooleanExpression(parameter.validator.nullable, parameter.name) && this.isParamValueNull(parameterValue)) {
-            if (!_Utils.default.isNull(invalidParamCallback)) {
-              invalidParamCallback(parameter);
-            }
-
-            return;
+        if (!_Utils.default.isNull(parameter.validator) && !_Utils.default.evaluateBooleanExpression(parameter.validator.nullable, parameter.name) && this.isParamValueNull(parameterValue)) {
+          if (!_Utils.default.isNull(invalidParamCallback)) {
+            console.error('INVALID PARAMETER : ', parameter);
+            invalidParamCallback(parameter);
           }
 
-          let httpParameterType = parameter.httpParameterType;
+          return;
+        }
 
-          if (_Utils.default.isNull(httpParameterType)) {
-            httpParameterType = 'REQUEST_PARAMETER';
-          }
+        let httpParameterType = parameter.httpParameterType;
 
-          if (httpParameterType === 'REQUEST_PARAMETER') {
-            if (!_Utils.default.isNull(parameterValue)) {
-              if (queryString.length > 0) {
-                queryString += '&';
-              }
+        if (_Utils.default.isNull(httpParameterType)) {
+          httpParameterType = 'QUERY_PARAMETER';
+        }
 
-              if (!_Utils.default.isNull(service.includeParameterTypes) && service.includeParameterTypes === true) {
-                queryString += parameterValue.type + ":";
-              }
+        if (httpParameterType === 'QUERY_PARAMETER') {
+          if (!_Utils.default.isNull(parameterValue)) {
+            if (queryString.length > 0) {
+              queryString += '&';
+            }
 
-              if (parameterValue.type === 'MapObject') {
-                parameterValue.value.type = 'MapEntityDto';
-              }
+            if (!_Utils.default.isNull(service.includeParameterTypes) && service.includeParameterTypes === true) {
+              queryString += parameterValue.type + ':';
+            }
 
-              queryString += parameter.name + "=";
-              queryString += typeof parameterValue.value === 'string' || typeof parameterValue.value === 'number' ? parameterValue.value : JSON.stringify(parameterValue.value);
+            if (parameterValue.type === 'MapObject') {
+              parameterValue.value.type = 'MapEntityDto';
             }
+
+            queryString += parameter.name + '=';
+            queryString += typeof parameterValue.value === 'string' || typeof parameterValue.value === 'number' ? parameterValue.value : JSON.stringify(parameterValue.value);
           }
+        }
 
-          if (httpParameterType === 'PATH_VARIABLE') {
-            if (!_Utils.default.isNull(parameterValue)) {
-              pathParameters += '/' + (typeof parameterValue.value === 'object' ? JSON.stringify(parameterValue.value) : parameterValue.instanceType === 'TypedValue' ? parameterValue.value : parameterValue);
-            }
+        if (httpParameterType === 'PATH_VARIABLE') {
+          if (!_Utils.default.isNull(parameterValue)) {
+            pathParameters += '/' + (typeof parameterValue.value === 'object' ? JSON.stringify(parameterValue.value) : parameterValue.instanceType === 'TypedValue' ? parameterValue.value : parameterValue);
           }
+        }
+
+        if (httpParameterType === 'REQUEST_BODY') {
+          if (requestBodyParamFound) {
+            console.error('Only one request body is permitted');
+            return;
+          } else {
+            if (!this.isParamValueNull(parameterValue)) {
+              requestBody = parameterValue.instanceType === 'TypedValue' ? parameterValue.value : parameterValue;
 
-          if (httpParameterType === 'REQUEST_BODY') {
-            if (requestBodyParamFound) {
-              console.error("Only one request body is permitted");
-              return;
-            } else {
-              if (!this.isParamValueNull(parameterValue)) {
-                requestBody = parameterValue.instanceType === 'TypedValue' ? parameterValue.value : parameterValue;
-
-                if (parameterValue.type === 'MapObject') {
-                  requestBody.type = 'MapEntityDto';
-                } else {
-                  if (typeof requestBody === 'object') {
-                    requestBody.type = parameterValue.type;
-                  }
+              if (parameterValue.type === 'MapObject') {
+                requestBody.type = 'MapEntityDto';
+              } else {
+                if (typeof requestBody === 'object') {
+                  requestBody.type = parameterValue.type;
                 }
               }
             }
           }
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
 
       if (pathParameters.length > 0) {
@@ -150,15 +135,13 @@ class RestUtils {
     }
 
     if (requestBody !== null && service.method === 'GET') {
-      console.error("A request body parameter cannot be specified for a GET request");
-      return;
+      throw new Error('A request body parameter cannot be specified for a GET request');
     }
 
     if (requestBody !== null || service.method === 'POST') {
+      console.log("POSTING REST REQUEST BODY : ", requestBody);
       postData(url, response => {
-        let responseData = !_Utils.default.isNull(response) ? response.data : null;
-
-        if (!_Utils.default.isNull(responseData) && response.dataType === 'message' && responseData.messageType === "ERROR") {
+        if (!_Utils.default.isNull(response) && response.dataType === 'message' && response.messageType === 'ERROR') {
           this.fireEvent(viewId, component, _EventType.default.SERVICE_CALL_FAILURE);
         } else {
           if (!_Utils.default.isNull(successCallback)) {
@@ -179,8 +162,8 @@ class RestUtils {
         }
 
         this.fireEvent(viewId, component, _EventType.default.SERVICE_CALL_FAILURE);
-      }, !service.url.startsWith("http://"), requestBody);
-    } else if (contentType === "application/pdf" || contentType === "application/vnd.ms-excel") {
+      }, !service.url.startsWith('http://'), requestBody);
+    } else if (contentType === 'application/pdf' || contentType === 'application/vnd.ms-excel') {
       download(url, data => {}, e => {
         if (!_Utils.default.isNull(errorCallback)) {
           errorCallback(e);
@@ -205,15 +188,17 @@ class RestUtils {
         if (!_Utils.default.isNull(errorCallback)) {
           errorCallback(e);
         }
-      }, !service.url.startsWith("http://"));
+      }, !service.url.startsWith('http://'));
     }
   }
 
   invokeRpc(rpcDetails, component, viewId, successCallback, errorCallback, invalidParamCallback, returnValueBinding, successMessage, event = null) {
     let request = {};
     request.id = viewId;
-    request.service = rpcDetails.serviceId;
+    let split = rpcDetails.serviceId.split('.');
+    request.service = split[1];
     request.method = rpcDetails.procedureName;
+    let module = split[0].toLowerCase();
 
     if (!_Utils.default.isNull(rpcDetails.parameters) && rpcDetails.parameters.length > 0) {
       request.parameters = [];
@@ -224,7 +209,7 @@ class RestUtils {
         parameter.name = parameterConfig.name;
         parameter.index = parameterConfig.index;
 
-        let val = _ApplicationContext.default.resolveParameterValue(parameterConfig, event ? event.data : null);
+        let val = _ApplicationManager.default.resolveParameterValue(parameterConfig, event ? event.data : null);
 
         if (!_Utils.default.isNull(val)) {
           parameter.value = val.value; // TODO : Make the default object type a library setting
@@ -236,7 +221,7 @@ class RestUtils {
           }
         }
 
-        if (typeof parameter.value === "undefined") {
+        if (typeof parameter.value === 'undefined') {
           parameter.value = null;
         }
 
@@ -246,6 +231,7 @@ class RestUtils {
 
         if (!_Utils.default.isNull(parameterConfig.validator) && _Utils.default.evaluateBooleanExpression(parameterConfig.validator.nullable, parameterConfig.name) === false && this.isParamValueNull(parameter)) {
           if (!_Utils.default.isNull(invalidParamCallback)) {
+            console.error('INVALID PARAMETER : ', parameter);
             invalidParamCallback(parameter);
           }
 
@@ -256,11 +242,7 @@ class RestUtils {
       }
     }
 
-    this.doFetch(location + _ApplicationContext.default.getBaseApiUrl() + _ApplicationContext.default.getServiceApiPath() + '/invoke', response => {
-      if (successCallback !== null) {
-        successCallback(response);
-      }
-
+    this.doFetch(location + _ApplicationManager.default.getContextRoot() + '/' + module + '/api/v1/rpc/invoke', response => {
       if (!_Utils.default.isNull(viewId) && !_Utils.default.isNull(component)) {
         let path = _Utils.default.getPropertyChainPath(returnValueBinding);
 
@@ -270,10 +252,18 @@ class RestUtils {
 
         let responseData = !_Utils.default.isNull(response) ? response.data : null;
 
-        if (!_Utils.default.isNull(responseData) && response.dataType === 'message' && responseData.messageType === "ERROR") {
-          this.fireEvent(viewId, component, _EventType.default.SERVICE_CALL_FAILURE);
+        if (!_Utils.default.isNull(responseData) && response.dataType === 'message' && responseData.messageType === 'ERROR') {
+          this.fireEvent(viewId, component, _EventType.default.SERVICE_CALL_FAILURE, responseData);
+
+          if (errorCallback !== null) {
+            errorCallback(response);
+          }
         } else {
           this.fireEvent(viewId, component, _EventType.default.SERVICE_CALL_SUCCESS, response.data);
+
+          if (successCallback !== null) {
+            successCallback(response);
+          }
         }
       }
     }, e => {
@@ -296,28 +286,8 @@ class RestUtils {
   }
 
   fetchWithCustomConfig(url, successCallback, errorCallback, secure, config, method, download, body, serviceType, viewId, successMessage, track) {
-    const accessToken = sessionStorage.getItem("accessToken");
-    const idToken = sessionStorage.getItem("idToken");
-    /*let data = null;
-    if(serviceType === 'rest') {
-        data = JSON.stringify(body);
-    } else {
-        if (!Utils.isNull(body)) {
-            data = new FormData();
-            const json = JSON.stringify(body);
-             data.append("requestDto", json);
-            let currentView = applicationContext.getCurrentView();
-            if (!Utils.isNull(currentView)) {
-                let domainCache = applicationContext.getFileDomainCache(currentView.config.id);
-                if (!Utils.isNull(domainCache)) {
-                    for (const file of domainCache.files) {
-                        data.append(file.correlationId, file.content);
-                    }
-                }
-            }
-        }
-    }*/
-
+    const accessToken = sessionStorage.getItem('accessToken');
+    const idToken = sessionStorage.getItem('idToken');
     let data = body ? JSON.stringify(body) : null;
     let fetchConfig = config;
 
@@ -351,13 +321,15 @@ class RestUtils {
 
     if (download) {
       if (url.indexOf('?') < 0) {
-        url += "?";
+        url += '?';
       } else {
-        url += "&";
+        url += '&';
       }
 
       url += 'access_token=' + accessToken;
       url += '&idToken=' + idToken;
+      url += '&themePrimaryColor=' + encodeURIComponent(_ApplicationManager.default.getApplicationPrimaryColor());
+      url += '&themeSecondaryColor=' + encodeURIComponent(_ApplicationManager.default.getApplicationSecondaryColor());
       window.open(encodeURI(url), '_blank');
     } else {
       if (_Utils.default.isNull(track) || track === true) {
@@ -374,12 +346,12 @@ class RestUtils {
     }).catch(e => {
       console.error(e);
 
-      if (e.code === 401 && !url.endsWith("/logout")) {
+      if (e.code === 401 && !url.endsWith('/logout')) {
         errorCallback(e);
 
-        _ApplicationContext.default.clear();
+        _ApplicationManager.default.clear();
 
-        _ApplicationContext.default.getApplicationHistory().push('/login');
+        _ApplicationManager.default.navigate('/login');
       }
 
       if (errorCallback !== null) {
@@ -391,7 +363,9 @@ class RestUtils {
   processSuccessfulResponseData(component, data, successCallback, viewId, successMessage) {
     let response;
 
-    if (typeof data === "object" || _Utils.default.isNull(data) || data.toString().trim().length === 0) {
+    if (!_Utils.default.isNull(data) && data.toString().trim().length === 0) {
+      response = null;
+    } else if (typeof data === 'object' || _Utils.default.isNull(data) || data.toString().trim().length === 0) {
       response = data;
     } else {
       try {
@@ -402,10 +376,10 @@ class RestUtils {
     }
 
     if (successCallback !== null) {
-      let responseData = !_Utils.default.isNull(response) ? response.data : null;
+      let responseData = response ? response.data : null;
 
-      if (!_Utils.default.isNull(responseData) && response.dataType === 'message') {
-        let event = new _Event.default(_ApplicationContext.default, viewId, responseData);
+      if (response && responseData && response.dataType === 'message') {
+        let event = new _Event.default(_ApplicationManager.default, viewId, responseData);
 
         _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);
 
@@ -417,9 +391,9 @@ class RestUtils {
       } else if (!_Utils.default.isNull(successMessage)) {
         let message = {
           messageType: 'SUCCESS',
-          message: _ApplicationContext.default.populateTemplate(successMessage, response.data)
+          message: _ApplicationManager.default.populateTemplate(successMessage, response ? response.data : null)
         };
-        let event = new _Event.default(_ApplicationContext.default, viewId, message);
+        let event = new _Event.default(_ApplicationManager.default, viewId, message);
 
         _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);