@live-change/relations-plugin 0.6.10 → 0.6.11

package/itemOfAny.js

@@ -27,7 +27,7 @@ module.exports = function(service, app) {
       }
     }
 
-    if(config.readAccess || config.readAccessControl || config.writeAccessControl) {
+    if(config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl) {
       defineView(config, context)
       // TODO: multiple views with all properties combinations
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.6.10",
+    "@live-change/framework": "^0.6.11",
     "pluralize": "8.0.0"
   },
-  "gitHead": "94daf36c87486b4241b752080c926995b27827d2"
+  "gitHead": "99d448214c2df44f42e5d25a08fa50ae79e5bdbe"
 }

package/pluralRelationAnyUtils.js

@@ -21,6 +21,13 @@ function defineView(config, context) {
       validation: ['nonEmpty']
     })
   }
+  const accessControl = config.readAccessControl || config.writeAccessControl
+  if(typeof accessControl == 'object') {
+    accessControl.objects = accessControl.objects ?? ((params) => otherPropertyNames.map(name => ({
+      objectType: params[name + 'Type'],
+      object: params[name]
+    })))
+  }
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
@@ -34,8 +41,8 @@ function defineView(config, context) {
         type: model
       }
     },
-    access: config.readAccess,
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    access: config.readAccess || config.writeAccess,
+    accessControl,
     daoPath(properties, { client, context }) {
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
       const range = extractRange(properties)

package/propertyOfAny.js

@@ -22,9 +22,11 @@ module.exports = function(service, app) {
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames)
 
-    if(config.readAccess) {
-      defineObjectView({ ...config, access: config.readAccess }, context)
-      defineRangeViews({ ...config, access: config.readAccess }, context)
+    if(config.singleAccess || config.readAccess || config.singleAccessControl || config.readAccessControl) {
+      defineObjectView(config, context)
+    }
+    if(config.listAccess || config.readAccess || config.listAccessControl || config.readAccessControl) {
+      defineRangeViews(config, context)
     }
     if(config.views) {
       for(const view of config.views) {

package/singularRelationAnyUtils.js

@@ -35,6 +35,13 @@ function defineObjectView(config, context) {
       validation: ['nonEmpty']
     })
   }
+  const accessControl = config.singleAccessControl || config.readAccessControl || config.writeAccessControl
+  if(typeof accessControl == 'object') {
+    accessControl.objects = accessControl.objects ?? ((params) => otherPropertyNames.map(name => ({
+      objectType: params[name + 'Type'],
+      object: params[name]
+    })))
+  }
   const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
       context.reverseRelationWord + modelName + (config.suffix || ''))
   service.views[viewName] = new ViewDefinition({
@@ -45,8 +52,8 @@ function defineObjectView(config, context) {
     returns: {
       type: model,
     },
-    access: config.readAccess,
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    access: config.singleAccess || config.readAccess,
+    accessControl,
     daoPath(properties, { client, context }) {
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
       const id = typeAndIdParts.length > 1 ? typeAndIdParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
@@ -73,9 +80,8 @@ function defineRangeViews(config, context) {
         ...identifiers,
         ...App.rangeProperties,
       },
-      access(params, context) {
-        return config.access ? config.access(params, context) : true
-      },
+      access: config.listAccess || config.readAccess,
+      accessControl: config.listAccessControl || config.readAccessControl || config.writeAccessControl,
       daoPath(params, { client, context }) {
         const owner = []
         for (const key of combination) {