@agilemotion/oui-react-js 1.6.4 → 1.6.6

package/dist/BasicApp.js

@@ -4,37 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 require("./BasicApp.css");
-
 var _themeDefault = _interopRequireDefault(require("./theme-default"));
-
 var _MuiThemeProvider = _interopRequireDefault(require("material-ui/styles/MuiThemeProvider"));
-
 var _reactRouterDom = require("react-router-dom");
-
 var _LoginBasic = _interopRequireDefault(require("./view/security/LoginBasic"));
-
 var _ForgotPasswordBasic = _interopRequireDefault(require("./view/security/ForgotPasswordBasic"));
-
 var _ResetPasswordBasic = _interopRequireDefault(require("./view/security/ResetPasswordBasic"));
-
 var _ChangePasswordBasic = _interopRequireDefault(require("./view/security/ChangePasswordBasic"));
-
 var _core = require("@material-ui/core");
-
 var _ThemeProvider = _interopRequireDefault(require("@material-ui/styles/ThemeProvider"));
-
 var _ViewContainer = _interopRequireDefault(require("./components/layout/ViewContainer"));
-
 var _Dashboard = _interopRequireDefault(require("./view/Dashboard"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var location = window.location.protocol + "//" + window.location.hostname;
-var agilityTheme = (0, _core.createMuiTheme)({
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const location = window.location.protocol + "//" + window.location.hostname;
+const agilityTheme = (0, _core.createMuiTheme)({
   palette: {
     primary: {
       main: '#015588'
@@ -47,16 +32,15 @@ var agilityTheme = (0, _core.createMuiTheme)({
     }
   }
 });
-
-var BasicApp = function BasicApp(props) {
-  var navigate = (0, _reactRouterDom.useNavigate)();
-
-  _react.default.useEffect(function () {
+const BasicApp = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
+  _react.default.useEffect(() => {
+    console.log('PATH : ' + window.location.pathname);
     if (window.location.pathname !== '/reset-password' && window.location.pathname !== '/login' && window.location.pathname !== '/forgot-password' && window.location.pathname !== '/change-password') {
+      console.log('NAVIGATING TO HOME');
       navigate("/");
     }
   }, []);
-
   return /*#__PURE__*/_react.default.createElement(_MuiThemeProvider.default, {
     muiTheme: _themeDefault.default
   }, /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
@@ -127,6 +111,4 @@ var BasicApp = function BasicApp(props) {
     })
   }))));
 };
-
-var _default = BasicApp;
-exports.default = _default;
+var _default = exports.default = BasicApp;

package/dist/BasicAppHome.js

@@ -1,155 +1,83 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _reactRouterDom = require("react-router-dom");
-
 var _LoadingIndicator = _interopRequireDefault(require("./components/LoadingIndicator"));
-
 var _FoldingSideTabDashboard = _interopRequireDefault(require("./components/dashboard/FoldingSideTabDashboard"));
-
 var _ApplicationManager = _interopRequireWildcard(require("./ApplicationManager"));
-
 var _TokenManager = _interopRequireDefault(require("./security/TokenManager"));
-
 var _Utils = _interopRequireDefault(require("./Utils"));
-
 var _core = require("@material-ui/core");
-
 var _ThemeProvider = _interopRequireDefault(require("@material-ui/styles/ThemeProvider"));
-
 var _RestUtils = require("./RestUtils");
-
 var _SocketManager = _interopRequireDefault(require("./components/SocketManager"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-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 _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var location = window.location.protocol + "//" + window.location.hostname;
-
-var BasicAppHome = function BasicAppHome(props) {
-  var navigate = (0, _reactRouterDom.useNavigate)();
-
-  var _React$useState = _react.default.useState(),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      dashboardSettings = _React$useState2[0],
-      setDashboardSettings = _React$useState2[1];
-
-  var _React$useState3 = _react.default.useState(null),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      loadingColor = _React$useState4[0],
-      setLoadingColor = _React$useState4[1];
-
-  var _React$useState5 = _react.default.useState(false),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      open = _React$useState6[0],
-      setOpen = _React$useState6[1];
-
-  var _React$useState7 = _react.default.useState(location + props.contextRoot + props.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken")),
-      _React$useState8 = _slicedToArray(_React$useState7, 2),
-      avatarUrl = _React$useState8[0],
-      setAvatarUrl = _React$useState8[1];
-
-  var _React$useState9 = _react.default.useState(false),
-      _React$useState10 = _slicedToArray(_React$useState9, 2),
-      tokenRefreshMonitorStarted = _React$useState10[0],
-      setTokenRefreshMonitorStarted = _React$useState10[1];
-
-  _react.default.useEffect(function () {
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const location = window.location.protocol + "//" + window.location.hostname;
+const BasicAppHome = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
+  const [dashboardSettings, setDashboardSettings] = _react.default.useState();
+  const [loadingColor, setLoadingColor] = _react.default.useState(null);
+  const [open, setOpen] = _react.default.useState(false);
+  const [avatarUrl, setAvatarUrl] = _react.default.useState(location + props.contextRoot + props.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken"));
+  const [tokenRefreshMonitorStarted, setTokenRefreshMonitorStarted] = _react.default.useState(false);
+  _react.default.useEffect(() => {
     _ApplicationManager.default.setApplicationHistory(props.history);
-
     _ApplicationManager.default.setServiceApiPath(props.serviceApiPath);
-
     _ApplicationManager.default.setUIConfigPath(props.uiConfigPath);
-
     _ApplicationManager.default.setContextRoot(props.contextRoot);
-
     _ApplicationManager.default.setFilesApiPath(props.filesApiPath);
-
-    _ApplicationManager.default.setNavigator(function (path) {
+    _ApplicationManager.default.setNavigator(path => {
       navigate(path);
     });
-
-    (0, _RestUtils.sendRequest)(location + props.contextRoot + "/system/api/v1/setup", function (response) {
+    (0, _RestUtils.sendRequest)(location + props.contextRoot + "/system/api/v1/setup", response => {
       setDashboardSettings(response);
-      (0, _RestUtils.sendRequest)(location + _ApplicationManager.default.getContextRoot() + '/auth/api/v1/user/avatar/getId', function (response) {
+      (0, _RestUtils.sendRequest)(location + _ApplicationManager.default.getContextRoot() + '/auth/api/v1/user/avatar/getId', response => {
         sessionStorage.setItem("userAvatarId", response);
-      }, function (e) {});
-    }, function () {});
+      }, e => {});
+    }, () => {});
   }, []);
-
-  _react.default.useEffect(function () {
+  _react.default.useEffect(() => {
     setDashboardSettings(props.dashboardSettings);
   }, [props.dashboardSettings]);
-
-  _react.default.useEffect(function () {
+  _react.default.useEffect(() => {
     if (dashboardSettings && !tokenRefreshMonitorStarted) {
       _TokenManager.default.startTokenRefreshMonitor(location + props.contextRoot + props.authUrl + "/refresh", dashboardSettings.userName);
-
       setTokenRefreshMonitorStarted(true);
-
       if (!_Utils.default.isNull(dashboardSettings.userAvatar)) {
         setAvatarUrl(avatarUrl);
       }
-
-      var avatarListener = {};
+      let avatarListener = {};
       avatarListener.type = _ApplicationManager.AVATAR_LISTENER_TYPE;
-
-      avatarListener.handler = function (avatar) {
+      avatarListener.handler = avatar => {
         setAvatarUrl(avatarUrl);
       };
-
       _ApplicationManager.default.addApplicationListener(avatarListener);
-
       _ApplicationManager.default.setApplicationThemeColors(dashboardSettings.systemProfileDto.firstCorporateBrandColor, dashboardSettings.systemProfileDto.secondCorporateBrandColor);
-
       _ApplicationManager.default.setDashboardSettings(dashboardSettings);
-
       setLoadingColor(dashboardSettings.systemProfileDto.firstCorporateBrandColor);
     }
   }, [dashboardSettings]);
-
-  var logout = function logout() {
-    (0, _RestUtils.sendRequest)(location + props.contextRoot + props.authUrl + "/logout", function (response) {
+  const logout = () => {
+    (0, _RestUtils.sendRequest)(location + props.contextRoot + props.authUrl + "/logout", response => {
       sessionStorage.removeItem("accessToken");
       sessionStorage.removeItem("refreshToken");
       sessionStorage.removeItem("idToken");
       sessionStorage.removeItem("lastLogin");
-
       _ApplicationManager.default.clear();
-
       _SocketManager.default.disconnect();
-
       _ApplicationManager.default.navigate('/login');
-    }, function (e) {
+    }, e => {
       console.error('Error loging out');
     }, true);
   };
-
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_Utils.default.isNull(dashboardSettings) && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat("main w-100 h-100 d-inline-block " + dashboardSettings.systemProfileDto.organisation.code.toLowerCase() + "-skin")
+    className: `${"main w-100 h-100 d-inline-block " + dashboardSettings.systemProfileDto.organisation.code.toLowerCase() + "-skin"}`
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "w-100 h-100"
   }, /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
@@ -164,7 +92,7 @@ var BasicAppHome = function BasicAppHome(props) {
       }
     })
   }, /*#__PURE__*/_react.default.createElement(_FoldingSideTabDashboard.default, {
-    logoutCallBack: function logoutCallBack() {
+    logoutCallBack: () => {
       logout();
     },
     settings: dashboardSettings,
@@ -175,6 +103,4 @@ var BasicAppHome = function BasicAppHome(props) {
     color: loadingColor
   })));
 };
-
-var _default = BasicAppHome;
-exports.default = _default;
+var _default = exports.default = BasicAppHome;

package/dist/DynamicJS.js

@@ -1,128 +1,90 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TEMPLATE_REGEX = void 0;
-
 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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-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; }
-
-var TEMPLATE_REGEX = new RegExp('[@]{1}([#@]{1}{)(([a-zA-Z0-9_.[\\]]*)+){1}}((\\(([^)]*)\\))*)', 'g');
-exports.TEMPLATE_REGEX = TEMPLATE_REGEX;
-
-var DynamicJS = /*#__PURE__*/function () {
-  function DynamicJS() {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const TEMPLATE_REGEX = exports.TEMPLATE_REGEX = new RegExp('[@]{1}([#@]{1}{)(([a-zA-Z0-9_.[\\]]*)+){1}}((\\(([^)]*)\\))*)', 'g');
+class DynamicJS {
+  constructor() {
+    if (!DynamicJS.instance) {
+      DynamicJS.instance = this;
+    }
+    return DynamicJS.instance;
+  }
+  isNull(value) {
+    return _Utils.default.isNull(value);
+  }
+  removeKey = (() => function () {
+    let k = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+    let {
+      [k]: _,
+      ...o
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    return o;
+  })();
+  removeKeys = (() => {
     var _this = this;
-
-    _classCallCheck(this, DynamicJS);
-
-    _defineProperty(this, "removeKey", function () {
-      var k = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
-
-      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-          _ = _ref[k],
-          o = _objectWithoutProperties(_ref, [k].map(_toPropertyKey));
-
-      return o;
-    });
-
-    _defineProperty(this, "removeKeys", function () {
-      var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      var o = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return o ? keys.reduce(function (r, k) {
-        return _this.removeKey(k, r);
-      }, o) : null;
-    });
-
-    _defineProperty(this, "evaluateExpression", function (expression) {
-      return _ApplicationManager.default.resolveExpressionValue(expression);
-    });
-
-    _defineProperty(this, "parseScript", function (script, componentId, isScriptlet) {
-      var 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');
-      var matches = parsedScript.match(TEMPLATE_REGEX);
-
-      if (!_Utils.default.isNull(matches)) {
-        var expressions = [];
-
-        var _iterator = _createForOfIteratorHelper(matches),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var match = _step.value;
-
-            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++) {
-          var expression = _expressions[_i];
-          var replaceRegex = new RegExp("".concat(expression), 'g');
-          parsedScript = parsedScript.replace(replaceRegex, "this.evaluateExpression(\"".concat(expression, "\")"));
+    return function () {
+      let keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      let o = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      return o ? keys.reduce((r, k) => _this.removeKey(k, r), o) : null;
+    };
+  })();
+  isEmpty(value) {
+    return _Utils.default.isNull(value) || value.toString().trim().length === 0;
+  }
+  evaluateExpression = expression => {
+    return _ApplicationManager.default.resolveExpressionValue(expression);
+  };
+  parseScript = (script, componentId, isScriptlet) => {
+    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 = [];
+      for (const match of matches) {
+        if (!expressions.includes(match.trim())) {
+          expressions.push(match.trim());
         }
       }
-
-      return _Utils.default.isNull(isScriptlet) || isScriptlet === true && !parsedScript.trim().startsWith('return') ? "return ".concat(parsedScript) : parsedScript;
-    });
-
-    _defineProperty(this, "executeScript", function (name, scriptCode, componentId) {
-      var isScriplet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-      var event = arguments.length > 4 ? arguments[4] : undefined;
-
-      var parsedScript = _this.parseScript(scriptCode, componentId, isScriplet);
-
-      var eventParam = null;
-
+      for (const expression of expressions) {
+        var replaceRegex = new RegExp(`${expression}`, 'g');
+        parsedScript = parsedScript.replace(replaceRegex, `this.evaluateExpression("${expression}")`);
+      }
+    }
+    return _Utils.default.isNull(isScriptlet) || isScriptlet === true && !parsedScript.trim().startsWith('return') ? `return ${parsedScript}` : parsedScript;
+  };
+
+  /**
+   * inject and executes a script
+   *
+   * @param name
+   * @param scriptCode
+   * @param componentId
+   * @param isScriplet
+   * @param event
+   */
+  executeScript = (() => {
+    var _this2 = this;
+    return function (name, scriptCode, componentId) {
+      let isScriplet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+      let event = arguments.length > 4 ? arguments[4] : undefined;
+      let parsedScript = _this2.parseScript(scriptCode, componentId, isScriplet);
+      let eventParam = null;
       if (!_Utils.default.isNull(event)) {
         eventParam = {};
         eventParam.data = event.data;
       }
-
       try {
-        var func = new Function(parsedScript.replace(/\$event/g, JSON.stringify(eventParam)));
-
+        let func = new Function(parsedScript.replace(/\$event/g, JSON.stringify(eventParam)));
         if (!_Utils.default.isNull(name)) {
           DynamicJS.prototype[name] = func;
-          var result = instance[name]({});
+          let result = instance[name]({});
           delete DynamicJS.prototype[name];
           return result;
         }
@@ -130,101 +92,51 @@ var DynamicJS = /*#__PURE__*/function () {
         console.error(e);
         throw new Error("Error Executing script : " + parsedScript + " - " + e.message);
       }
-
       return null;
-    });
-
-    _defineProperty(this, "executeScriptObject", function (name, script) {
-      var componentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-      var valuesMap = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-      var event = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
-      var scriptBody = '';
-
-      var _iterator2 = _createForOfIteratorHelper(script.lines),
-          _step2;
-
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var line = _step2.value;
-          scriptBody += _this.parseScriptLine(line, valuesMap);
-
-          if (!line.endsWith(";")) {
-            scriptBody += ";";
-          }
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
+    };
+  })();
+  parseScriptLine(line, valuesMap) {
+    let parsedLine = line;
+    if (!parsedLine.endsWith(";") && !parsedLine.endsWith(":") && !parsedLine.endsWith("{") && !parsedLine.endsWith("}")) {
+      parsedLine += ";";
+    }
+    if (!_Utils.default.isNull(valuesMap)) {
+      const properties = Object.getOwnPropertyNames(valuesMap);
+      for (const property of properties) {
+        var replaceRegex = new RegExp(`@{${property}}`, 'g');
+        let propertyValue = valuesMap[property];
+        parsedLine = parsedLine.replace(replaceRegex, propertyValue);
       }
-
-      return _this.executeScript(name, scriptBody, componentId, false, event);
-    });
-
-    if (!DynamicJS.instance) {
-      DynamicJS.instance = this;
     }
-
-    return DynamicJS.instance;
+    return parsedLine;
   }
 
-  _createClass(DynamicJS, [{
-    key: "isNull",
-    value: function isNull(value) {
-      return _Utils.default.isNull(value);
-    }
-  }, {
-    key: "isEmpty",
-    value: function isEmpty(value) {
-      return _Utils.default.isNull(value) || value.toString().trim().length === 0;
-    }
-  }, {
-    key: "parseScriptLine",
-    value: function parseScriptLine(line, valuesMap) {
-      var parsedLine = line;
-
-      if (!parsedLine.endsWith(";") && !parsedLine.endsWith(":") && !parsedLine.endsWith("{") && !parsedLine.endsWith("}")) {
-        parsedLine += ";";
-      }
-
-      if (!_Utils.default.isNull(valuesMap)) {
-        var properties = Object.getOwnPropertyNames(valuesMap);
-
-        var _iterator3 = _createForOfIteratorHelper(properties),
-            _step3;
-
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var property = _step3.value;
-            var replaceRegex = new RegExp("@{".concat(property, "}"), 'g');
-            var propertyValue = valuesMap[property];
-            parsedLine = parsedLine.replace(replaceRegex, propertyValue);
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
+  /**
+   * inject and executes a script
+   *
+   * @param name
+   * @param script
+   * @param componentId
+   * @param valuesMap
+   * @param event
+   */
+  executeScriptObject = (() => {
+    var _this3 = this;
+    return function (name, script) {
+      let componentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+      let valuesMap = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      let event = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+      let scriptBody = '';
+      for (const line of script.lines) {
+        scriptBody += _this3.parseScriptLine(line, valuesMap);
+        if (!line.endsWith(";")) {
+          scriptBody += ";";
         }
       }
-
-      return parsedLine;
-    }
-    /**
-     * inject and executes a script
-     *
-     * @param name
-     * @param script
-     * @param componentId
-     * @param valuesMap
-     * @param event
-     */
-
-  }]);
-
-  return DynamicJS;
-}();
-
-var instance = new DynamicJS();
+      return _this3.executeScript(name, scriptBody, componentId, false, event);
+    };
+  })();
+}
+const instance = new DynamicJS();
 Object.freeze(instance);
-var _default = instance;
-exports.default = _default;
+var _default = exports.default = instance;