@easy-cms/plugin-multi-tenant 1.27.0 → 1.29.0

package/dist/index.js

@@ -55,14 +55,21 @@ import {
   isStaff,
   ValidationError as ValidationError2
 } from "@easy-cms/core";
-import { checkRenamedOptions, MEDIA, MEDIA_FOLDERS } from "@easy-cms/core/internal";
+import {
+  checkRenamedOptions,
+  isPolymorphic,
+  MEDIA,
+  MEDIA_FOLDERS,
+  polymorphicValue,
+  relationTargets
+} from "@easy-cms/core/internal";
 
 // src/info.ts
 var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
   // The plugin API it is written for (`PLUGIN_API_VERSION` of @easy-cms/core).
   apiVersion: 1,
-  ...true ? { version: "1.27.0" } : {}
+  ...true ? { version: "1.29.0" } : {}
 };
 
 // src/members.ts
@@ -327,14 +334,14 @@ function multiTenantPlugin(options) {
           ...field,
           blocks: field.blocks.map((b) => ({ ...b, fields: withTenantFilters(b.fields) }))
         };
-      const target = field.type === "relationship" ? field.to : field.type === "upload" ? MEDIA : null;
-      if (field.type !== "relationship" && field.type !== "upload" || !target || !scoped.has(target))
+      if (field.type !== "relationship" && field.type !== "upload" || !relationTargets(field).some((target) => scoped.has(target)))
         return field;
       const own = field.filterOptions;
       return {
         ...field,
         filterOptions: async (args) => {
           const base = own ? await own(args) : true;
+          if (!scoped.has(args.relationTo)) return base;
           const { tenant } = tenantOf(args.context);
           if (tenant === null) return base;
           const mine = { [TENANT_FIELD]: { equals: tenant } };
@@ -364,9 +371,12 @@ function multiTenantPlugin(options) {
       const { tenant } = tenantOf(context);
       if (tenant !== null) return { ...data, [TENANT_FIELD]: tenant };
       for (const field of fields) {
-        const target = field.type === "relationship" ? field.to : field.type === "upload" ? MEDIA : null;
+        if (field.type !== "relationship" && field.type !== "upload") continue;
+        const first = [data[field.name]].flat()[0];
+        const pair = isPolymorphic(field) ? polymorphicValue(first) : void 0;
+        const target = pair ? pair.relationTo : relationTargets(field)[0];
         if (!target || !scoped.has(target) || field.name === TENANT_FIELD) continue;
-        const value = [data[field.name]].flat()[0];
+        const value = pair ? pair.value : first;
         const id = value && typeof value === "object" ? value.id : value;
         if (id === null || id === void 0) continue;
         if (!cms.config.collections.some((c) => c.slug === target)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/plugin-multi-tenant",
-  "version": "1.27.0",
+  "version": "1.29.0",
   "description": "Multi-tenant Easy CMS: several sites or clients in one CMS, each with its own content, members and roles",
   "license": "MIT",
   "type": "module",
@@ -17,14 +17,14 @@
     "dist"
   ],
   "peerDependencies": {
-    "@easy-cms/core": "^1.27.0"
+    "@easy-cms/core": "^1.29.0"
   },
   "devDependencies": {
-    "@easy-cms/core": "^1.27.0",
-    "@easy-cms/db-sqlite": "^1.27.0",
-    "@easy-cms/plugin-form-builder": "^1.27.0",
-    "@easy-cms/plugin-nested-docs": "^1.27.0",
-    "@easy-cms/plugin-redirects": "^1.27.0"
+    "@easy-cms/core": "^1.29.0",
+    "@easy-cms/db-sqlite": "^1.29.0",
+    "@easy-cms/plugin-form-builder": "^1.29.0",
+    "@easy-cms/plugin-nested-docs": "^1.29.0",
+    "@easy-cms/plugin-redirects": "^1.29.0"
   },
   "engines": {
     "node": ">=22.12"