yaml-admin-api 0.0.41 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/entity-api-generator.js

@@ -210,8 +210,14 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             }
         })
 
-        //console.log('f', f)
-        //console.log('s', s)
+        if(req.query['id']) {
+            let array = req.query['id']
+            if(Array.isArray(array)) {
+                f[key_field.name] = { $in: array.map(v => parseKey(v)) }
+            } else {
+                f[key_field.name] = parseKey(array)
+            }
+        }
 
         var name = req.query.name;
         if (name == null && req.query.q)
@@ -237,6 +243,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             console.log('list', entity_name, 'found', count)
         
         await addInfo(db, list)
+        if(options?.listener?.entityListed)
+            await options.listener.entityListed(db, entity_name, list)
 
         res.header('X-Total-Count', count);
         res.json(list);
@@ -309,7 +317,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
         var r = await db.collection(entity_name).insertOne(entity);
         //Custom Create Tail Start
-        options?.listener?.entityCreated?.(db, entity_name, entity)
+        if(options?.listener?.entityCreated)
+            await options.listener.entityCreated(db, entity_name, entity)
         //Custom Create Tail End
 
         const generatedId = entityId || r.insertedId
@@ -350,7 +359,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         await db.collection(entity_name).updateOne(f, { $set: entity });
 
         //Custom Create Tail Start
-        options?.listener?.entityUpdated?.(db, entity_name, entity)
+        if(options?.listener?.entityUpdated)
+            await options.listener.entityUpdated(db, entity_name, entity)
         //Custom Create Tail End
 
         // Ensure React-Admin receives an `id` in the response
@@ -370,6 +380,9 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         m.id = getKeyFromEntity(m)
         await addInfo(db, [m])
 
+        if(yml.debug)
+            console.log('show', entity_name, m)
+        
         res.json(m);
     }))
 
@@ -396,7 +409,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         else
             await db.collection(entity_name).deleteOne(f);
 
-        options?.listener?.entityDeleted?.(db, entity_name, entity)
+        if(options?.listener?.entityDeleted)
+            await options.listener.entityDeleted(db, entity_name, entity)
 
         res.json(entity);
     }));
@@ -601,7 +615,6 @@ const makeApiGenerateFields = async (db, entity_name, yml_entity, yml, options,
         
         let match_from_list = data_list.map(m=>matchPathInObject(m, match_from))
         match_from_list = match_from_list.filter(m=>m)
-        const f = { [match]: {$in:match_from_list} }
         const projection = {[match]:1}
 
         const aggregate = [
@@ -610,7 +623,7 @@ const makeApiGenerateFields = async (db, entity_name, yml_entity, yml, options,
 
         if(field)
             projection[field] = 1
-        else {
+        else if(fields){
             fields.map(m=>{
                 projection[m.name] = 1
             })
@@ -618,9 +631,13 @@ const makeApiGenerateFields = async (db, entity_name, yml_entity, yml, options,
             fields.map(m=>{
                 if(m.type == 'reference') {
                     let project = { _id: 0 }
-                    m.fields.map(f=>{
-                        project[f.name] = 1
-                    })
+
+                    if(m.field)
+                        project[m.field] = 1
+                    else
+                        m.fields.map(f=>{
+                            project[f.name] = 1
+                        })
 
                     aggregate.push({ $lookup: {
                         from: m.reference_entity,
@@ -633,6 +650,9 @@ const makeApiGenerateFields = async (db, entity_name, yml_entity, yml, options,
                     } })
                     if(m.single)
                         aggregate.push({ $unwind: `$${m.name}` })
+                
+                    if(m.field)
+                        aggregate.push({ $addFields: { [m.field]: `$${m.name}.${m.field}` } })
                 }
             })
         }