From 704d0910f99484bc0f3b2f5cd4a917e43e7cea4d Mon Sep 17 00:00:00 2001 From: Jarrod Flesch Date: Wed, 3 Dec 2025 13:04:27 -0500 Subject: [PATCH] fix(plugin-multi-tenant): tenant modal not appearing when autosave is off --- .../src/fields/tenantField/index.ts | 6 +++--- packages/plugin-multi-tenant/src/index.ts | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/plugin-multi-tenant/src/fields/tenantField/index.ts b/packages/plugin-multi-tenant/src/fields/tenantField/index.ts index 40db09733b8..c5633b19808 100644 --- a/packages/plugin-multi-tenant/src/fields/tenantField/index.ts +++ b/packages/plugin-multi-tenant/src/fields/tenantField/index.ts @@ -32,7 +32,7 @@ const fieldValidation = type Args = { debug?: boolean - isDraftsEnabled?: boolean + isAutosaveEnabled?: boolean name: string overrides?: RootTenantFieldConfigOverrides tenantsArrayFieldName: string @@ -43,7 +43,7 @@ type Args = { export const tenantField = ({ name = defaults.tenantFieldName, debug, - isDraftsEnabled, + isAutosaveEnabled, overrides: _overrides = {}, tenantsArrayFieldName = defaults.tenantsArrayFieldName, tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName, @@ -104,7 +104,7 @@ export const tenantField = ({ }) return isValidTenant ? tenantFromCookie : null } - if (req.user && isDraftsEnabled) { + if (req.user && isAutosaveEnabled) { const userTenants = getUserTenantIDs(req.user, { tenantsArrayFieldName, tenantsArrayTenantFieldName, diff --git a/packages/plugin-multi-tenant/src/index.ts b/packages/plugin-multi-tenant/src/index.ts index be23ad3691a..272ab504630 100644 --- a/packages/plugin-multi-tenant/src/index.ts +++ b/packages/plugin-multi-tenant/src/index.ts @@ -190,10 +190,11 @@ export const multiTenantPlugin = tenantField({ name: tenantFieldName, debug: pluginConfig.debug, - isDraftsEnabled: Boolean( + isAutosaveEnabled: Boolean( collection.versions && typeof collection.versions === 'object' && - collection.versions.drafts, + typeof collection.versions.drafts === 'object' && + Boolean(collection.versions.drafts.autosave), ), overrides: pluginConfig.collections[collection.slug]?.tenantFieldOverrides ? pluginConfig.collections[collection.slug]?.tenantFieldOverrides @@ -381,10 +382,11 @@ export const multiTenantPlugin = tenantField({ name: tenantFieldName, debug: pluginConfig.debug, - isDraftsEnabled: Boolean( + isAutosaveEnabled: Boolean( collection.versions && typeof collection.versions === 'object' && - collection.versions.drafts, + typeof collection.versions.drafts === 'object' && + Boolean(collection.versions.drafts.autosave), ), overrides: pluginConfig.collections[collection.slug]?.tenantFieldOverrides ? pluginConfig.collections[collection.slug]?.tenantFieldOverrides