@ruiapp/rapid-core 0.1.43 → 0.1.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +7 -1
  2. package/package.json +1 -1
  3. package/src/dataAccess/entityManager.ts +8 -1
package/dist/index.js CHANGED
@@ -1960,6 +1960,9 @@ function convertEntityOrderByToRowOrderBy(server, model, baseModel, orderByList)
1960
1960
  if (!property) {
1961
1961
  property = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === orderBy.field);
1962
1962
  }
1963
+ if (!property) {
1964
+ property = getEntityProperty(server, model, (item) => item.columnName === orderBy.field);
1965
+ }
1963
1966
  if (!property) {
1964
1967
  throw new Error(`Unkown orderBy field '${orderBy.field}'`);
1965
1968
  }
@@ -2262,7 +2265,10 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
2262
2265
  }
2263
2266
  }
2264
2267
  else {
2265
- const property = getEntityPropertyByCode(server, model, filter.field);
2268
+ const property = getEntityProperty(server, model, (property) => {
2269
+ const field = filter.field;
2270
+ return property.code === field || property.columnName === field || property.targetIdColumnName === field;
2271
+ });
2266
2272
  // TODO: do not use `any` here
2267
2273
  replacedFilters.push({
2268
2274
  operator: filter.operator,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ruiapp/rapid-core",
3
- "version": "0.1.43",
3
+ "version": "0.1.45",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/dataAccess/entityManager.ts CHANGED
@@ -36,6 +36,10 @@ function convertEntityOrderByToRowOrderBy(server: IRpdServer, model: RpdDataMode
36
36
  property = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === orderBy.field);
37
37
  }
38
38
 
39
+ if (!property) {
40
+ property = getEntityProperty(server, model, (item) => item.columnName === orderBy.field);
41
+ }
42
+
39
43
  if (!property) {
40
44
  throw new Error(`Unkown orderBy field '${orderBy.field}'`);
41
45
  }
@@ -359,7 +363,10 @@ async function convertEntityFiltersToRowFilters(server: IRpdServer, model: RpdDa
359
363
  });
360
364
  }
361
365
  } else {
362
- const property: RpdDataModelProperty = getEntityPropertyByCode(server, model, (filter as EntityNonRelationPropertyFilterOptions).field);
366
+ const property: RpdDataModelProperty = getEntityProperty(server, model, (property) => {
367
+ const field = (filter as EntityNonRelationPropertyFilterOptions).field;
368
+ return property.code === field || property.columnName === field || property.targetIdColumnName === field;
369
+ });
363
370
  // TODO: do not use `any` here
364
371
  replacedFilters.push({
365
372
  operator: filter.operator,