@ruiapp/rapid-core 0.1.24 → 0.1.26

package/dist/index.js

@@ -1951,6 +1951,10 @@ async function replaceFiltersWithFiltersOperator(server, model, filters) {
             }
         }
         else {
+            const property = lodash.find(model.properties, (property) => property.code === filter.field);
+            if (property) {
+                filter.field = property.columnName || property.code;
+            }
             replacedFilters.push(filter);
         }
     }
@@ -2171,7 +2175,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (Object.keys(row).length) {
         updatedRow = await dataAccessor.updateById(id, row);
     }
-    let updatedEntity = mapDbRowToEntity(model, updatedRow, false);
+    let updatedEntity = mapDbRowToEntity(model, updatedRow, true);
     updatedEntity = Object.assign({}, entity, updatedEntity);
     // save many-relation properties
     for (const property of manyRelationPropertiesToUpdate) {

package/dist/types.d.ts

@@ -278,6 +278,7 @@ export type EntityFilterUnaryOperators = "null" | "notNull";
 export type EntityFilterExistenceOperators = "exists" | "notExists";
 export type EntityFilterOperators = EntityFilterRelationalOperators | EntityFilterSetOperators | EntityFilterLogicalOperators | EntityFilterUnaryOperators | EntityFilterExistenceOperators;
 export type EntityFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityLogicalFilterOptions | FindEntityUnaryFilterOptions | FindEntityExistenceFilterOptions;
+export type EntityNonRelationPropertyFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityUnaryFilterOptions;
 export interface FindEntityOptions {
     filters?: EntityFilterOptions[];
     orderBy?: FindEntityOrderByOptions[];

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -5,6 +5,7 @@ import {
   CreateEntityOptions,
   EntityFilterOperators,
   EntityFilterOptions,
+  EntityNonRelationPropertyFilterOptions,
   FindEntityOptions,
   FindEntityOrderByOptions,
   IRpdDataAccessor,
@@ -335,6 +336,13 @@ async function replaceFiltersWithFiltersOperator(
         });
       }
     } else {
+      const property: RpdDataModelProperty = find(
+        model.properties,
+        (property: RpdDataModelProperty) => property.code === (filter as EntityNonRelationPropertyFilterOptions).field,
+      );
+      if (property) {
+        (filter as EntityNonRelationPropertyFilterOptions).field = property.columnName || property.code;
+      }
       replacedFilters.push(filter);
     }
   }
@@ -602,7 +610,7 @@ async function updateEntityById(
   if (Object.keys(row).length) {
     updatedRow = await dataAccessor.updateById(id, row);
   }
-  let updatedEntity = mapDbRowToEntity(model, updatedRow, false);
+  let updatedEntity = mapDbRowToEntity(model, updatedRow, true);
   updatedEntity = Object.assign({}, entity, updatedEntity);
 
   // save many-relation properties

package/src/types.ts

@@ -378,6 +378,11 @@ export type EntityFilterOptions =
   | FindEntityUnaryFilterOptions
   | FindEntityExistenceFilterOptions;
 
+export type  EntityNonRelationPropertyFilterOptions =
+  | FindEntityRelationalFilterOptions
+  | FindEntitySetFilterOptions
+  | FindEntityUnaryFilterOptions;
+
 export interface FindEntityOptions {
   filters?: EntityFilterOptions[];
   orderBy?: FindEntityOrderByOptions[];