@agilemotion/oui-react-js 1.3.4 → 1.3.6

package/dist/event/ActionHandlers.js

@@ -74,7 +74,7 @@ class ActionHandlers {
     let shouldRun = true;
 
     if (!_Utils.default.isNull(preCondition)) {
-      shouldRun = _DynamicJS.default.executeScript(Math.random() + "_action_pre_condition", preCondition);
+      shouldRun = _DynamicJS.default.executeScript(Math.random() + "_" + viewId + "_" + (component ? component.api.id : "NO_COMPONENT") + "_action_pre_condition", preCondition);
     }
 
     if (shouldRun) {

package/dist/event/LoadDataActionHandler.js

@@ -22,7 +22,7 @@ class LoadDataActionHandler {
 
   execute(actionConfig, event, component, currentViewId) {
     if (!_Utils.default.isNull(component)) {
-      component.api.loadData(actionConfig, event.data);
+      component.api.loadData(actionConfig, event);
     }
   }
 

package/dist/event/RouteActionHandler.js

@@ -51,7 +51,7 @@ class RouteActionHandler {
     } else {
       path = _ApplicationContext.default.isExpression(actionConfig.path) ? _ApplicationContext.default.resolveExpressionValue(actionConfig.path, event.data) : actionConfig.path;
 
-      if ("@#{history.back}" === actionConfig.path) {
+      if ("@#{history.back}" === actionConfig.path && _ApplicationContext.default.graphs.length === 0) {
         let historyElement = _ApplicationContext.default.getPreviousHistoryElement();
 
         if (historyElement === null) {
@@ -87,49 +87,53 @@ class RouteActionHandler {
       }
     }
 
-    let url = location + _ApplicationContext.default.getBaseApiUrl() + _ApplicationContext.default.getUIConfigPath() + "/view?version=1.0&id=" + path;
-    (0, _RestUtils.sendRequest)(url, data => {
-      if (isParent) {
-        _ApplicationContext.default.removeLoadedGraph();
-      }
+    if ("@#{history.back}" === actionConfig.path && _ApplicationContext.default.graphs.length > 0) {
+      _ApplicationContext.default.removeLoadedGraph();
+    } else {
+      let url = location + _ApplicationContext.default.getBaseApiUrl() + _ApplicationContext.default.getUIConfigPath() + "/view?version=1.0&id=" + path;
+      (0, _RestUtils.sendRequest)(url, data => {
+        if (isParent) {
+          _ApplicationContext.default.removeLoadedGraph();
+        }
 
-      if (data.type === 'view') {
-        let currentView = _ApplicationContext.default.getCurrentView();
+        if (data.type === 'view') {
+          let currentView = _ApplicationContext.default.getCurrentView();
 
-        if (_Utils.default.isNull(currentView) || !currentView.popUp) {
-          let view = {};
-          view.config = data;
-          view.handle = {};
-          view.parameters = parameterValues;
-          view.parent = isParent;
-          view.popUp = isPopup;
+          if (_Utils.default.isNull(currentView) || !currentView.popUp) {
+            let view = {};
+            view.config = data;
+            view.handle = {};
+            view.parameters = parameterValues;
+            view.parent = isParent;
+            view.popUp = isPopup;
 
-          _ApplicationContext.default.addView(view, path, forward); // None-existing route to ensure that the current view unloads
+            _ApplicationContext.default.addView(view, path, forward); // None-existing route to ensure that the current view unloads
 
 
-          if (_Utils.default.isNull(actionConfig.popUp) || actionConfig.popUp === false) {
-            _ApplicationContext.default.getViewPortHistory().push("/switch");
+            if (_Utils.default.isNull(actionConfig.popUp) || actionConfig.popUp === false) {
+              _ApplicationContext.default.getViewPortHistory().push("/switch");
 
-            _ApplicationContext.default.getViewPortHistory().push("/view/" + data.id);
-          }
-        } else {
-          _ApplicationContext.default.closeCurrentView(false);
+              _ApplicationContext.default.getViewPortHistory().push("/view/" + data.id);
+            }
+          } else {
+            _ApplicationContext.default.closeCurrentView(false);
 
-          currentView = _ApplicationContext.default.getCurrentView();
+            currentView = _ApplicationContext.default.getCurrentView();
 
-          if (currentView) {
-            currentView.handle.api.updateModel(parameterValues);
-            let event = new _Event.default(currentView.handle, currentView.config.id, null);
+            if (currentView) {
+              currentView.handle.api.updateModel(parameterValues);
+              let event = new _Event.default(currentView.handle, currentView.config.id, null);
 
-            _Observable.default.fireEvent(_EventType.default.COMPONENT_LOAD, event);
+              _Observable.default.fireEvent(_EventType.default.COMPONENT_LOAD, event);
+            }
           }
+        } else if (data.type === 'graph') {
+          _ApplicationContext.default.loadGraph(isParent, isPopup, data, parameterValues);
         }
-      } else if (data.type === 'graph') {
-        _ApplicationContext.default.loadGraph(isParent, isPopup, data, parameterValues);
-      }
-    }, e => {
-      console.error(e);
-    }, true, false);
+      }, e => {
+        console.error(e);
+      }, true, false);
+    }
   }
 
 }

package/dist/event/ServiceCallActionHandler.js

@@ -53,7 +53,7 @@ class ServiceCallActionHandler {
       if (invalidParameterCallback) {
         invalidParameterCallback();
       }
-    }, actionConfig.returnValueBinding, actionConfig.successMessage);
+    }, actionConfig.returnValueBinding, actionConfig.successMessage, event);
   }
 
 }

package/dist/js/Addresses.js

@@ -10,22 +10,22 @@ class Addresses {
     this.resolver = resolver;
   }
 
-  copy(from, to, checked) {
+  copy(from, to, checked, mode = 'line') {
     if (checked) {
-      let street = this.resolver.resolveComponentApi(from + '.street').value;
-      let suburb = this.resolver.resolveComponentApi(from + '.suburb').value;
-      let city = this.resolver.resolveComponentApi(from + '.city').value;
-      let municipality = this.resolver.resolveComponentApi(from + '.municipality').value;
-      let province = this.resolver.resolveComponentApi(from + '.province').value;
-      let country = this.resolver.resolveComponentApi(from + '.country').value;
+      let street = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.street' : '.line1')).value;
+      let suburb = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.suburb' : '.line2')).value;
+      let city = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.city' : '.line3')).value;
+      let municipality = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.municipality' : '.line4')).value;
+      let province = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.province' : '.line5')).value;
+      let country = this.resolver.resolveComponentApi(from + (mode === 'street' ? '.country' : '.line6')).value;
       let code = this.resolver.resolveComponentApi(from + '.code').value;
       let building = this.resolver.resolveComponentApi(from + '.building').value;
-      this.resolver.resolveComponentApi(to + '.street').value = street;
-      this.resolver.resolveComponentApi(to + '.suburb').value = suburb;
-      this.resolver.resolveComponentApi(to + '.city').value = city;
-      this.resolver.resolveComponentApi(to + '.municipality').value = municipality;
-      this.resolver.resolveComponentApi(to + '.province').value = province;
-      this.resolver.resolveComponentApi(to + '.country').value = country;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.street' : '.line1')).value = street;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.suburb' : '.line2')).value = suburb;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.city' : '.line3')).value = city;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.municipality' : '.line4')).value = municipality;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.province' : '.line5')).value = province;
+      this.resolver.resolveComponentApi(to + (mode === 'street' ? '.country' : '.line6')).value = country;
       this.resolver.resolveComponentApi(to + '.code').value = code;
       this.resolver.resolveComponentApi(to + '.building').value = building;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilemotion/oui-react-js",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "babel": {
     "presets": [
       "@babel/preset-env",