@live-change/relations-plugin 0.7.1 → 0.7.3

package/entity.js

@@ -7,6 +7,14 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, E
 
 const annotation = 'entity'
 
+function entityAccessControl({service, modelName, modelPropertyName}, accessControl) {
+  if(!accessControl) return undefined
+  return {
+    objects: p => [{ objectType: service.name + '_' + modelName, object: p[modelPropertyName]}],
+    ...accessControl
+  }
+}
+
 function defineView(config, context) {
   const { service, modelRuntime, modelPropertyName, modelName, others, model } = context
   const viewName = (config.prefix || '' ) + (config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
@@ -22,7 +30,7 @@ function defineView(config, context) {
       type: model,
     },
     access: config.access,
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    accessControl: entityAccessControl(context, config.readAccessControl || config.writeAccessControl),
     daoPath(properties, { client, context }) {
       const id = properties[modelPropertyName]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
@@ -87,7 +95,7 @@ function defineCreateAction(config, context) {
       ...(model.properties)
     },
     access: config.createAccess || config.writeAccess,
-    accessControl: config.createAccessControl || config.writeAccessControl,
+    accessControl: entityAccessControl(context, config.createAccessControl || config.writeAccessControl),
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -103,6 +111,7 @@ function defineCreateAction(config, context) {
         [modelPropertyName]: id,
         data
       })
+      return id
     }
   })
   const action = service.actions[actionName]
@@ -125,7 +134,7 @@ function defineUpdateAction(config, context) {
       }
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.updateAccessControl || config.writeAccessControl,
+    accessControl: entityAccessControl(context, config.updateAccessControl || config.writeAccessControl),
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -163,7 +172,7 @@ function defineDeleteAction(config, context) {
       }
     },
     access: config.deleteAccess || config.writeAccess,
-    accessControl: config.deleteAccessControl || config.writeAccessControl,
+    accessControl: entityAccessControl(context, config.deleteAccessControl || config.writeAccessControl),
     skipValidation: true,
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.7.1",
+    "@live-change/framework": "^0.7.3",
     "pluralize": "8.0.0"
   },
-  "gitHead": "c2c41e3aae59956b71e22a035b813f8df7836057"
+  "gitHead": "678a56933a707927dc21360670f47333159cc2f6"
 }

package/pluralRelationAnyUtils.js

@@ -79,6 +79,7 @@ function defineCreateAction(config, context) {
         [modelPropertyName]: id,
         identifiers, data
       })
+      return id
     }
   })
   const action = service.actions[actionName]

package/pluralRelationUtils.js

@@ -73,6 +73,7 @@ function defineCreateAction(config, context) {
         [modelPropertyName]: id,
         identifiers, data
       })
+      return id
     }
   })
   const action = service.actions[actionName]

package/utilsAny.js

@@ -24,6 +24,12 @@ function extractIdentifiersWithTypes(otherPropertyNames, properties) {
 }
 
 function generateAnyId(otherPropertyNames, properties) {
+  console.log("GEN ID", otherPropertyNames, properties, '=>',
+    otherPropertyNames
+      .map(p => [p+'Type', p])
+      .flat()
+      .map(p => JSON.stringify(properties[p])).join(':'))
+
   return otherPropertyNames
       .map(p => [p+'Type', p])
       .flat()