@agilemotion/oui-react-js 1.3.2 → 1.3.3

package/dist/components/form/Form.js

@@ -155,8 +155,8 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
       removeField: id => {
         _removeField(id);
       },
-      loadData: actionConfig => {
-        _loadData(actionConfig, config);
+      loadData: (actionConfig, eventData) => {
+        _loadData(actionConfig, config, eventData);
       },
       bindData: data => {
         doBindData(data);
@@ -312,7 +312,30 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
         }
 
         return children;
+      },
+
+      refresh() {
+        let properties = Object.getOwnPropertyNames(sectionHandles);
+
+        var _iterator4 = _createForOfIteratorHelper(properties),
+            _step4;
+
+        try {
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            const property = _step4.value;
+            let sectionHandle = sectionHandles[property];
+
+            if (sectionHandle.api.refresh) {
+              sectionHandle.api.refresh();
+            }
+          }
+        } catch (err) {
+          _iterator4.e(err);
+        } finally {
+          _iterator4.f();
+        }
       }
+
     };
   };
 
@@ -347,23 +370,23 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
 
     _Observable.default.processSystemGeneratedSubscriptions(props.config.id);
 
-    var _iterator4 = _createForOfIteratorHelper(fields),
-        _step4;
+    var _iterator5 = _createForOfIteratorHelper(fields),
+        _step5;
 
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        const field = _step4.value;
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        const field = _step5.value;
 
         _Observable.default.processSystemGeneratedSubscriptions(field.handle.api.id);
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator4.f();
+      _iterator5.f();
     }
   }
 
