@easy-cms/plugin-multi-tenant 0.44.0 → 0.46.0

package/dist/index.js

@@ -61,7 +61,7 @@ import {
 // src/info.ts
 var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
-  ...true ? { version: "0.44.0" } : {}
+  ...true ? { version: "0.46.0" } : {}
 };
 
 // src/members.ts
@@ -263,7 +263,9 @@ function multiTenantPlugin(options) {
           ...field,
           blocks: field.blocks.map((b) => ({ ...b, fields: withTenantFilters(b.fields) }))
         };
-      if (field.type !== "relationship" || !scoped.has(field.to)) return field;
+      const target = field.type === "relationship" ? field.to : field.type === "upload" ? MEDIA : null;
+      if (field.type !== "relationship" && field.type !== "upload" || !target || !scoped.has(target))
+        return field;
       const own = field.filterOptions;
       return {
         ...field,
@@ -284,12 +286,31 @@ function multiTenantPlugin(options) {
       position: "sidebar",
       label: { en: "Tenant", th: "Tenant" },
       // Set from the tenant the request works in; only users with access to all tenants choose.
-      access: { update: ({ user, context }) => superUser(user, context) }
+      access: { update: ({ user, context }) => superUser(user, context) },
+      admin: {
+        // New documents start in the chosen tenant.
+        defaultValue: ({ context }) => tenantOf(context).tenant ?? void 0,
+        // A column while every tenant is shown.
+        column: ({ user, context }) => superUser(user, context) && tenantOf(context).tenant === null,
+        allowCreate: false
+      }
     };
-    const fillTenant = ({ data, operation, context }) => {
+    const fillTenant = (fields) => async ({ data, operation, context, cms }) => {
       if (operation !== "create" || (data[TENANT_FIELD] ?? null) !== null) return data;
       const { tenant } = tenantOf(context);
-      return tenant === null ? data : { ...data, [TENANT_FIELD]: tenant };
+      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 (!target || !scoped.has(target) || field.name === TENANT_FIELD) continue;
+        const value = [data[field.name]].flat()[0];
+        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;
+        const doc = await cms.findById(target, id, { depth: 0, draft: true });
+        const owner = doc?.[TENANT_FIELD];
+        if (owner !== null && owner !== void 0) return { ...data, [TENANT_FIELD]: owner };
+      }
+      return data;
     };
     const checkTenant = (slug) => ({ data, operation, originalDoc, context, user }) => {
       const value = data[TENANT_FIELD] ?? null;
@@ -309,7 +330,15 @@ function multiTenantPlugin(options) {
     const scopeCollection = (c, builtin) => {
       const fields = withTenantFilters(
         c.fields.map(
-          (f) => (f.unique || f.type === "slug") && f.uniqueWithin === void 0 ? { ...f, uniqueWithin: TENANT_FIELD } : f
+          (f) => f.unique || f.type === "slug" ? {
+            ...f,
+            uniqueWithin: [
+              .../* @__PURE__ */ new Set([
+                ...f.uniqueWithin === void 0 ? [] : [f.uniqueWithin].flat(),
+                TENANT_FIELD
+              ])
+            ]
+          } : f
         )
       );
       const access = { ...builtin, ...c.access };
@@ -324,7 +353,7 @@ function multiTenantPlugin(options) {
         },
         hooks: {
           ...c.hooks,
-          beforeValidate: [fillTenant, ...c.hooks?.beforeValidate ?? []],
+          beforeValidate: [fillTenant(c.fields), ...c.hooks?.beforeValidate ?? []],
           beforeChange: [...c.hooks?.beforeChange ?? [], checkTenant(c.slug)]
         }
       };
@@ -387,7 +416,11 @@ function multiTenantPlugin(options) {
       labels: { singular: { en: "Tenant", th: "Tenant" }, plural: { en: "Tenants", th: "Tenant" } },
       icon: "building",
       useAsTitle: "name",
-      admin: { group: "settings" },
+      admin: {
+        group: "settings",
+        // Deleting a tenant deletes its content: its name is typed, and what goes is shown.
+        confirmDelete: { typeTitle: true, impact: "/tenant-impact" }
+      },
       access: tenantsAccess,
       hooks: {
         afterChange: [({ cms }) => forgetTenants(cms)],
@@ -453,7 +486,16 @@ function multiTenantPlugin(options) {
     if (!hasUsers) collections.push({ slug: "users", fields: [memberships], access: usersAccess() });
     for (const builtin of [MEDIA, MEDIA_FOLDERS]) {
       if (scoped.has(builtin) && !declared.has(builtin))
-        collections.push(scopeCollection({ slug: builtin, fields: [] }, BUILTIN_ACCESS[builtin]));
+        collections.push(
+          scopeCollection(
+            {
+              slug: builtin,
+              // The built-in `key` of folders: unique per tenant (merged into the built-in field).
+              fields: builtin === MEDIA_FOLDERS ? [{ name: "key", type: "text", unique: true }] : []
+            },
+            BUILTIN_ACCESS[builtin]
+          )
+        );
     }
     const globals = (config.globals ?? []).map((g) => {
       const filtered = { ...g, fields: withTenantFilters(g.fields) };
@@ -480,11 +522,11 @@ function multiTenantPlugin(options) {
       );
       const bound = user?.apiKey?.permissions?.context;
       const boundTenant = bound ? tenantOf(bound) : void 0;
-      if (user && isSuper(user) && (!boundTenant || boundTenant.tenant === null)) {
+      if (user && user.member !== true && isSuper(user) && (!boundTenant || boundTenant.tenant === null)) {
         const chosen2 = asked === ALL ? void 0 : findTenant(list, asked);
         return { user, context: { ...context, tenant: chosen2?.id ?? null, allTenants: true } };
       }
-      if (user) {
+      if (user && user.member !== true) {
         const mine = membershipsOf(user);
         const member = (t) => t ? mine.find((m) => sameId(m.tenant, t.id)) : void 0;
         const membership = boundTenant && boundTenant.tenant !== null ? mine.find((m) => sameId(m.tenant, boundTenant.tenant)) ?? (isSuper(user) ? { tenant: boundTenant.tenant, role: user.role } : void 0) : member(findTenant(list, asked)) ?? member(byHost) ?? mine.find((m) => list.some((t) => sameId(t.id, m.tenant)));
@@ -517,6 +559,39 @@ function multiTenantPlugin(options) {
         };
       }
     };
+    const impactEndpoint = {
+      path: "/tenant-impact",
+      method: "get",
+      handler: async ({ user, context, cms, url }) => {
+        if (!superUser(user, context))
+          return Response.json({ errors: [{ message: "Not allowed" }] }, { status: 403 });
+        const raw = url.searchParams.get("id") ?? "";
+        const id = /^\d+$/.test(raw) ? Number(raw) : raw;
+        const counts = [];
+        for (const slug of scoped) {
+          const config2 = cms.config.collections.find((c) => c.slug === slug);
+          if (!config2) continue;
+          const n = await cms.count(slug, { where: { [TENANT_FIELD]: { equals: id } } });
+          if (n === 0) continue;
+          const plural = config2.labels?.plural;
+          const en = typeof plural === "string" ? plural : plural?.en ?? slug;
+          const th = typeof plural === "string" ? plural : plural?.th ?? en;
+          counts.push({ en: `${n} ${en}`, th: `${th} ${n} \u0E23\u0E32\u0E22\u0E01\u0E32\u0E23` });
+        }
+        const members = await cms.count("users", {
+          where: { [`${MEMBERSHIPS_FIELD}.tenant`]: { equals: id } }
+        });
+        return {
+          message: counts.length ? {
+            en: `Also deleted: ${counts.map((c) => c.en).join(", ")}. ${members} members lose this tenant; their accounts stay.`,
+            th: `\u0E08\u0E30\u0E25\u0E1A\u0E44\u0E1B\u0E14\u0E49\u0E27\u0E22: ${counts.map((c) => c.th).join(", ")} \u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01 ${members} \u0E04\u0E19\u0E08\u0E30\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01 tenant \u0E19\u0E35\u0E49 \u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E22\u0E31\u0E07\u0E2D\u0E22\u0E39\u0E48`
+          } : {
+            en: `It has no content. ${members} members lose this tenant; their accounts stay.`,
+            th: `\u0E44\u0E21\u0E48\u0E21\u0E35\u0E40\u0E19\u0E37\u0E49\u0E2D\u0E2B\u0E32 \u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01 ${members} \u0E04\u0E19\u0E08\u0E30\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01 tenant \u0E19\u0E35\u0E49 \u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E22\u0E31\u0E07\u0E2D\u0E22\u0E39\u0E48`
+          }
+        };
+      }
+    };
     const assign = {
       name: "tenants:assign",
       description: "Give documents without a tenant to one (after adding the plugin to a site)",
@@ -535,24 +610,34 @@ of its own. Run it once after adding the plugin to a site that has content.
         }
         for (const slug of scoped) {
           if (!cms.config.collections.some((c) => c.slug === slug)) continue;
-          let updated = 0;
-          for (; ; ) {
-            const { docs } = await cms.find(slug, {
+          const ids = [];
+          for (let page = 1; ; page++) {
+            const { docs, hasNextPage } = await cms.find(slug, {
               where: { [TENANT_FIELD]: { exists: false } },
-              limit: 100,
+              sort: "id",
+              limit: 500,
+              page,
               depth: 0,
               draft: true
             });
-            if (docs.length === 0) break;
-            for (const doc of docs) {
-              await cms.update(slug, doc.id, { [TENANT_FIELD]: tenant.id }, {
+            ids.push(...docs.map((d) => d.id));
+            if (!hasNextPage) break;
+          }
+          let updated = 0;
+          const skipped = [];
+          for (const id of ids) {
+            try {
+              await cms.update(slug, id, { [TENANT_FIELD]: tenant.id }, {
                 depth: 0,
                 live: true
               });
               updated++;
+            } catch (error) {
+              skipped.push(`${slug} ${id}: ${error.message}`);
             }
           }
           log(`${slug}: ${updated} given to ${tenant.name}`);
+          for (const line of skipped) log(`  not given: ${line}`);
         }
         const context = { tenant: tenant.id, allTenants: false };
         for (const slug of perTenant) {
@@ -575,9 +660,20 @@ of its own. Run it once after adding the plugin to a site that has content.
       endpoints: [
         ...config.endpoints ?? [],
         optionsEndpoint,
+        impactEndpoint,
         ...membersEndpoints({ tenantsSlug, superUser })
       ],
       commands: [...config.commands ?? [], assign],
+      // Audit log entries belong to their tenant: its admins see them.
+      ...config.audit ? {
+        audit: {
+          ...config.audit === true ? {} : config.audit,
+          scope: (context) => {
+            const { tenant } = tenantOf(context);
+            return tenant === null ? null : String(tenant);
+          }
+        }
+      } : {},
       admin: {
         ...config.admin,
         modules: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/plugin-multi-tenant",
-  "version": "0.44.0",
+  "version": "0.46.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,11 +17,14 @@
     "dist"
   ],
   "peerDependencies": {
-    "@easy-cms/core": "^0.44.0"
+    "@easy-cms/core": "^0.46.0"
   },
   "devDependencies": {
-    "@easy-cms/db-sqlite": "^0.44.0",
-    "@easy-cms/core": "^0.44.0"
+    "@easy-cms/core": "^0.46.0",
+    "@easy-cms/db-sqlite": "^0.46.0",
+    "@easy-cms/plugin-form-builder": "^0.46.0",
+    "@easy-cms/plugin-nested-docs": "^0.46.0",
+    "@easy-cms/plugin-redirects": "^0.46.0"
   },
   "engines": {
     "node": ">=22.12"