@mmlogic/components 0.1.30 → 0.3.0

package/dist/collection/components/mrd-field/mrd-field.js

@@ -27,34 +27,32 @@ export class MrdField {
     render() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
         const { item, locale, value } = this;
-        if (item.type === ClientLayoutItemType.RELATION && item.relation) {
-            const rel = item.relation;
-            return (h(Host, null, h("mrd-relation-field", { name: rel.name, label: rel.label, required: rel.required, disabled: (_a = rel.disabled) !== null && _a !== void 0 ? _a : false, locale: locale, relatedClass: rel.relatedClass, mostSignificantClass: (_b = rel.mostSignificantClass) !== null && _b !== void 0 ? _b : '', displayType: (_c = rel.displayType) !== null && _c !== void 0 ? _c : ClientLayoutItemRelationDisplayType.SEARCH, editBehavior: (_d = rel.editBehavior) !== null && _d !== void 0 ? _d : null, commonRelation: rel.commonRelation, multiple: (_e = rel.multiple) !== null && _e !== void 0 ? _e : false, dropdownValues: (_f = rel.dropdownValues) !== null && _f !== void 0 ? _f : [], value: value, onMrdChange: this.handleChange, onMrdBlur: this.handleBlur, onMrdSearch: this.handleSearch, onMrdFetchAll: this.handleFetchAll })));
+        if (item.type === ClientLayoutItemType.RELATION) {
+            return (h(Host, null, h("mrd-relation-field", { name: item.name, label: item.label, required: item.required, disabled: (_a = item.disabled) !== null && _a !== void 0 ? _a : false, locale: locale, relatedClass: item.relatedClass, mostSignificantClass: (_b = item.mostSignificantClass) !== null && _b !== void 0 ? _b : '', displayType: (_c = item.displayType) !== null && _c !== void 0 ? _c : ClientLayoutItemRelationDisplayType.SEARCH, editBehavior: (_d = item.editBehavior) !== null && _d !== void 0 ? _d : null, commonRelation: item.commonRelation, multiple: (_e = item.multiple) !== null && _e !== void 0 ? _e : false, dropdownValues: (_f = item.dropdownValues) !== null && _f !== void 0 ? _f : [], value: value, onMrdChange: this.handleChange, onMrdBlur: this.handleBlur, onMrdSearch: this.handleSearch, onMrdFetchAll: this.handleFetchAll })));
         }
-        if (item.type !== ClientLayoutItemType.FIELD || !item.field) {
+        if (item.type !== ClientLayoutItemType.FIELD) {
             return h(Host, null);
         }
-        const field = item.field;
         const commonProps = {
-            name: field.name,
-            label: field.label,
-            required: field.required,
-            disabled: (_g = field.disabled) !== null && _g !== void 0 ? _g : false,
+            name: item.name,
+            label: item.label,
+            required: item.required,
+            disabled: (_g = item.disabled) !== null && _g !== void 0 ? _g : false,
             locale,
             onMrdChange: this.handleChange,
             onMrdBlur: this.handleBlur,
         };
-        switch (field.dataType) {
+        switch (item.dataType) {
             case ClientLayoutItemFieldDataType.TEXT:
-                return (h(Host, null, h("mrd-text-field", Object.assign({}, commonProps, { value: (_h = value) !== null && _h !== void 0 ? _h : '', placeholder: (_j = field.placeholder) !== null && _j !== void 0 ? _j : '' }))));
+                return (h(Host, null, h("mrd-text-field", Object.assign({}, commonProps, { value: (_h = value) !== null && _h !== void 0 ? _h : '', placeholder: (_j = item.placeholder) !== null && _j !== void 0 ? _j : '' }))));
             case ClientLayoutItemFieldDataType.TEXTBLOCK:
-                return (h(Host, null, h("mrd-textarea-field", Object.assign({}, commonProps, { value: (_k = value) !== null && _k !== void 0 ? _k : '', placeholder: (_l = field.placeholder) !== null && _l !== void 0 ? _l : '' }))));
+                return (h(Host, null, h("mrd-textarea-field", Object.assign({}, commonProps, { value: (_k = value) !== null && _k !== void 0 ? _k : '', placeholder: (_l = item.placeholder) !== null && _l !== void 0 ? _l : '' }))));
             case ClientLayoutItemFieldDataType.INTEGER:
             case ClientLayoutItemFieldDataType.DECIMAL:
             case ClientLayoutItemFieldDataType.PERCENTAGE:
-                return (h(Host, null, h("mrd-number-field", Object.assign({}, commonProps, { value: (_m = value) !== null && _m !== void 0 ? _m : null, dataType: field.dataType, decimalPrecision: (_o = field.decimalPrecision) !== null && _o !== void 0 ? _o : 2, placeholder: (_p = field.placeholder) !== null && _p !== void 0 ? _p : '' }))));
+                return (h(Host, null, h("mrd-number-field", Object.assign({}, commonProps, { value: (_m = value) !== null && _m !== void 0 ? _m : null, dataType: item.dataType, decimalPrecision: (_o = item.decimalPrecision) !== null && _o !== void 0 ? _o : 2, placeholder: (_p = item.placeholder) !== null && _p !== void 0 ? _p : '' }))));
             case ClientLayoutItemFieldDataType.CURRENCY:
-                return (h(Host, null, h("mrd-currency-field", Object.assign({}, commonProps, { value: (_q = value) !== null && _q !== void 0 ? _q : { amount: null, currency: (_r = field.currencyCode) !== null && _r !== void 0 ? _r : 'EUR' } }))));
+                return (h(Host, null, h("mrd-currency-field", Object.assign({}, commonProps, { value: (_q = value) !== null && _q !== void 0 ? _q : { amount: null, currency: (_r = item.currencyCode) !== null && _r !== void 0 ? _r : 'EUR' } }))));
             case ClientLayoutItemFieldDataType.BOOLEAN:
                 return (h(Host, null, h("mrd-boolean-field", Object.assign({}, commonProps, { value: (_s = value) !== null && _s !== void 0 ? _s : false }))));
             case ClientLayoutItemFieldDataType.DATE:
@@ -64,17 +62,17 @@ export class MrdField {
             case ClientLayoutItemFieldDataType.TIME:
                 return (h(Host, null, h("mrd-time-field", Object.assign({}, commonProps, { value: (_v = value) !== null && _v !== void 0 ? _v : '' }))));
             case ClientLayoutItemFieldDataType.EMAIL:
-                return (h(Host, null, h("mrd-email-field", Object.assign({}, commonProps, { value: (_w = value) !== null && _w !== void 0 ? _w : '', placeholder: (_x = field.placeholder) !== null && _x !== void 0 ? _x : '' }))));
+                return (h(Host, null, h("mrd-email-field", Object.assign({}, commonProps, { value: (_w = value) !== null && _w !== void 0 ? _w : '', placeholder: (_x = item.placeholder) !== null && _x !== void 0 ? _x : '' }))));
             case ClientLayoutItemFieldDataType.HYPERLINK:
-                return (h(Host, null, h("mrd-hyperlink-field", Object.assign({}, commonProps, { value: (_y = value) !== null && _y !== void 0 ? _y : '', placeholder: (_z = field.placeholder) !== null && _z !== void 0 ? _z : '' }))));
+                return (h(Host, null, h("mrd-hyperlink-field", Object.assign({}, commonProps, { value: (_y = value) !== null && _y !== void 0 ? _y : '', placeholder: (_z = item.placeholder) !== null && _z !== void 0 ? _z : '' }))));
             case ClientLayoutItemFieldDataType.LIST:
-                return (h(Host, null, h("mrd-list-field", Object.assign({}, commonProps, { value: (_0 = value) !== null && _0 !== void 0 ? _0 : '', multiple: (_1 = field.multiple) !== null && _1 !== void 0 ? _1 : false, listItems: (_2 = field.listItems) !== null && _2 !== void 0 ? _2 : [] }))));
+                return (h(Host, null, h("mrd-list-field", Object.assign({}, commonProps, { value: (_0 = value) !== null && _0 !== void 0 ? _0 : '', multiple: (_1 = item.multiple) !== null && _1 !== void 0 ? _1 : false, listItems: (_2 = item.listItems) !== null && _2 !== void 0 ? _2 : [] }))));
             case ClientLayoutItemFieldDataType.FILE:
-                return (h(Host, null, h("mrd-file-field", Object.assign({}, commonProps, { value: value, accept: (_3 = field.accept) !== null && _3 !== void 0 ? _3 : '', maxSize: (_4 = field.maxSize) !== null && _4 !== void 0 ? _4 : 0, onMrdUpload: this.handleUpload }))));
+                return (h(Host, null, h("mrd-file-field", Object.assign({}, commonProps, { value: value, accept: (_3 = item.accept) !== null && _3 !== void 0 ? _3 : '', maxSize: (_4 = item.maxSize) !== null && _4 !== void 0 ? _4 : 0, onMrdUpload: this.handleUpload }))));
             case ClientLayoutItemFieldDataType.IMAGE:
-                return (h(Host, null, h("mrd-image-field", Object.assign({}, commonProps, { value: value, accept: (_5 = field.accept) !== null && _5 !== void 0 ? _5 : 'image/*', maxSize: (_6 = field.maxSize) !== null && _6 !== void 0 ? _6 : 0, onMrdUpload: this.handleUpload }))));
+                return (h(Host, null, h("mrd-image-field", Object.assign({}, commonProps, { value: value, accept: (_5 = item.accept) !== null && _5 !== void 0 ? _5 : 'image/*', maxSize: (_6 = item.maxSize) !== null && _6 !== void 0 ? _6 : 0, onMrdUpload: this.handleUpload }))));
             case ClientLayoutItemFieldDataType.LONGTEXT:
-                return (h(Host, null, h("mrd-longtext-field", Object.assign({}, commonProps, { value: (_7 = value) !== null && _7 !== void 0 ? _7 : '', placeholder: (_8 = field.placeholder) !== null && _8 !== void 0 ? _8 : '' }))));
+                return (h(Host, null, h("mrd-longtext-field", Object.assign({}, commonProps, { value: (_7 = value) !== null && _7 !== void 0 ? _7 : '', placeholder: (_8 = item.placeholder) !== null && _8 !== void 0 ? _8 : '' }))));
             case ClientLayoutItemFieldDataType.JSON:
                 return h(Host, null);
             default:

package/dist/collection/components/mrd-form/mrd-form.js

@@ -45,17 +45,17 @@ export class MrdForm {
             const newHref = this.getHref(value);
             if (newHref === prevHref)
                 return;
-            for (const rel of this.collectDependentDropdowns()) {
-                if (rel.commonRelation !== name)
+            for (const item of this.collectDependentDropdowns()) {
+                if (item.commonRelation !== name)
                     continue;
                 // Clear the dependent field's current selection (options have changed)
-                this.formValues = Object.assign(Object.assign({}, this.formValues), { [rel.name]: null });
+                this.formValues = Object.assign(Object.assign({}, this.formValues), { [item.name]: null });
                 this.mrdFetchAll.emit({
-                    name: rel.name,
-                    relatedClass: rel.relatedClass,
-                    mostSignificantClass: rel.mostSignificantClass,
-                    commonRelation: rel.commonRelation,
-                    filter: rel.commonRelation + '_href',
+                    name: item.name,
+                    relatedClass: item.relatedClass,
+                    mostSignificantClass: item.mostSignificantClass,
+                    commonRelation: item.commonRelation,
+                    filter: item.commonRelation + '_href',
                     filterValue: newHref, // empty string when dependency was cleared → host should clear the list
                 });
             }
@@ -130,24 +130,20 @@ export class MrdForm {
         var _a, _b;
         const allItems = this.collectFields((_b = (_a = this.layout) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : []);
         // Strategy 1: direct match on mostSignificantClass
-        const direct = allItems.find(item => {
-            var _a;
-            return item.type === ClientLayoutItemType.RELATION &&
-                ((_a = item.relation) === null || _a === void 0 ? void 0 : _a.mostSignificantClass) === this.referenceClass;
-        });
-        if (direct === null || direct === void 0 ? void 0 : direct.relation)
-            return direct.relation.name;
+        const direct = allItems.find(item => item.type === ClientLayoutItemType.RELATION &&
+            item.mostSignificantClass === this.referenceClass);
+        if (direct === null || direct === void 0 ? void 0 : direct.name)
+            return direct.name;
         // Strategy 2: a DROPDOWN whose commonRelation field was omitted from the layout
         const layoutRelationNames = new Set(allItems
             .filter(item => item.type === ClientLayoutItemType.RELATION)
-            .map(item => item.relation.name));
+            .map(item => item.name));
         for (const item of allItems) {
-            const rel = item.relation;
             if (item.type === ClientLayoutItemType.RELATION &&
-                (rel === null || rel === void 0 ? void 0 : rel.editBehavior) === ClientLayoutItemRelationEditBehavior.DROPDOWN &&
-                rel.commonRelation &&
-                !layoutRelationNames.has(rel.commonRelation)) {
-                return rel.commonRelation;
+                item.editBehavior === ClientLayoutItemRelationEditBehavior.DROPDOWN &&
+                item.commonRelation &&
+                !layoutRelationNames.has(item.commonRelation)) {
+                return item.commonRelation;
             }
         }
         return null;
@@ -162,25 +158,21 @@ export class MrdForm {
     collectDependentDropdowns() {
         var _a, _b;
         return this.collectFields((_b = (_a = this.layout) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : [])
-            .filter(item => {
-            var _a;
-            return item.type === ClientLayoutItemType.RELATION &&
-                ((_a = item.relation) === null || _a === void 0 ? void 0 : _a.editBehavior) === ClientLayoutItemRelationEditBehavior.DROPDOWN &&
-                !!item.relation.commonRelation;
-        })
-            .map(item => item.relation);
+            .filter(item => item.type === ClientLayoutItemType.RELATION &&
+            item.editBehavior === ClientLayoutItemRelationEditBehavior.DROPDOWN &&
+            !!item.commonRelation);
     }
     /** Emit mrdFetchAll for every dependent DROPDOWN whose filter value is currently set. */
     emitDependentFetchAll() {
-        for (const rel of this.collectDependentDropdowns()) {
-            const filterValue = this.getHref(this.formValues[rel.commonRelation]);
+        for (const item of this.collectDependentDropdowns()) {
+            const filterValue = this.getHref(this.formValues[item.commonRelation]);
             if (filterValue) {
                 this.mrdFetchAll.emit({
-                    name: rel.name,
-                    relatedClass: rel.relatedClass,
-                    mostSignificantClass: rel.mostSignificantClass,
-                    commonRelation: rel.commonRelation,
-                    filter: rel.commonRelation + '_href',
+                    name: item.name,
+                    relatedClass: item.relatedClass,
+                    mostSignificantClass: item.mostSignificantClass,
+                    commonRelation: item.commonRelation,
+                    filter: item.commonRelation + '_href',
                     filterValue,
                 });
             }
@@ -210,15 +202,14 @@ export class MrdForm {
         return fields;
     }
     validate() {
-        var _a, _b, _c;
+        var _a, _b;
         const newErrors = {};
         const allFields = this.collectFields((_b = (_a = this.layout) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : []);
         for (const item of allFields) {
-            const def = (_c = item.field) !== null && _c !== void 0 ? _c : item.relation;
-            if (!def)
+            if (!item.name)
                 continue;
-            if (def.required && !validateRequired(this.formValues[def.name])) {
-                newErrors[def.name] = t('required', this.locale);
+            if (item.required && !validateRequired(this.formValues[item.name])) {
+                newErrors[item.name] = t('required', this.locale);
             }
         }
         this.errors = newErrors;
@@ -266,8 +257,10 @@ export class MrdForm {
         const payload = {};
         const allFields = this.collectFields((_b = (_a = this.layout) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : []);
         for (const item of allFields) {
-            if (item.type === ClientLayoutItemType.FIELD && item.field) {
-                const name = item.field.name;
+            if (!item.name)
+                continue;
+            const name = item.name;
+            if (item.type === ClientLayoutItemType.FIELD) {
                 const value = this.formValues[name];
                 if (value instanceof File)
                     continue;
@@ -277,8 +270,7 @@ export class MrdForm {
                     continue;
                 payload[name] = current;
             }
-            else if (item.type === ClientLayoutItemType.RELATION && item.relation) {
-                const name = item.relation.name;
+            else if (item.type === ClientLayoutItemType.RELATION) {
                 const current = this.normalizeRelationValue(this.formValues[name]);
                 const initial = this.normalizeRelationValue(this.initialValues[name]);
                 if (this.deepEqual(current, initial))
@@ -290,14 +282,14 @@ export class MrdForm {
     }
     renderItems(items) {
         return items.map(item => {
-            var _a, _b, _c, _d;
+            var _a;
             if (item.type === ClientLayoutItemType.SECTION) {
                 return (h("fieldset", { class: "mrd-form__section" }, item.label && h("legend", { class: "mrd-form__section-legend" }, item.label), h("div", { class: "mrd-form__section-body" }, item.items && this.renderItems(item.items))));
             }
             if (item.type === ClientLayoutItemType.GROUP) {
                 return (h("div", { class: "mrd-form__group" }, item.label && h("div", { class: "mrd-form__group-label" }, item.label), h("div", { class: "mrd-form__group-body" }, item.items && this.renderItems(item.items))));
             }
-            const fieldName = (_d = (_b = (_a = item.field) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : (_c = item.relation) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : '';
+            const fieldName = (_a = item.name) !== null && _a !== void 0 ? _a : '';
             const fieldValue = this.formValues[fieldName];
             return (h("div", { class: "mrd-form__field" }, h("mrd-field", { item: item, locale: this.locale, value: fieldValue, onMrdChange: this.handleFieldChange, onMrdBlur: this.handleFieldChange, onMrdSearch: this.handleSearch, onMrdFetchAll: this.handleFetchAll, onMrdUpload: this.handleUpload }), this.errors[fieldName] && (h("span", { class: "mrd-form__field-error" }, this.errors[fieldName]))));
         });