-  function _loadData(eventConfig, componentConfig) {
+  function _loadData(eventConfig, componentConfig, eventData = null) {
     let service = !_Utils.default.isNull(componentConfig.dataService) ? componentConfig.dataService : eventConfig !== null ? eventConfig.dataService : null;
     let componentValue = !_Utils.default.isNull(componentConfig.value) ? componentConfig.value : eventConfig !== null ? eventConfig.value : null;
 
@@ -385,7 +408,7 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
           _Utils.default.publishSystemErrorMessage(props.viewId);
         }, parameter => {
           loadingRef.current = false;
-          handleDataArrived({});
+          handleDataArrived(null);
         });
       } else {
         if (_Utils.default.isNull(eventConfig)) {
@@ -398,13 +421,18 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
           parseValues(transformDataObject(data));
           setMasterValues(data);
           loadingRef.current = false;
-        }, () => {});
+        }, () => {}, parameter => {
+          loadingRef.current = false;
+          handleDataArrived(null);
+        });
       }
 
       return true;
     } else {
       if (!_Utils.default.isNull(componentValue)) {
-        if (_ApplicationContext.default.isExpression(componentValue)) {
+        let isEventData = componentValue.toString().startsWith("$event.data");
+
+        if (_ApplicationContext.default.isExpression(componentValue) && !isEventData) {
           let path = _Utils.default.getPropertyChainPath(componentValue);
 
           if (!_Utils.default.isNull(path.valueObject)) {
@@ -425,7 +453,7 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
             });
           }
         } else {
-          let val = componentValue;
+          let val = isEventData ? _ApplicationContext.default.resolveExpressionValue(componentValue, eventData) : componentValue;
 
           if (binder === 'MAP_OBJECT' && _Utils.default.isNull(componentValue.map)) {
             val = {};
@@ -455,7 +483,7 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
 
       let autoLoadData = _Utils.default.getComponentAttribute(parsedConfig, 'autoLoadData', null);
 
-      if (autoLoadData === null || autoLoadData === true) {
+      if (!_ApplicationContext.default.getCurrentView().handle.api.loaded() && autoLoadData === null || autoLoadData === true) {
         let subscription = {
           publisher: props.viewId,
           eventType: _EventType.default.COMPONENT_LOAD,
@@ -474,8 +502,6 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
       _Observable.default.addSystemSubscriptions(parsedConfig);
 
       setConfig(parsedConfig);
-      let data = {};
-      data.viewId = props.viewId;
       setInitializing(false);
     }
   });
@@ -495,44 +521,46 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
   const getFieldsFromTab = tab => {
     let fields = [];
 
-    var _iterator5 = _createForOfIteratorHelper(tab.tabPages),
-        _step5;
+    var _iterator6 = _createForOfIteratorHelper(tab.tabPages),
+        _step6;
 
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        const tabPage = _step5.value;
+      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        const tabPage = _step6.value;
 
-        var _iterator6 = _createForOfIteratorHelper(tabPage.components),
-            _step6;
+        var _iterator7 = _createForOfIteratorHelper(tabPage.components),
+            _step7;
 
         try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            const formSection = _step6.value;
+          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+            const component = _step7.value;
 
-            var _iterator7 = _createForOfIteratorHelper(formSection.components),
-                _step7;
+            if (component.type === "formSection") {
+              var _iterator8 = _createForOfIteratorHelper(component.components),
+                  _step8;
 
-            try {
-              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                const fieldset = _step7.value;
-                fields = fields.concat(fieldset.fields);
+              try {
+                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                  const fieldset = _step8.value;
+                  fields = fields.concat(fieldset.fields);
+                }
+              } catch (err) {
+                _iterator8.e(err);
+              } finally {
+                _iterator8.f();
               }
-            } catch (err) {
-              _iterator7.e(err);
-            } finally {
-              _iterator7.f();
             }
           }
         } catch (err) {
-          _iterator6.e(err);
+          _iterator7.e(err);
         } finally {
-          _iterator6.f();
+          _iterator7.f();
         }
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator6.e(err);
     } finally {
-      _iterator5.f();
+      _iterator6.f();
     }
 
     return fields;
@@ -544,13 +572,13 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
 
   function _loadCompleteHandler() {
     _loadCompleteHandler = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(id) {
-      var release, allLoaded, _iterator8, _step8, section, _iterator10, _step10, component, fields, _iterator11, _step11, field, _iterator9, _step9, handle;
+      var release, allLoaded, _iterator9, _step9, section, _iterator11, _step11, component, fields, _iterator12, _step12, field, _iterator10, _step10, handle, event;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (_Utils.default.isNull(id)) {
-              _context.next = 67;
+              _context.next = 68;
               break;
             }
 
@@ -562,151 +590,156 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
             _context.prev = 4;
 
             if (loadedComponents.includes(id)) {
-              _context.next = 64;
+              _context.next = 65;
               break;
             }
 
             loadedComponents.push(id);
             allLoaded = true;
-            _iterator8 = _createForOfIteratorHelper(props.config.sections);
+            _iterator9 = _createForOfIteratorHelper(props.config.sections);
             _context.prev = 9;
 
-            _iterator8.s();
+            _iterator9.s();
 
           case 11:
-            if ((_step8 = _iterator8.n()).done) {
-              _context.next = 54;
+            if ((_step9 = _iterator9.n()).done) {
+              _context.next = 55;
               break;
             }
 
-            section = _step8.value;
-            _iterator10 = _createForOfIteratorHelper(section.components);
+            section = _step9.value;
+            _iterator11 = _createForOfIteratorHelper(section.components);
             _context.prev = 14;
 
-            _iterator10.s();
+            _iterator11.s();
 
           case 16:
-            if ((_step10 = _iterator10.n()).done) {
-              _context.next = 42;
+            if ((_step11 = _iterator11.n()).done) {
+              _context.next = 43;
               break;
             }
 
-            component = _step10.value;
+            component = _step11.value;
             fields = null;
 
             if (component.type === 'tab') {
               fields = getFieldsFromTab(component);
-            } else {
+            } else if (component.type === 'fieldSet') {
               fields = component.fields;
             }
 
-            _iterator11 = _createForOfIteratorHelper(fields);
-            _context.prev = 21;
+            if (!fields) {
+              _context.next = 39;
+              break;
+            }
 
-            _iterator11.s();
+            _iterator12 = _createForOfIteratorHelper(fields);
+            _context.prev = 22;
 
-          case 23:
-            if ((_step11 = _iterator11.n()).done) {
-              _context.next = 30;
+            _iterator12.s();
+
+          case 24:
+            if ((_step12 = _iterator12.n()).done) {
+              _context.next = 31;
               break;
             }
 
-            field = _step11.value;
+            field = _step12.value;
 
             if (loadedComponents.includes(field.id)) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
 
             allLoaded = false;
-            return _context.abrupt("break", 30);
+            return _context.abrupt("break", 31);
 
-          case 28:
-            _context.next = 23;
+          case 29:
+            _context.next = 24;
             break;
 
-          case 30:
-            _context.next = 35;
+          case 31:
+            _context.next = 36;
             break;
 
-          case 32:
-            _context.prev = 32;
-            _context.t0 = _context["catch"](21);
+          case 33:
+            _context.prev = 33;
+            _context.t0 = _context["catch"](22);
 
-            _iterator11.e(_context.t0);
+            _iterator12.e(_context.t0);
 
-          case 35:
-            _context.prev = 35;
+          case 36:
+            _context.prev = 36;
 
-            _iterator11.f();
+            _iterator12.f();
 
-            return _context.finish(35);
+            return _context.finish(36);
 
-          case 38:
+          case 39:
             if (allLoaded) {
-              _context.next = 40;
+              _context.next = 41;
               break;
             }
 
-            return _context.abrupt("break", 42);
+            return _context.abrupt("break", 43);
 
-          case 40:
+          case 41:
             _context.next = 16;
             break;
 
-          case 42:
-            _context.next = 47;
+          case 43:
+            _context.next = 48;
             break;
 
-          case 44:
-            _context.prev = 44;
+          case 45:
+            _context.prev = 45;
             _context.t1 = _context["catch"](14);
 
-            _iterator10.e(_context.t1);
+            _iterator11.e(_context.t1);
 
-          case 47:
-            _context.prev = 47;
+          case 48:
+            _context.prev = 48;
 
-            _iterator10.f();
+            _iterator11.f();
 
-            return _context.finish(47);
+            return _context.finish(48);
 
-          case 50:
+          case 51:
             if (allLoaded) {
-              _context.next = 52;
+              _context.next = 53;
               break;
             }
 
-            return _context.abrupt("break", 54);
+            return _context.abrupt("break", 55);
 
-          case 52:
+          case 53:
             _context.next = 11;
             break;
 
-          case 54:
-            _context.next = 59;
+          case 55:
+            _context.next = 60;
             break;
 
-          case 56:
-            _context.prev = 56;
+          case 57:
+            _context.prev = 57;
             _context.t2 = _context["catch"](9);
 
-            _iterator8.e(_context.t2);
+            _iterator9.e(_context.t2);
 
-          case 59:
-            _context.prev = 59;
+          case 60:
+            _context.prev = 60;
 
-            _iterator8.f();
+            _iterator9.f();
 
-            return _context.finish(59);
+            return _context.finish(60);
 
-          case 62:
+          case 63:
             if (allLoaded) {
-              _iterator9 = _createForOfIteratorHelper(fields);
+              _iterator10 = _createForOfIteratorHelper(fields);
 
               try {
-                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                  field = _step9.value;
+                for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                  field = _step10.value;
                   handle = field.handle;
 
                   if (!_Utils.default.isNull(handle)) {
@@ -714,26 +747,29 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
                   }
                 }
               } catch (err) {
-                _iterator9.e(err);
+                _iterator10.e(err);
               } finally {
-                _iterator9.f();
+                _iterator10.f();
               }
             }
 
             if (allLoaded && !_Utils.default.isNull(props.loadCompleteHandler)) {
               props.loadCompleteHandler(props.config.id);
+              event = new _Event.default(props.handle, props.viewId, null);
+
+              _Observable.default.fireEvent(_EventType.default.COMPONENT_LOAD, event);
             }
 
-          case 64:
-            _context.prev = 64;
+          case 65:
+            _context.prev = 65;
             release();
-            return _context.finish(64);
+            return _context.finish(65);
 
-          case 67:
+          case 68:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4,, 64, 67], [9, 56, 59, 62], [14, 44, 47, 50], [21, 32, 35, 38]]);
+      }, _callee, null, [[4,, 65, 68], [9, 57, 60, 63], [14, 45, 48, 51], [22, 33, 36, 39]]);
     }));
     return _loadCompleteHandler.apply(this, arguments);
   }
