@mcurros2/microm 1.1.446-0 → 1.1.448-0

package/dist/index.js

@@ -7376,13 +7376,16 @@ $parcel$export(module.exports, "useHierarchyKeys", function () { return $7f5304f
 
 parcelRequire("2eyXi");
 var $2cfmO = parcelRequire("2cfmO");
-const $7f5304fd68d04ed6$var$generateParentKeysArray = (hierarchy, mappedHierarchy, values, changedIndex)=>{
+const $7f5304fd68d04ed6$var$resolveHierarchyValues = (formAPI, hierarchy)=>{
+    return hierarchy.map((name)=>Object.prototype.hasOwnProperty.call(formAPI.form.values, name) ? formAPI.form.values[name] : formAPI.entity.def.columns[name]?.value ?? '');
+};
+const $7f5304fd68d04ed6$var$generateParentKeysArray = (hierarchy, mappedHierarchy, hierarchyValues, changedIndex)=>{
     return hierarchy.map((_, index)=>{
         const parentKeys = {};
         for(let i = 0; i <= index; i++){
             const formValueName = hierarchy[i];
             const mappedName = mappedHierarchy?.[i] || formValueName;
-            parentKeys[mappedName] = changedIndex !== undefined && i > changedIndex ? '' : values[formValueName];
+            parentKeys[mappedName] = changedIndex !== undefined && i > changedIndex ? '' : hierarchyValues[i];
         }
         return parentKeys;
     });
@@ -7397,9 +7400,10 @@ const $7f5304fd68d04ed6$var$areStringArraysEqual = (left, right)=>{
 };
 function $7f5304fd68d04ed6$export$1dc6a021c60990b5(props) {
     const { formAPI: formAPI, hierarchy: hierarchy, mappedHierarchy: mappedHierarchy } = props;
+    const currentHierarchyValues = $7f5304fd68d04ed6$var$resolveHierarchyValues(formAPI, hierarchy);
     const [hierarchyState, setHierarchyState] = (0, $b4te3$react.useState)(()=>({
-            parentKeysArray: $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values),
-            hierarchyValues: hierarchy.map((name)=>formAPI.form.values[name]),
+            parentKeysArray: $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, currentHierarchyValues),
+            hierarchyValues: currentHierarchyValues,
             hierarchy: [
                 ...hierarchy
             ],
@@ -7408,7 +7412,6 @@ function $7f5304fd68d04ed6$export$1dc6a021c60990b5(props) {
             ] : undefined,
             changeRevision: 0
         }));
-    const currentHierarchyValues = hierarchy.map((name)=>formAPI.form.values[name]);
     const isGetLoading = formAPI.status.operationType === 'get' && formAPI.status.loading === true;
     const isExistingRecordMode = formAPI.formMode === 'edit' || formAPI.formMode === 'view';
     const isNewCompletedGet = isExistingRecordMode && formAPI.status.operationType === 'get' && formAPI.status.loading === false && hierarchyState.processedGetStatus !== formAPI.status;
@@ -7422,7 +7425,7 @@ function $7f5304fd68d04ed6$export$1dc6a021c60990b5(props) {
     let resolvedHierarchyState = hierarchyState;
     if (!isGetLoading) {
         const changedIndex = isNewCompletedGet || hierarchyConfigurationChanged ? undefined : detectedChangedIndex === -1 ? hierarchyState.changedIndex : detectedChangedIndex;
-        const newParentKeysArray = $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values, changedIndex);
+        const newParentKeysArray = $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, currentHierarchyValues, changedIndex);
         const parentKeysChanged = !$7f5304fd68d04ed6$var$areParentKeysArraysEqual(hierarchyState.parentKeysArray, newParentKeysArray);
         const hierarchyChanged = isNewCompletedGet || hierarchyConfigurationChanged || detectedChangedIndex !== -1;
         if (parentKeysChanged || hierarchyChanged) {
@@ -36212,6 +36215,8 @@ var $4H7ea = parcelRequire("4H7ea");
 var $iKzSR = parcelRequire("iKzSR");
 parcelRequire("17D0Z");
 var $42GxC = parcelRequire("42GxC");
+
+var $hUJzP = parcelRequire("hUJzP");
 const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, entity: entity, lookupDefName: lookupDefName, column: column, parentKeys: parentKeys, required: required, HTMLDescriptionRef: HTMLDescriptionRef, enableAdd: enableAdd, enableEdit: enableEdit, enableDelete: enableDelete, enableView: enableView, transform: transform })=>{
     const [status, setStatus] = (0, $b4te3$react.useState)({});
     const [previousLookupResult, setPreviousLookupResult] = (0, $b4te3$react.useState)();
@@ -36220,6 +36225,9 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
     const lookupEntity = (0, $b4te3$react.useRef)();
     const viewName = (0, $b4te3$react.useRef)('');
     const lookupDef = (0, $b4te3$react.useRef)();
+    const lookupKeyColumn = (0, $b4te3$react.useRef)();
+    const lookupConfigurationError = (0, $b4te3$react.useRef)();
+    const loggedConfigurationError = (0, $b4te3$react.useRef)();
     const isLooking = (0, $b4te3$react.useRef)(false);
     const lastFocusedElement = (0, $b4te3$react.useRef)();
     const lastValidLookup = (0, $b4te3$react.useRef)();
@@ -36235,7 +36243,16 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
             error: false,
             updateParentKeys: true
         });
-        const mappedKeyColumnName = currentLookupDef.bindingColumnKey ?? bindingColumn;
+        const mappedKeyColumnName = lookupKeyColumn.current;
+        if (!mappedKeyColumnName) return Promise.resolve({
+            columnName: bindingColumn,
+            key: keyValue,
+            description: '',
+            cancel: false,
+            error: true,
+            updateParentKeys: false,
+            errorDescription: lookupConfigurationError.current ?? `Lookup '${currentLookupDef.name}' key column is not initialized.`
+        });
         const prepareLookupValues = (lookupKey)=>{
             // Parent keys provide the lookup context, but the explicit typed or selected
             // key must win when both sources contain the binding column.
@@ -36248,7 +36265,7 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
         };
         prepareLookupValues(keyValue);
         if (parentKeys) currentLookupEntity.parentKeys = parentKeys;
-        return new Promise(async (resolve, reject)=>{
+        return new Promise(async (resolve)=>{
             const doLookup = async (lookupKey = keyValue)=>{
                 const requestValues = prepareLookupValues(lookupKey);
                 const cached = lastValidLookup.current;
@@ -36304,7 +36321,20 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
                 const onOK = async (selectedKeys)=>{
                     //console.log(`OnOK force: ${force} isLooking ${isLooking.current}`);
                     if (selectedKeys.length > 0) {
-                        // MMC: map the binding column using binding column key or the column name
+                        if (!Object.prototype.hasOwnProperty.call(selectedKeys[0], mappedKeyColumnName)) {
+                            const errorDescription = `Lookup '${currentLookupDef.name}' selection does not contain the inferred key column '${mappedKeyColumnName}'.`;
+                            console.error(errorDescription);
+                            resolve({
+                                columnName: bindingColumn,
+                                key: keyValue,
+                                description: '',
+                                cancel: false,
+                                error: true,
+                                updateParentKeys: false,
+                                errorDescription: errorDescription
+                            });
+                            return;
+                        }
                         const selectedKeyValue = selectedKeys[0][mappedKeyColumnName];
                         entityForm.form.setFieldValue(column, selectedKeyValue);
                         //lookupEntity.current!.def.columns[bindingColumn].value = selectedKeys[0][bindingColumn];
@@ -36485,7 +36515,15 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
         lookupEntity.current = lookupDef.current.entityConstructor(entity.API.client, parentKeys);
         const stdview = lookupEntity.current.def.standardView() ?? '';
         viewName.current = lookupDef.current.view ? lookupDef.current.view : stdview;
+        const keyColumnResolution = (0, $hUJzP.resolveLookupKeyColumn)(lookupDef.current, lookupEntity.current, viewName.current, column);
+        lookupKeyColumn.current = keyColumnResolution.columnName;
+        lookupConfigurationError.current = keyColumnResolution.error;
+        if (keyColumnResolution.error && loggedConfigurationError.current !== keyColumnResolution.error) {
+            console.error(keyColumnResolution.error);
+            loggedConfigurationError.current = keyColumnResolution.error;
+        } else if (!keyColumnResolution.error) loggedConfigurationError.current = undefined;
     }, [
+        column,
         entity,
         lookupDefName,
         parentKeys
@@ -36531,6 +36569,38 @@ const $d296e9f4d3930bfd$export$4db9dd7eda56bf7b = ({ entityForm: entityForm, ent
 };
 
 });
+parcelRegister("hUJzP", function(module, exports) {
+
+$parcel$export(module.exports, "resolveLookupKeyColumn", function () { return $e54a93aeccdd45e1$export$d6c095cc4cfabd61; });
+function $e54a93aeccdd45e1$export$d6c095cc4cfabd61(lookupDef, lookupEntity, viewName, bindingColumn) {
+    const validateColumn = (columnName, source)=>{
+        if (lookupEntity.def.columns[columnName]) return {
+            columnName: columnName
+        };
+        return {
+            error: `Lookup '${lookupDef.name}' ${source} resolves to column '${columnName}', but that column does not exist in lookup entity '${lookupEntity.def.name}'.`
+        };
+    };
+    if (lookupDef.bindingColumnKey) return validateColumn(lookupDef.bindingColumnKey, 'bindingColumnKey');
+    const view = lookupEntity.def.views[viewName];
+    if (view) {
+        const keyIndex = lookupDef.viewMapping?.keyIndex ?? 0;
+        const mappedColumns = Object.entries(view.keyMappings).filter(([, resultIndex])=>resultIndex === keyIndex).map(([columnName])=>columnName);
+        if (mappedColumns.length === 1) return validateColumn(mappedColumns[0], `view '${viewName}' key mapping at result index ${keyIndex}`);
+        if (mappedColumns.length > 1) return {
+            error: `Lookup '${lookupDef.name}' view '${viewName}' has multiple key mappings at result index ${keyIndex}. Configure bindingColumnKey explicitly.`
+        };
+    }
+    if (lookupEntity.def.columns[bindingColumn]) return {
+        columnName: bindingColumn
+    };
+    return {
+        error: view ? `Lookup '${lookupDef.name}' cannot infer its key column: view '${viewName}' has no key mapping for result index ${lookupDef.viewMapping?.keyIndex ?? 0}, and lookup entity '${lookupEntity.def.name}' has no column named '${bindingColumn}'.` : `Lookup '${lookupDef.name}' cannot infer its key column: view '${viewName}' was not found in lookup entity '${lookupEntity.def.name}', and the entity has no column named '${bindingColumn}'.`
+    };
+}
+
+});
+