@ruiapp/rapid-core 0.2.0 → 0.2.1

package/dist/index.js

@@ -2691,10 +2691,14 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
         else {
             const filterField = filter.field;
             let property = getEntityPropertyByCode(server, model, filterField);
+            let filterValue = filter.value;
             let columnName = "";
             if (property) {
                 if (isOneRelationProperty(property)) {
                     columnName = property.targetIdColumnName;
+                    if (lodash.isPlainObject(filterValue)) {
+                        filterValue = filterValue.id;
+                    }
                 }
                 else if (isManyRelationProperty(property)) {
                     throw new Error(`Operator "${operator}" is not supported on many-relation property "${property.code}"`);
@@ -2716,6 +2720,9 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     });
                     if (property) {
                         columnName = property.targetIdColumnName;
+                        if (lodash.isPlainObject(filterValue)) {
+                            filterValue = filterValue.id;
+                        }
                     }
                     else {
                         columnName = filterField;
@@ -2729,7 +2736,7 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     name: columnName,
                     tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
-                value: filter.value,
+                value: filterValue,
                 itemType: filter.itemType,
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -24,7 +24,7 @@ import { mapDbRowToEntity, mapEntityToDbRow } from "./entityMapper";
 import { mapPropertyNameToColumnName } from "./propertyMapper";
 import { IRpdServer, RapidPlugin } from "~/core/server";
 import { getEntityPartChanges } from "~/helpers/entityHelpers";
-import { cloneDeep, filter, find, first, forEach, isArray, isNumber, isObject, isString, keys, map, reject, uniq } from "lodash";
+import { cloneDeep, filter, find, first, forEach, isArray, isNumber, isObject, isPlainObject, isString, keys, map, reject, uniq } from "lodash";
 import {
   getEntityPropertiesIncludingBase,
   getEntityProperty,
@@ -526,10 +526,15 @@ async function convertEntityFiltersToRowFilters(
       const filterField = (filter as EntityNonRelationPropertyFilterOptions).field;
       let property: RpdDataModelProperty = getEntityPropertyByCode(server, model, filterField);
 
+      let filterValue = (filter as any).value;
+
       let columnName = "";
       if (property) {
         if (isOneRelationProperty(property)) {
           columnName = property.targetIdColumnName;
+          if (isPlainObject(filterValue)) {
+            filterValue = filterValue.id;
+          }
         } else if (isManyRelationProperty(property)) {
           throw new Error(`Operator "${operator}" is not supported on many-relation property "${property.code}"`);
         } else {
@@ -549,6 +554,9 @@ async function convertEntityFiltersToRowFilters(
 
           if (property) {
             columnName = property.targetIdColumnName;
+            if (isPlainObject(filterValue)) {
+              filterValue = filterValue.id;
+            }
           } else {
             columnName = filterField;
           }
@@ -562,7 +570,7 @@ async function convertEntityFiltersToRowFilters(
           name: columnName,
           tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
-        value: (filter as any).value,
+        value: filterValue,
         itemType: (filter as any).itemType,
       } as any);
     }