@stemy/ngx-dynamic-form 10.2.25 → 10.2.26

package/bundles/stemy-ngx-dynamic-form.umd.js

@@ -527,28 +527,55 @@
             _this.notifyCallback = notifyCallback;
             return _this;
         }
+        FormSubject.prototype.handleNotifiedValue = function (controlModel, control, val) {
+            var _this = this;
+            val.then(function (v) { return _this.next(v); });
+        };
         FormSubject.prototype.notify = function (controlModel, control) {
-            return __awaiter(this, void 0, void 0, function () {
-                var value;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            value = this.notifyCallback(controlModel, control);
-                            if (!(value instanceof Promise)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, value];
-                        case 1:
-                            value = _a.sent();
-                            _a.label = 2;
-                        case 2:
-                            this.next(value);
-                            return [2 /*return*/];
-                    }
-                });
-            });
+            var path = controlModel;
+            while (path && isNaN(path.index)) {
+                path = path.parent;
+            }
+            var value = this.notifyCallback(controlModel, control, path === null || path === void 0 ? void 0 : path.index);
+            if (!(value instanceof Promise)) {
+                value = Promise.resolve(value);
+            }
+            this.handleNotifiedValue(controlModel, control, value);
         };
         return FormSubject;
     }(rxjs.Subject));
 
+    var FormSelectSubject = /** @class */ (function (_super) {
+        __extends(FormSelectSubject, _super);
+        function FormSelectSubject() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        FormSelectSubject.prototype.handleNotifiedValue = function (controlModel, control, val) {
+            var _this = this;
+            val.then(function (options) {
+                var _a, _b;
+                _this.next(options);
+                var currentVal = control.value;
+                if (controlModel.multiple) {
+                    var correctVal = (currentVal || []).filter(function (t) { return options.findIndex(function (o) { return o.value == t; }) >= 0; });
+                    if (correctVal.length !== (currentVal === null || currentVal === void 0 ? void 0 : currentVal.length)) {
+                        control.setValue(correctVal, { onlySelf: true, emitEvent: false });
+                    }
+                    return;
+                }
+                var option = options.find(function (t) { return t.value == currentVal; });
+                if (!option) {
+                    control.setValue((_b = (_a = options[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null, { onlySelf: true, emitEvent: false });
+                }
+            });
+        };
+        return FormSelectSubject;
+    }(FormSubject));
+
+    function isStringWithVal(val) {
+        return typeof val == "string" && val.length > 0;
+    }
+
     var DynamicFormArrayModel = /** @class */ (function (_super) {
         __extends(DynamicFormArrayModel, _super);
         function DynamicFormArrayModel(config, layout) {
@@ -794,7 +821,8 @@
         };
         DynamicFormService.prototype.getFormControlModel = function (property, schema) {
             var _a, _b;
-            if (Array.isArray(property.enum) || ngxUtils.ObjectUtils.isString(property.optionsPath)) {
+            var $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
+            if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
                 return new core.DynamicSelectModel(this.getFormSelectConfig(property, schema));
             }
             switch (property.type) {
@@ -806,15 +834,10 @@
                     return new core.DynamicTextAreaModel(this.getFormTextareaConfig(property, schema));
                 case "boolean":
                     return new core.DynamicCheckboxModel(this.getFormCheckboxConfig(property, schema));
-                case "list":
-                    return new core.DynamicSelectModel(this.getFormSelectConfig(property, schema));
                 case "array":
-                    if (((_a = property.items) === null || _a === void 0 ? void 0 : _a.$ref) || property.$ref) {
+                    if (((_b = property.items) === null || _b === void 0 ? void 0 : _b.$ref) || property.$ref) {
                         return new DynamicFormArrayModel(this.getFormArrayConfig(property, schema));
                     }
-                    else if (((_b = property.items) === null || _b === void 0 ? void 0 : _b.enum) || property.enum) {
-                        return new core.DynamicSelectModel(this.getFormSelectConfig(property, schema));
-                    }
                     else {
                         return new core.DynamicInputModel(this.getFormInputConfig(property, schema));
                     }
@@ -946,8 +969,17 @@
             var _this = this;
             var _a;
             var $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
-            if (property.optionsPath) {
-                return new FormSubject(function (formModel, control) {
+            if (Array.isArray($enum)) {
+                return new FormSelectSubject(function () {
+                    var options = $enum.map(function (value) {
+                        var label = property.translatable ? property.id + "." + value : value;
+                        return { value: value, label: label };
+                    });
+                    return _this.translateOptions(options);
+                });
+            }
+            if (isStringWithVal(property.optionsPath)) {
+                return new FormSelectSubject(function (formModel, control, index) {
                     var path = property.optionsPath;
                     var target = control;
                     if (path.startsWith("$root")) {
@@ -962,21 +994,12 @@
                             target = target.parent;
                         }
                     }
-                    var value = ngxUtils.ObjectUtils.getValue(target.value, path);
+                    var value = ngxUtils.ObjectUtils.getValue(target.value, path.replace(/\$ix/gi, index));
                     var options = (!ngxUtils.ObjectUtils.isArray(value) ? [] : value).map(function (value) { return ({ value: value, label: value }); });
                     return _this.translateOptions(options);
                 });
             }
-            if (ngxUtils.ObjectUtils.isArray($enum)) {
-                return new FormSubject(function () {
-                    var options = $enum.map(function (value) {
-                        var label = property.translatable ? property.id + "." + value : value;
-                        return { value: value, label: label };
-                    });
-                    return _this.translateOptions(options);
-                });
-            }
-            return new FormSubject(function () { return __awaiter(_this, void 0, void 0, function () {
+            return new FormSelectSubject(function () { return __awaiter(_this, void 0, void 0, function () {
                 var options;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -1520,6 +1543,7 @@
     exports.FormInput = FormInput;
     exports.FormModel = FormModel;
     exports.FormSelect = FormSelect;
+    exports.FormSelectSubject = FormSelectSubject;
     exports.FormSerializable = FormSerializable;
     exports.FormStatic = FormStatic;
     exports.FormSubject = FormSubject;
@@ -1534,17 +1558,17 @@
     exports.getFormControl = getFormControl;
     exports.getFormFieldSets = getFormFieldSets;
     exports.getFormSerializer = getFormSerializer;
+    exports.validateItemsMaxLength = validateItemsMaxLength;
+    exports.validateItemsMaxValue = validateItemsMaxValue;
+    exports.validateItemsMinLength = validateItemsMinLength;
+    exports.validateItemsMinValue = validateItemsMinValue;
     exports.validateJSON = validateJSON;
     exports.validatePhone = validatePhone;
     exports.validateRequiredTranslation = validateRequiredTranslation;
-    exports.ɵa = validateItemsMinLength;
-    exports.ɵb = validateItemsMaxLength;
-    exports.ɵc = validateItemsMinValue;
-    exports.ɵd = validateItemsMaxValue;
-    exports.ɵe = components;
-    exports.ɵf = directives;
-    exports.ɵg = pipes;
-    exports.ɵh = DynamicFormValidationService;
+    exports.ɵa = components;
+    exports.ɵb = directives;
+    exports.ɵc = pipes;
+    exports.ɵd = DynamicFormValidationService;
 
     Object.defineProperty(exports, '__esModule', { value: true });