fix(plugin-multi-tenant): thread hasMany through to filterDocumentsByTenants

Author: PatrikKozak

packages/plugin-multi-tenant/src/filters/filterDocumentsByTenants.ts

@@ -15,6 +15,7 @@ type Args<ConfigType = unknown> = {
    */
   docTenantID?: number | number[] | string | string[]
   filterFieldName: string
+  hasMany?: boolean
   req: PayloadRequest
   tenantsArrayFieldName?: string
   tenantsArrayTenantFieldName?: string
@@ -26,6 +27,7 @@ type Args<ConfigType = unknown> = {
 export const filterDocumentsByTenants = <ConfigType = unknown>({
   docTenantID,
   filterFieldName,
+  hasMany,
   req,
   tenantsArrayFieldName = defaults.tenantsArrayFieldName,
   tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName,
@@ -42,7 +44,9 @@ export const filterDocumentsByTenants = <ConfigType = unknown>({
   if (selectedTenant) {
     return {
       [filterFieldName]: {
-        in: Array.isArray(selectedTenant) ? selectedTenant : [selectedTenant],
+        // When hasMany is true and docTenantID was provided, it's already an array
+        // When using cookie tenant, it's always a single value that needs wrapping
+        in: hasMany && docTenantID !== undefined ? selectedTenant : [selectedTenant],
       },
     }
   }

packages/plugin-multi-tenant/src/index.ts

@@ -169,10 +169,14 @@ export const multiTenantPlugin =
         /**
          * Add filter options to all relationship fields
          */
+        const tenantFieldConfig = pluginConfig.collections[collection.slug]?.tenantFieldOverrides
+          ? pluginConfig.collections[collection.slug]?.tenantFieldOverrides
+          : pluginConfig.tenantField || {}
         collection.fields = addFilterOptionsToFields({
           blockReferencesWithFilters,
           config: incomingConfig,
           fields: collection.fields,
+          hasMany: tenantFieldConfig?.hasMany,
           tenantEnabledCollectionSlugs: collectionSlugs,
           tenantEnabledGlobalSlugs: globalCollectionSlugs,
           tenantFieldName,
@@ -356,10 +360,14 @@ export const multiTenantPlugin =
         /**
          * Add filter options to all relationship fields
          */
+        const tenantFieldConfig = pluginConfig.collections[collection.slug]?.tenantFieldOverrides
+          ? pluginConfig.collections[collection.slug]?.tenantFieldOverrides
+          : pluginConfig.tenantField || {}
         collection.fields = addFilterOptionsToFields({
           blockReferencesWithFilters,
           config: incomingConfig,
           fields: collection.fields,
+          hasMany: tenantFieldConfig?.hasMany,
           tenantEnabledCollectionSlugs: collectionSlugs,
           tenantEnabledGlobalSlugs: globalCollectionSlugs,
           tenantFieldName,
@@ -378,9 +386,7 @@ export const multiTenantPlugin =
               name: tenantFieldName,
               debug: pluginConfig.debug,
               isAutosaveEnabled: hasAutosaveEnabled(collection),
-              overrides: pluginConfig.collections[collection.slug]?.tenantFieldOverrides
-                ? pluginConfig.collections[collection.slug]?.tenantFieldOverrides
-                : pluginConfig.tenantField || {},
+              overrides: tenantFieldConfig,
               tenantsArrayFieldName,
               tenantsArrayTenantFieldName,
               tenantsCollectionSlug,

packages/plugin-multi-tenant/src/utilities/addFilterOptionsToFields.ts

@@ -9,6 +9,7 @@ type AddFilterOptionsToFieldsArgs<ConfigType = unknown> = {
   blockReferencesWithFilters: string[]
   config: Config | SanitizedConfig
   fields: Field[]
+  hasMany?: boolean
   tenantEnabledCollectionSlugs: string[]
   tenantEnabledGlobalSlugs: string[]
   tenantFieldName: string
@@ -24,6 +25,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
   blockReferencesWithFilters,
   config,
   fields,
+  hasMany,
   tenantEnabledCollectionSlugs,
   tenantEnabledGlobalSlugs,
   tenantFieldName,
@@ -66,6 +68,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
       if (hasTenantRelationsips) {
         newField = addRelationshipFilter({
           field: newField as RelationshipField,
+          hasMany,
           tenantEnabledCollectionSlugs,
           tenantFieldName,
           tenantsArrayFieldName,
@@ -86,6 +89,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
         blockReferencesWithFilters,
         config,
         fields: newField.fields,
+        hasMany,
         tenantEnabledCollectionSlugs,
         tenantEnabledGlobalSlugs,
         tenantFieldName,
@@ -119,6 +123,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
             blockReferencesWithFilters,
             config,
             fields: block.fields,
+            hasMany,
             tenantEnabledCollectionSlugs,
             tenantEnabledGlobalSlugs,
             tenantFieldName,
@@ -143,6 +148,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
           blockReferencesWithFilters,
           config,
           fields: tab.fields,
+          hasMany,
           tenantEnabledCollectionSlugs,
           tenantEnabledGlobalSlugs,
           tenantFieldName,
@@ -163,6 +169,7 @@ export function addFilterOptionsToFields<ConfigType = unknown>({
 
 type AddFilterArgs<ConfigType = unknown> = {
   field: RelationshipField
+  hasMany?: boolean
   tenantEnabledCollectionSlugs: string[]
   tenantFieldName: string
   tenantsArrayFieldName: string
@@ -174,6 +181,7 @@ type AddFilterArgs<ConfigType = unknown> = {
 }
 function addRelationshipFilter<ConfigType = unknown>({
   field,
+  hasMany,
   tenantEnabledCollectionSlugs,
   tenantFieldName,
   tenantsArrayFieldName = defaults.tenantsArrayFieldName,
@@ -201,6 +209,7 @@ function addRelationshipFilter<ConfigType = unknown>({
     const tenantFilterResults = filterDocumentsByTenants({
       docTenantID: args.data?.[tenantFieldName],
       filterFieldName: tenantFieldName,
+      hasMany,
       req: args.req,
       tenantsArrayFieldName,
       tenantsArrayTenantFieldName,