@cuboapp/api-backend 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",

package/src/helpers/convert.ts

@@ -42,7 +42,8 @@ export class ApiHelpersConvert<T extends CuboApiEntitiesMap<T>> {
 
       const rowValue = get(row, initialValueKey, undefined)
 
-      if (!withEl.entity.id && withEl.entity.alias === 'users') {
+      // todo: fix fields from core
+      if (!withEl.entity && withEl.entity.alias === 'users') {
         userFieldsPrepared.push(withEl.full_key)
 
         switch (rowValue) {

package/src/helpers/query.ts

@@ -54,28 +54,30 @@ export class ApiHelpersQuery<T extends CuboApiEntitiesMap<T>> {
     }
 
     // sort
-    if (sort !== undefined && typeof sort === 'string') {
-      const sortParts = sort.split(',')
+    if (!sorts.length) {
+      if (sort !== undefined && typeof sort === 'string') {
+        const sortParts = sort.split(',')
 
-      for (const sortPart of sortParts) {
-        const parts = sortPart.replace(CUBO_CRUD_QUERY_KEY_REGEX, '')?.split('.')
+        for (const sortPart of sortParts) {
+          const parts = sortPart.replace(CUBO_CRUD_QUERY_KEY_REGEX, '')?.split('.')
 
-        if (parts.length === 1) {
-          const sortDirection = sortPart[0] === '-' ? 'desc' : 'asc'
-          const sortKey = sortPart[0] === '-' ? sortPart.slice(1) : sortPart
+          if (parts.length === 1) {
+            const sortDirection = sortPart[0] === '-' ? 'desc' : 'asc'
+            const sortKey = sortPart[0] === '-' ? sortPart.slice(1) : sortPart
 
-          const conditionField = entity.fields?.find((f) => f.alias === sortKey)
-          const defaultField = CUBO_CRUD_DEFAULT_FIELDS.find((f) => f.alias === sortKey)
+            const conditionField = entity.fields?.find((f) => f.alias === sortKey)
+            const defaultField = CUBO_CRUD_DEFAULT_FIELDS.find((f) => f.alias === sortKey)
 
-          if (!conditionField && !defaultField) {
-            throw new Error('sortPart field "' + sortKey + '" not found')
-          }
+            if (!conditionField && !defaultField) {
+              throw new Error('sortPart field "' + sortKey + '" not found')
+            }
 
-          sorts.push('t1.' + sortKey + ' ' + sortDirection)
+            sorts.push('t1.' + sortKey + ' ' + sortDirection)
+          }
         }
+      } else {
+        sorts.push('t1.id desc')
       }
-    } else {
-      sorts.push('t1.id desc')
     }
 
     // limit & offset

package/src/helpers/withes.ts

@@ -238,9 +238,9 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
     const havings: string[] = [...(opts?.queryOptions?.havings || [])]
     const replacements: Record<string, any> = { ...(opts?.queryOptions?.replacements || {}) }
     const groupBy: string = opts?.queryOptions?.groupBy || undefined
+    const sorts: string[] = opts?.queryOptions?.sorts || []
 
     const withes: CuboCrudWith[] = []
-    const sorts: string[] = []
 
     // from sort key
     if (_sort) {