@@ -1024,12 +1060,7 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
   };
 
   function render(form) {
-    return _Utils.default.isNull(form.sections) || form.sections.length === 0 ? null : /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        overflow: _Utils.default.getComponentAttribute(props.config, 'overflow', 'auto'),
-        maxHeight: '70vh'
-      }
-    }, form.sections.map(section => {
+    return _Utils.default.isNull(form.sections) || form.sections.length === 0 ? null : /*#__PURE__*/_react.default.createElement("div", null, form.sections.map(section => {
       if (_Utils.default.isNull(section.id)) {
         section.id = sectionCounter + '-form-section';
       }
@@ -1054,12 +1085,12 @@ const Form = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
   return /*#__PURE__*/_react.default.createElement("div", {
     className: props.className,
     ref: ref,
-    style: props.className === 'defaultForm' ? {
-      height: _Utils.default.getComponentAttribute(props.config, 'height', null),
-      padding: _Utils.default.getComponentAttribute(props.config, 'padding', '16px 32px 0 48px'),
-      margin: _Utils.default.getComponentAttribute(props.config, 'margin', '0'),
-      overflow: 'hidden'
-    } : null
+    style: props.className === 'defaultForm' ? _Utils.default.mergeStyles({
+      padding: '16px 0',
+      margin: '0',
+      overflow: 'auto',
+      maxHeight: '70vh'
+    }, props.config) : null
   }, !_Utils.default.isNull(props.config.id) ? !initializing ? render(props.config) : null : /*#__PURE__*/_react.default.createElement("div", null, "ERROR: A form must have an ID"));
 }));
 

package/dist/components/form/GridField.js

@@ -190,7 +190,8 @@ const GridFieldWrapper = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.d
   }, [base.value]);
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "MuiFormControl-root MuiTextField-root MuiFormControl-marginDense"
+    className: "MuiFormControl-root MuiTextField-root MuiFormControl-marginDense",
+    style: _Utils.default.mergeStyles({}, props.config)
   }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, {
     required: base.required,
     error: base.hasError
@@ -198,7 +199,7 @@ const GridFieldWrapper = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.d
     style: {
       border: "1px solid ".concat(base.hasError ? '#f44336' : '#e1e1e1'),
       width: '100%',
-      height: _Utils.default.getComponentAttribute(props.config, 'height', null),
+      height: '100%',
       borderRadius: '4px',
       marginTop: '8px',
       marginBottom: '8px'