@payloadcms/plugin-multi-tenant 3.69.0-internal.5029b68 → 3.70.0-canary.0

package/dist/providers/TenantSelectionProvider/index.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/providers/TenantSelectionProvider/index.client.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAI3C,OAAO,KAAwB,MAAM,OAAO,CAAA;AAI5C,KAAK,WAAW,GAAG;IACjB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB;;OAEG;IACH,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAC7C;;OAEG;IACH,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAA;IACtF;;OAEG;IACH,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;IAC1D;;;;;OAKG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAA;IACjF;;OAEG;IACH,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC;;OAEG;IACH,aAAa,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CACtE,CAAA;AA+CD,eAAO,MAAM,6BAA6B,6EAKvC;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,oBAAoB,EAAE,YAAY,EAAE,CAAA;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;CAC9B,sBAsKA,CAAA;AAED,eAAO,MAAM,kBAAkB,mBAA2B,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/providers/TenantSelectionProvider/index.client.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3C,OAAO,KAAwB,MAAM,OAAO,CAAA;AAI5C,KAAK,WAAW,GAAG;IACjB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB;;OAEG;IACH,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAC7C;;OAEG;IACH,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAA;IACtF;;OAEG;IACH,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;IAC1D;;;;;OAKG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAA;IACjF;;OAEG;IACH,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC;;OAEG;IACH,aAAa,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CACtE,CAAA;AA+CD,eAAO,MAAM,6BAA6B,6EAKvC;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,oBAAoB,EAAE,YAAY,EAAE,CAAA;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;CAC9B,sBAyKA,CAAA;AAED,eAAO,MAAM,kBAAkB,mBAA2B,CAAA"}

package/dist/providers/TenantSelectionProvider/index.client.js

@@ -2,6 +2,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { toast, useAuth, useConfig } from '@payloadcms/ui';
 import { useRouter } from 'next/navigation.js';
+import { formatAdminURL } from 'payload/shared';
 import React, { createContext } from 'react';
 import { generateCookie } from '../../utilities/generateCookie.js';
 const Context = /*#__PURE__*/ createContext({
@@ -110,7 +111,10 @@ export const TenantSelectionProviderClient = ({ children, initialTenantOptions,
     ]);
     const syncTenants = React.useCallback(async ()=>{
         try {
-            const req = await fetch(`${config.serverURL}${config.routes.api}/${tenantsCollectionSlug}/populate-tenant-options`, {
+            const req = await fetch(formatAdminURL({
+                apiRoute: config.routes.api,
+                path: `/${tenantsCollectionSlug}/populate-tenant-options`
+            }), {
                 credentials: 'include',
                 method: 'GET'
             });
@@ -128,7 +132,6 @@ export const TenantSelectionProviderClient = ({ children, initialTenantOptions,
             toast.error(`Error fetching tenants`);
         }
     }, [
-        config.serverURL,
         config.routes.api,
         tenantsCollectionSlug,
         userID

package/dist/providers/TenantSelectionProvider/index.client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/providers/TenantSelectionProvider/index.client.tsx"],"sourcesContent":["'use client'\n\nimport type { OptionObject } from 'payload'\n\nimport { toast, useAuth, useConfig } from '@payloadcms/ui'\nimport { useRouter } from 'next/navigation.js'\nimport React, { createContext } from 'react'\n\nimport { generateCookie } from '../../utilities/generateCookie.js'\n\ntype ContextType = {\n  /**\n   * What is the context of the selector? It is either 'document' | 'global' | undefined.\n   *\n   * - 'document' means you are viewing a document in the context of a tenant\n   * - 'global' means you are viewing a \"global\" (globals are collection documents but prevent you from viewing the list view) document in the context of a tenant\n   * - undefined means you are not viewing a document at all\n   */\n  entityType?: 'document' | 'global'\n  /**\n   * Hoists the forms modified state\n   */\n  modified?: boolean\n  /**\n   * Array of options to select from\n   */\n  options: OptionObject[]\n  /**\n   * The currently selected tenant ID\n   */\n  selectedTenantID: number | string | undefined\n  /**\n   * Sets the entityType when a document is loaded and sets it to undefined when the document unmounts.\n   */\n  setEntityType: React.Dispatch<React.SetStateAction<'document' | 'global' | undefined>>\n  /**\n   * Sets the modified state\n   */\n  setModified: React.Dispatch<React.SetStateAction<boolean>>\n  /**\n   * Sets the selected tenant ID\n   *\n   * @param args.id - The ID of the tenant to select\n   * @param args.refresh - Whether to refresh the page after changing the tenant\n   */\n  setTenant: (args: { id: number | string | undefined; refresh?: boolean }) => void\n  /**\n   * Used to sync tenants displayed in the tenant selector when updates are made to the tenants collection.\n   */\n  syncTenants: () => Promise<void>\n  /**\n   *\n   */\n  updateTenants: (args: { id: number | string; label: string }) => void\n}\n\nconst Context = createContext<ContextType>({\n  entityType: undefined,\n  options: [],\n  selectedTenantID: undefined,\n  setEntityType: () => undefined,\n  setModified: () => undefined,\n  setTenant: () => null,\n  syncTenants: () => Promise.resolve(),\n  updateTenants: () => null,\n})\n\nconst DEFAULT_COOKIE_NAME = 'payload-tenant'\n\nconst setTenantCookie = (args: { cookieName?: string; value: string }) => {\n  const { cookieName = DEFAULT_COOKIE_NAME, value } = args\n  document.cookie = generateCookie<string>({\n    name: cookieName,\n    maxAge: 60 * 60 * 24 * 365, // 1 year in seconds\n    path: '/',\n    returnCookieAsObject: false,\n    value: value || '',\n  })\n}\n\nconst deleteTenantCookie = (args: { cookieName?: string } = {}) => {\n  const { cookieName = DEFAULT_COOKIE_NAME } = args\n  document.cookie = generateCookie<string>({\n    name: cookieName,\n    maxAge: -1,\n    path: '/',\n    returnCookieAsObject: false,\n    value: '',\n  })\n}\n\nconst getTenantCookie = (args: { cookieName?: string } = {}): string | undefined => {\n  const { cookieName = DEFAULT_COOKIE_NAME } = args\n  const value = `; ${document.cookie}`\n  const parts = value.split(`; ${cookieName}=`)\n  if (parts.length === 2) {\n    return parts.pop()?.split(';').shift()\n  }\n  return undefined\n}\n\nexport const TenantSelectionProviderClient = ({\n  children,\n  initialTenantOptions,\n  initialValue,\n  tenantsCollectionSlug,\n}: {\n  children: React.ReactNode\n  initialTenantOptions: OptionObject[]\n  initialValue?: number | string\n  tenantsCollectionSlug: string\n}) => {\n  const [selectedTenantID, setSelectedTenantID] = React.useState<number | string | undefined>(\n    initialValue,\n  )\n  const [modified, setModified] = React.useState<boolean>(false)\n  const [entityType, setEntityType] = React.useState<'document' | 'global' | undefined>(undefined)\n  const { user } = useAuth()\n  const { config } = useConfig()\n  const router = useRouter()\n  const userID = React.useMemo(() => user?.id, [user?.id])\n  const prevUserID = React.useRef(userID)\n  const userChanged = userID !== prevUserID.current\n  const [tenantOptions, setTenantOptions] = React.useState<OptionObject[]>(\n    () => initialTenantOptions,\n  )\n  const selectedTenantLabel = React.useMemo(\n    () => tenantOptions.find((option) => option.value === selectedTenantID)?.label,\n    [selectedTenantID, tenantOptions],\n  )\n\n  const setTenantAndCookie = React.useCallback(\n    ({ id, refresh }: { id: number | string | undefined; refresh?: boolean }) => {\n      setSelectedTenantID(id)\n      if (id !== undefined) {\n        setTenantCookie({ value: String(id) })\n      } else {\n        deleteTenantCookie()\n      }\n      if (refresh) {\n        router.refresh()\n      }\n    },\n    [router],\n  )\n\n  const setTenant = React.useCallback<ContextType['setTenant']>(\n    ({ id, refresh }) => {\n      if (id === undefined) {\n        if (tenantOptions.length > 1 || tenantOptions.length === 0) {\n          // users with multiple tenants can clear the tenant selection\n          setTenantAndCookie({ id: undefined, refresh })\n        } else if (tenantOptions[0]) {\n          // if there is only one tenant, auto-select that tenant\n          setTenantAndCookie({ id: tenantOptions[0].value, refresh: true })\n        }\n      } else if (!tenantOptions.find((option) => option.value === id)) {\n        // if the tenant is invalid, set the first tenant as selected\n        setTenantAndCookie({\n          id: tenantOptions[0]?.value,\n          refresh,\n        })\n      } else {\n        // if the tenant is in the options, set it as selected\n        setTenantAndCookie({ id, refresh })\n      }\n    },\n    [tenantOptions, setTenantAndCookie],\n  )\n\n  const syncTenants = React.useCallback(async () => {\n    try {\n      const req = await fetch(\n        `${config.serverURL}${config.routes.api}/${tenantsCollectionSlug}/populate-tenant-options`,\n        {\n          credentials: 'include',\n          method: 'GET',\n        },\n      )\n\n      const result = await req.json()\n\n      if (result.tenantOptions && userID) {\n        setTenantOptions(result.tenantOptions)\n\n        if (result.tenantOptions.length === 1) {\n          setSelectedTenantID(result.tenantOptions[0].value)\n          setTenantCookie({ value: String(result.tenantOptions[0].value) })\n        }\n      }\n    } catch (e) {\n      toast.error(`Error fetching tenants`)\n    }\n  }, [config.serverURL, config.routes.api, tenantsCollectionSlug, userID])\n\n  const updateTenants = React.useCallback<ContextType['updateTenants']>(\n    ({ id, label }) => {\n      setTenantOptions((prev) => {\n        return prev.map((currentTenant) => {\n          if (id === currentTenant.value) {\n            return {\n              label,\n              value: id,\n            }\n          }\n          return currentTenant\n        })\n      })\n\n      void syncTenants()\n    },\n    [syncTenants],\n  )\n\n  React.useEffect(() => {\n    if (userChanged || (initialValue && String(initialValue) !== getTenantCookie())) {\n      if (userID) {\n        // user logging in\n        void syncTenants()\n      } else {\n        // user logging out\n        setSelectedTenantID(undefined)\n        deleteTenantCookie()\n        if (tenantOptions.length > 0) {\n          setTenantOptions([])\n        }\n        router.refresh()\n      }\n      prevUserID.current = userID\n    }\n  }, [userID, userChanged, syncTenants, tenantOptions, initialValue, router])\n\n  /**\n   * If there is no initial value, clear the tenant and refresh the router.\n   * Needed for stale tenantIDs set as a cookie.\n   */\n  React.useEffect(() => {\n    if (!initialValue) {\n      setTenant({ id: undefined, refresh: true })\n    }\n  }, [initialValue, setTenant])\n\n  /**\n   * If there is no selected tenant ID and the entity type is 'global', set the first tenant as selected.\n   * This ensures that the global tenant is always set when the component mounts.\n   */\n  React.useEffect(() => {\n    if (!selectedTenantID && tenantOptions.length > 0 && entityType === 'global') {\n      setTenant({\n        id: tenantOptions[0]?.value,\n        refresh: true,\n      })\n    }\n  }, [selectedTenantID, tenantOptions, entityType, setTenant])\n\n  return (\n    <span\n      data-selected-tenant-id={selectedTenantID}\n      data-selected-tenant-title={selectedTenantLabel}\n    >\n      <Context\n        value={{\n          entityType,\n          modified,\n          options: tenantOptions,\n          selectedTenantID,\n          setEntityType,\n          setModified,\n          setTenant,\n          syncTenants,\n          updateTenants,\n        }}\n      >\n        {children}\n      </Context>\n    </span>\n  )\n}\n\nexport const useTenantSelection = () => React.use(Context)\n"],"names":["toast","useAuth","useConfig","useRouter","React","createContext","generateCookie","Context","entityType","undefined","options","selectedTenantID","setEntityType","setModified","setTenant","syncTenants","Promise","resolve","updateTenants","DEFAULT_COOKIE_NAME","setTenantCookie","args","cookieName","value","document","cookie","name","maxAge","path","returnCookieAsObject","deleteTenantCookie","getTenantCookie","parts","split","length","pop","shift","TenantSelectionProviderClient","children","initialTenantOptions","initialValue","tenantsCollectionSlug","setSelectedTenantID","useState","modified","user","config","router","userID","useMemo","id","prevUserID","useRef","userChanged","current","tenantOptions","setTenantOptions","selectedTenantLabel","find","option","label","setTenantAndCookie","useCallback","refresh","String","req","fetch","serverURL","routes","api","credentials","method","result","json","e","error","prev","map","currentTenant","useEffect","span","data-selected-tenant-id","data-selected-tenant-title","useTenantSelection","use"],"mappings":"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"}
+{"version":3,"sources":["../../../src/providers/TenantSelectionProvider/index.client.tsx"],"sourcesContent":["'use client'\n\nimport type { OptionObject } from 'payload'\n\nimport { toast, useAuth, useConfig } from '@payloadcms/ui'\nimport { useRouter } from 'next/navigation.js'\nimport { formatAdminURL } from 'payload/shared'\nimport React, { createContext } from 'react'\n\nimport { generateCookie } from '../../utilities/generateCookie.js'\n\ntype ContextType = {\n  /**\n   * What is the context of the selector? It is either 'document' | 'global' | undefined.\n   *\n   * - 'document' means you are viewing a document in the context of a tenant\n   * - 'global' means you are viewing a \"global\" (globals are collection documents but prevent you from viewing the list view) document in the context of a tenant\n   * - undefined means you are not viewing a document at all\n   */\n  entityType?: 'document' | 'global'\n  /**\n   * Hoists the forms modified state\n   */\n  modified?: boolean\n  /**\n   * Array of options to select from\n   */\n  options: OptionObject[]\n  /**\n   * The currently selected tenant ID\n   */\n  selectedTenantID: number | string | undefined\n  /**\n   * Sets the entityType when a document is loaded and sets it to undefined when the document unmounts.\n   */\n  setEntityType: React.Dispatch<React.SetStateAction<'document' | 'global' | undefined>>\n  /**\n   * Sets the modified state\n   */\n  setModified: React.Dispatch<React.SetStateAction<boolean>>\n  /**\n   * Sets the selected tenant ID\n   *\n   * @param args.id - The ID of the tenant to select\n   * @param args.refresh - Whether to refresh the page after changing the tenant\n   */\n  setTenant: (args: { id: number | string | undefined; refresh?: boolean }) => void\n  /**\n   * Used to sync tenants displayed in the tenant selector when updates are made to the tenants collection.\n   */\n  syncTenants: () => Promise<void>\n  /**\n   *\n   */\n  updateTenants: (args: { id: number | string; label: string }) => void\n}\n\nconst Context = createContext<ContextType>({\n  entityType: undefined,\n  options: [],\n  selectedTenantID: undefined,\n  setEntityType: () => undefined,\n  setModified: () => undefined,\n  setTenant: () => null,\n  syncTenants: () => Promise.resolve(),\n  updateTenants: () => null,\n})\n\nconst DEFAULT_COOKIE_NAME = 'payload-tenant'\n\nconst setTenantCookie = (args: { cookieName?: string; value: string }) => {\n  const { cookieName = DEFAULT_COOKIE_NAME, value } = args\n  document.cookie = generateCookie<string>({\n    name: cookieName,\n    maxAge: 60 * 60 * 24 * 365, // 1 year in seconds\n    path: '/',\n    returnCookieAsObject: false,\n    value: value || '',\n  })\n}\n\nconst deleteTenantCookie = (args: { cookieName?: string } = {}) => {\n  const { cookieName = DEFAULT_COOKIE_NAME } = args\n  document.cookie = generateCookie<string>({\n    name: cookieName,\n    maxAge: -1,\n    path: '/',\n    returnCookieAsObject: false,\n    value: '',\n  })\n}\n\nconst getTenantCookie = (args: { cookieName?: string } = {}): string | undefined => {\n  const { cookieName = DEFAULT_COOKIE_NAME } = args\n  const value = `; ${document.cookie}`\n  const parts = value.split(`; ${cookieName}=`)\n  if (parts.length === 2) {\n    return parts.pop()?.split(';').shift()\n  }\n  return undefined\n}\n\nexport const TenantSelectionProviderClient = ({\n  children,\n  initialTenantOptions,\n  initialValue,\n  tenantsCollectionSlug,\n}: {\n  children: React.ReactNode\n  initialTenantOptions: OptionObject[]\n  initialValue?: number | string\n  tenantsCollectionSlug: string\n}) => {\n  const [selectedTenantID, setSelectedTenantID] = React.useState<number | string | undefined>(\n    initialValue,\n  )\n  const [modified, setModified] = React.useState<boolean>(false)\n  const [entityType, setEntityType] = React.useState<'document' | 'global' | undefined>(undefined)\n  const { user } = useAuth()\n  const { config } = useConfig()\n  const router = useRouter()\n  const userID = React.useMemo(() => user?.id, [user?.id])\n  const prevUserID = React.useRef(userID)\n  const userChanged = userID !== prevUserID.current\n  const [tenantOptions, setTenantOptions] = React.useState<OptionObject[]>(\n    () => initialTenantOptions,\n  )\n  const selectedTenantLabel = React.useMemo(\n    () => tenantOptions.find((option) => option.value === selectedTenantID)?.label,\n    [selectedTenantID, tenantOptions],\n  )\n\n  const setTenantAndCookie = React.useCallback(\n    ({ id, refresh }: { id: number | string | undefined; refresh?: boolean }) => {\n      setSelectedTenantID(id)\n      if (id !== undefined) {\n        setTenantCookie({ value: String(id) })\n      } else {\n        deleteTenantCookie()\n      }\n      if (refresh) {\n        router.refresh()\n      }\n    },\n    [router],\n  )\n\n  const setTenant = React.useCallback<ContextType['setTenant']>(\n    ({ id, refresh }) => {\n      if (id === undefined) {\n        if (tenantOptions.length > 1 || tenantOptions.length === 0) {\n          // users with multiple tenants can clear the tenant selection\n          setTenantAndCookie({ id: undefined, refresh })\n        } else if (tenantOptions[0]) {\n          // if there is only one tenant, auto-select that tenant\n          setTenantAndCookie({ id: tenantOptions[0].value, refresh: true })\n        }\n      } else if (!tenantOptions.find((option) => option.value === id)) {\n        // if the tenant is invalid, set the first tenant as selected\n        setTenantAndCookie({\n          id: tenantOptions[0]?.value,\n          refresh,\n        })\n      } else {\n        // if the tenant is in the options, set it as selected\n        setTenantAndCookie({ id, refresh })\n      }\n    },\n    [tenantOptions, setTenantAndCookie],\n  )\n\n  const syncTenants = React.useCallback(async () => {\n    try {\n      const req = await fetch(\n        formatAdminURL({\n          apiRoute: config.routes.api,\n          path: `/${tenantsCollectionSlug}/populate-tenant-options`,\n        }),\n        {\n          credentials: 'include',\n          method: 'GET',\n        },\n      )\n\n      const result = await req.json()\n\n      if (result.tenantOptions && userID) {\n        setTenantOptions(result.tenantOptions)\n\n        if (result.tenantOptions.length === 1) {\n          setSelectedTenantID(result.tenantOptions[0].value)\n          setTenantCookie({ value: String(result.tenantOptions[0].value) })\n        }\n      }\n    } catch (e) {\n      toast.error(`Error fetching tenants`)\n    }\n  }, [config.routes.api, tenantsCollectionSlug, userID])\n\n  const updateTenants = React.useCallback<ContextType['updateTenants']>(\n    ({ id, label }) => {\n      setTenantOptions((prev) => {\n        return prev.map((currentTenant) => {\n          if (id === currentTenant.value) {\n            return {\n              label,\n              value: id,\n            }\n          }\n          return currentTenant\n        })\n      })\n\n      void syncTenants()\n    },\n    [syncTenants],\n  )\n\n  React.useEffect(() => {\n    if (userChanged || (initialValue && String(initialValue) !== getTenantCookie())) {\n      if (userID) {\n        // user logging in\n        void syncTenants()\n      } else {\n        // user logging out\n        setSelectedTenantID(undefined)\n        deleteTenantCookie()\n        if (tenantOptions.length > 0) {\n          setTenantOptions([])\n        }\n        router.refresh()\n      }\n      prevUserID.current = userID\n    }\n  }, [userID, userChanged, syncTenants, tenantOptions, initialValue, router])\n\n  /**\n   * If there is no initial value, clear the tenant and refresh the router.\n   * Needed for stale tenantIDs set as a cookie.\n   */\n  React.useEffect(() => {\n    if (!initialValue) {\n      setTenant({ id: undefined, refresh: true })\n    }\n  }, [initialValue, setTenant])\n\n  /**\n   * If there is no selected tenant ID and the entity type is 'global', set the first tenant as selected.\n   * This ensures that the global tenant is always set when the component mounts.\n   */\n  React.useEffect(() => {\n    if (!selectedTenantID && tenantOptions.length > 0 && entityType === 'global') {\n      setTenant({\n        id: tenantOptions[0]?.value,\n        refresh: true,\n      })\n    }\n  }, [selectedTenantID, tenantOptions, entityType, setTenant])\n\n  return (\n    <span\n      data-selected-tenant-id={selectedTenantID}\n      data-selected-tenant-title={selectedTenantLabel}\n    >\n      <Context\n        value={{\n          entityType,\n          modified,\n          options: tenantOptions,\n          selectedTenantID,\n          setEntityType,\n          setModified,\n          setTenant,\n          syncTenants,\n          updateTenants,\n        }}\n      >\n        {children}\n      </Context>\n    </span>\n  )\n}\n\nexport const useTenantSelection = () => React.use(Context)\n"],"names":["toast","useAuth","useConfig","useRouter","formatAdminURL","React","createContext","generateCookie","Context","entityType","undefined","options","selectedTenantID","setEntityType","setModified","setTenant","syncTenants","Promise","resolve","updateTenants","DEFAULT_COOKIE_NAME","setTenantCookie","args","cookieName","value","document","cookie","name","maxAge","path","returnCookieAsObject","deleteTenantCookie","getTenantCookie","parts","split","length","pop","shift","TenantSelectionProviderClient","children","initialTenantOptions","initialValue","tenantsCollectionSlug","setSelectedTenantID","useState","modified","user","config","router","userID","useMemo","id","prevUserID","useRef","userChanged","current","tenantOptions","setTenantOptions","selectedTenantLabel","find","option","label","setTenantAndCookie","useCallback","refresh","String","req","fetch","apiRoute","routes","api","credentials","method","result","json","e","error","prev","map","currentTenant","useEffect","span","data-selected-tenant-id","data-selected-tenant-title","useTenantSelection","use"],"mappings":"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"}

package/dist/utilities/addFilterOptionsToFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addFilterOptionsToFields.d.ts","sourceRoot":"","sources":["../../src/utilities/addFilterOptionsToFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,MAAM,EAAE,KAAK,EAAqB,eAAe,EAAE,MAAM,SAAS,CAAA;AAEvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAK1D,KAAK,4BAA4B,CAAC,UAAU,GAAG,OAAO,IAAI;IACxD,0BAA0B,EAAE,MAAM,EAAE,CAAA;IACpC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAA;IAChC,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,4BAA4B,EAAE,MAAM,EAAE,CAAA;IACtC,wBAAwB,EAAE,MAAM,EAAE,CAAA;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,yBAAyB,EAAE,QAAQ,CACjC,uBAAuB,CAAC,UAAU,CAAC,CACpC,CAAC,2BAA2B,CAAC,CAAA;CAC/B,CAAA;AAED,wBAAgB,wBAAwB,CAAC,UAAU,GAAG,OAAO,EAAE,EAC7D,0BAA0B,EAC1B,MAAM,EACN,MAAM,EACN,4BAA4B,EAC5B,wBAAwB,EACxB,eAAe,EACf,qBAAsD,EACtD,2BAAkE,EAClE,qBAAqB,EACrB,yBAAyB,GAC1B,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,KAAK,EAAE,CAmIpD"}
+{"version":3,"file":"addFilterOptionsToFields.d.ts","sourceRoot":"","sources":["../../src/utilities/addFilterOptionsToFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,MAAM,EAAE,KAAK,EAAqB,eAAe,EAAE,MAAM,SAAS,CAAA;AAEvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAK1D,KAAK,4BAA4B,CAAC,UAAU,GAAG,OAAO,IAAI;IACxD,0BAA0B,EAAE,MAAM,EAAE,CAAA;IACpC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAA;IAChC,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,4BAA4B,EAAE,MAAM,EAAE,CAAA;IACtC,wBAAwB,EAAE,MAAM,EAAE,CAAA;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,yBAAyB,EAAE,QAAQ,CACjC,uBAAuB,CAAC,UAAU,CAAC,CACpC,CAAC,2BAA2B,CAAC,CAAA;CAC/B,CAAA;AAED,wBAAgB,wBAAwB,CAAC,UAAU,GAAG,OAAO,EAAE,EAC7D,0BAA0B,EAC1B,MAAM,EACN,MAAM,EACN,4BAA4B,EAC5B,wBAAwB,EACxB,eAAe,EACf,qBAAsD,EACtD,2BAAkE,EAClE,qBAAqB,EACrB,yBAAyB,GAC1B,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,KAAK,EAAE,CAgIpD"}

package/dist/utilities/addFilterOptionsToFields.js

@@ -7,6 +7,7 @@ export function addFilterOptionsToFields({ blockReferencesWithFilters, config, f
             ...field
         };
         if (newField.type === 'relationship') {
+            let hasTenantRelationsips = false;
             /**
        * Adjusts relationship fields to filter by tenant
        * and ensures relationTo cannot be a tenant global collection
@@ -15,15 +16,7 @@ export function addFilterOptionsToFields({ blockReferencesWithFilters, config, f
                     throw new Error(`The collection ${newField.relationTo} is a global collection and cannot be related to a tenant enabled collection.`);
                 }
                 if (tenantEnabledCollectionSlugs.includes(newField.relationTo)) {
-                    newField = addFilter({
-                        field: newField,
-                        tenantEnabledCollectionSlugs,
-                        tenantFieldName,
-                        tenantsArrayFieldName,
-                        tenantsArrayTenantFieldName,
-                        tenantsCollectionSlug,
-                        userHasAccessToAllTenants
-                    });
+                    hasTenantRelationsips = true;
                 }
             } else {
                 for (const relationTo of newField.relationTo){
@@ -31,18 +24,21 @@ export function addFilterOptionsToFields({ blockReferencesWithFilters, config, f
                         throw new Error(`The collection ${relationTo} is a global collection and cannot be related to a tenant enabled collection.`);
                     }
                     if (tenantEnabledCollectionSlugs.includes(relationTo)) {
-                        newField = addFilter({
-                            field: newField,
-                            tenantEnabledCollectionSlugs,
-                            tenantFieldName,
-                            tenantsArrayFieldName,
-                            tenantsArrayTenantFieldName,
-                            tenantsCollectionSlug,
-                            userHasAccessToAllTenants
-                        });
+                        hasTenantRelationsips = true;
                     }
                 }
             }
+            if (hasTenantRelationsips) {
+                newField = addRelationshipFilter({
+                    field: newField,
+                    tenantEnabledCollectionSlugs,
+                    tenantFieldName,
+                    tenantsArrayFieldName,
+                    tenantsArrayTenantFieldName,
+                    tenantsCollectionSlug,
+                    userHasAccessToAllTenants
+                });
+            }
         }
         if (newField.type === 'row' || newField.type === 'array' || newField.type === 'collapsible' || newField.type === 'group') {
             newField.fields = addFilterOptionsToFields({
@@ -120,7 +116,7 @@ export function addFilterOptionsToFields({ blockReferencesWithFilters, config, f
     }
     return newFields;
 }
-function addFilter({ field, tenantEnabledCollectionSlugs, tenantFieldName, tenantsArrayFieldName = defaults.tenantsArrayFieldName, tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName, tenantsCollectionSlug, userHasAccessToAllTenants }) {
+function addRelationshipFilter({ field, tenantEnabledCollectionSlugs, tenantFieldName, tenantsArrayFieldName = defaults.tenantsArrayFieldName, tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName, tenantsCollectionSlug, userHasAccessToAllTenants }) {
     // User specified filter
     const originalFilter = field.filterOptions;
     field.filterOptions = async (args)=>{

package/dist/utilities/addFilterOptionsToFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addFilterOptionsToFields.ts"],"sourcesContent":["import type { Block, Config, Field, RelationshipField, SanitizedConfig } from 'payload'\n\nimport type { MultiTenantPluginConfig } from '../types.js'\n\nimport { defaults } from '../defaults.js'\nimport { filterDocumentsByTenants } from '../filters/filterDocumentsByTenants.js'\n\ntype AddFilterOptionsToFieldsArgs<ConfigType = unknown> = {\n  blockReferencesWithFilters: string[]\n  config: Config | SanitizedConfig\n  fields: Field[]\n  tenantEnabledCollectionSlugs: string[]\n  tenantEnabledGlobalSlugs: string[]\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  userHasAccessToAllTenants: Required<\n    MultiTenantPluginConfig<ConfigType>\n  >['userHasAccessToAllTenants']\n}\n\nexport function addFilterOptionsToFields<ConfigType = unknown>({\n  blockReferencesWithFilters,\n  config,\n  fields,\n  tenantEnabledCollectionSlugs,\n  tenantEnabledGlobalSlugs,\n  tenantFieldName,\n  tenantsArrayFieldName = defaults.tenantsArrayFieldName,\n  tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  userHasAccessToAllTenants,\n}: AddFilterOptionsToFieldsArgs<ConfigType>): Field[] {\n  const newFields = []\n  for (const field of fields) {\n    let newField: Field = { ...field }\n    if (newField.type === 'relationship') {\n      /**\n       * Adjusts relationship fields to filter by tenant\n       * and ensures relationTo cannot be a tenant global collection\n       */\n      if (typeof newField.relationTo === 'string') {\n        if (tenantEnabledGlobalSlugs.includes(newField.relationTo)) {\n          throw new Error(\n            `The collection ${newField.relationTo} is a global collection and cannot be related to a tenant enabled collection.`,\n          )\n        }\n        if (tenantEnabledCollectionSlugs.includes(newField.relationTo)) {\n          newField = addFilter({\n            field: newField,\n            tenantEnabledCollectionSlugs,\n            tenantFieldName,\n            tenantsArrayFieldName,\n            tenantsArrayTenantFieldName,\n            tenantsCollectionSlug,\n            userHasAccessToAllTenants,\n          })\n        }\n      } else {\n        for (const relationTo of newField.relationTo) {\n          if (tenantEnabledGlobalSlugs.includes(relationTo)) {\n            throw new Error(\n              `The collection ${relationTo} is a global collection and cannot be related to a tenant enabled collection.`,\n            )\n          }\n          if (tenantEnabledCollectionSlugs.includes(relationTo)) {\n            newField = addFilter({\n              field: newField as RelationshipField,\n              tenantEnabledCollectionSlugs,\n              tenantFieldName,\n              tenantsArrayFieldName,\n              tenantsArrayTenantFieldName,\n              tenantsCollectionSlug,\n              userHasAccessToAllTenants,\n            })\n          }\n        }\n      }\n    }\n\n    if (\n      newField.type === 'row' ||\n      newField.type === 'array' ||\n      newField.type === 'collapsible' ||\n      newField.type === 'group'\n    ) {\n      newField.fields = addFilterOptionsToFields({\n        blockReferencesWithFilters,\n        config,\n        fields: newField.fields,\n        tenantEnabledCollectionSlugs,\n        tenantEnabledGlobalSlugs,\n        tenantFieldName,\n        tenantsArrayFieldName,\n        tenantsArrayTenantFieldName,\n        tenantsCollectionSlug,\n        userHasAccessToAllTenants,\n      })\n    }\n\n    if (newField.type === 'blocks') {\n      const newBlocks: Block[] = []\n      ;(newField.blockReferences ?? newField.blocks).forEach((_block) => {\n        let block: Block | undefined\n        let isReference = false\n\n        if (typeof _block === 'string') {\n          if (blockReferencesWithFilters.includes(_block)) {\n            return\n          }\n          isReference = true\n          block = config?.blocks?.find((b) => b.slug === _block)\n          blockReferencesWithFilters.push(_block)\n        } else {\n          // Create a shallow copy to avoid mutating the original block reference\n          block = { ..._block }\n        }\n\n        if (block?.fields) {\n          block.fields = addFilterOptionsToFields({\n            blockReferencesWithFilters,\n            config,\n            fields: block.fields,\n            tenantEnabledCollectionSlugs,\n            tenantEnabledGlobalSlugs,\n            tenantFieldName,\n            tenantsArrayFieldName,\n            tenantsArrayTenantFieldName,\n            tenantsCollectionSlug,\n            userHasAccessToAllTenants,\n          })\n        }\n\n        if (block && !isReference) {\n          newBlocks.push(block)\n        }\n      })\n      newField.blocks = newBlocks\n    }\n\n    if (newField.type === 'tabs') {\n      newField.tabs = newField.tabs.map((tab) => {\n        const newTab = { ...tab }\n        newTab.fields = addFilterOptionsToFields({\n          blockReferencesWithFilters,\n          config,\n          fields: tab.fields,\n          tenantEnabledCollectionSlugs,\n          tenantEnabledGlobalSlugs,\n          tenantFieldName,\n          tenantsArrayFieldName,\n          tenantsArrayTenantFieldName,\n          tenantsCollectionSlug,\n          userHasAccessToAllTenants,\n        })\n        return newTab\n      })\n    }\n\n    newFields.push(newField)\n  }\n\n  return newFields\n}\n\ntype AddFilterArgs<ConfigType = unknown> = {\n  field: RelationshipField\n  tenantEnabledCollectionSlugs: string[]\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  userHasAccessToAllTenants: Required<\n    MultiTenantPluginConfig<ConfigType>\n  >['userHasAccessToAllTenants']\n}\nfunction addFilter<ConfigType = unknown>({\n  field,\n  tenantEnabledCollectionSlugs,\n  tenantFieldName,\n  tenantsArrayFieldName = defaults.tenantsArrayFieldName,\n  tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  userHasAccessToAllTenants,\n}: AddFilterArgs<ConfigType>): Field {\n  // User specified filter\n  const originalFilter = field.filterOptions\n  field.filterOptions = async (args) => {\n    const originalFilterResult =\n      typeof originalFilter === 'function' ? await originalFilter(args) : (originalFilter ?? true)\n\n    // If the relationTo is not a tenant enabled collection, return early\n    if (args.relationTo && !tenantEnabledCollectionSlugs.includes(args.relationTo)) {\n      return originalFilterResult\n    }\n\n    // If the original filtr returns false, return early\n    if (originalFilterResult === false) {\n      return false\n    }\n\n    // Custom tenant filter\n    const tenantFilterResults = filterDocumentsByTenants({\n      docTenantID: args.data?.[tenantFieldName],\n      filterFieldName: tenantFieldName,\n      req: args.req,\n      tenantsArrayFieldName,\n      tenantsArrayTenantFieldName,\n      tenantsCollectionSlug,\n      userHasAccessToAllTenants,\n    })\n\n    // If the tenant filter returns null, meaning no tenant filter, just use the original filter\n    if (tenantFilterResults === null) {\n      return originalFilterResult\n    }\n\n    // If the original filter returns true, just use the tenant filter\n    if (originalFilterResult === true) {\n      return tenantFilterResults\n    }\n\n    return {\n      and: [originalFilterResult, tenantFilterResults],\n    }\n  }\n\n  return field\n}\n"],"names":["defaults","filterDocumentsByTenants","addFilterOptionsToFields","blockReferencesWithFilters","config","fields","tenantEnabledCollectionSlugs","tenantEnabledGlobalSlugs","tenantFieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsCollectionSlug","userHasAccessToAllTenants","newFields","field","newField","type","relationTo","includes","Error","addFilter","newBlocks","blockReferences","blocks","forEach","_block","block","isReference","find","b","slug","push","tabs","map","tab","newTab","originalFilter","filterOptions","args","originalFilterResult","tenantFilterResults","docTenantID","data","filterFieldName","req","and"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/addFilterOptionsToFields.ts"],"sourcesContent":["import type { Block, Config, Field, RelationshipField, SanitizedConfig } from 'payload'\n\nimport type { MultiTenantPluginConfig } from '../types.js'\n\nimport { defaults } from '../defaults.js'\nimport { filterDocumentsByTenants } from '../filters/filterDocumentsByTenants.js'\n\ntype AddFilterOptionsToFieldsArgs<ConfigType = unknown> = {\n  blockReferencesWithFilters: string[]\n  config: Config | SanitizedConfig\n  fields: Field[]\n  tenantEnabledCollectionSlugs: string[]\n  tenantEnabledGlobalSlugs: string[]\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  userHasAccessToAllTenants: Required<\n    MultiTenantPluginConfig<ConfigType>\n  >['userHasAccessToAllTenants']\n}\n\nexport function addFilterOptionsToFields<ConfigType = unknown>({\n  blockReferencesWithFilters,\n  config,\n  fields,\n  tenantEnabledCollectionSlugs,\n  tenantEnabledGlobalSlugs,\n  tenantFieldName,\n  tenantsArrayFieldName = defaults.tenantsArrayFieldName,\n  tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  userHasAccessToAllTenants,\n}: AddFilterOptionsToFieldsArgs<ConfigType>): Field[] {\n  const newFields = []\n  for (const field of fields) {\n    let newField: Field = { ...field }\n    if (newField.type === 'relationship') {\n      let hasTenantRelationsips = false\n      /**\n       * Adjusts relationship fields to filter by tenant\n       * and ensures relationTo cannot be a tenant global collection\n       */\n      if (typeof newField.relationTo === 'string') {\n        if (tenantEnabledGlobalSlugs.includes(newField.relationTo)) {\n          throw new Error(\n            `The collection ${newField.relationTo} is a global collection and cannot be related to a tenant enabled collection.`,\n          )\n        }\n        if (tenantEnabledCollectionSlugs.includes(newField.relationTo)) {\n          hasTenantRelationsips = true\n        }\n      } else {\n        for (const relationTo of newField.relationTo) {\n          if (tenantEnabledGlobalSlugs.includes(relationTo)) {\n            throw new Error(\n              `The collection ${relationTo} is a global collection and cannot be related to a tenant enabled collection.`,\n            )\n          }\n          if (tenantEnabledCollectionSlugs.includes(relationTo)) {\n            hasTenantRelationsips = true\n          }\n        }\n      }\n\n      if (hasTenantRelationsips) {\n        newField = addRelationshipFilter({\n          field: newField as RelationshipField,\n          tenantEnabledCollectionSlugs,\n          tenantFieldName,\n          tenantsArrayFieldName,\n          tenantsArrayTenantFieldName,\n          tenantsCollectionSlug,\n          userHasAccessToAllTenants,\n        })\n      }\n    }\n\n    if (\n      newField.type === 'row' ||\n      newField.type === 'array' ||\n      newField.type === 'collapsible' ||\n      newField.type === 'group'\n    ) {\n      newField.fields = addFilterOptionsToFields({\n        blockReferencesWithFilters,\n        config,\n        fields: newField.fields,\n        tenantEnabledCollectionSlugs,\n        tenantEnabledGlobalSlugs,\n        tenantFieldName,\n        tenantsArrayFieldName,\n        tenantsArrayTenantFieldName,\n        tenantsCollectionSlug,\n        userHasAccessToAllTenants,\n      })\n    }\n\n    if (newField.type === 'blocks') {\n      const newBlocks: Block[] = []\n      ;(newField.blockReferences ?? newField.blocks).forEach((_block) => {\n        let block: Block | undefined\n        let isReference = false\n\n        if (typeof _block === 'string') {\n          if (blockReferencesWithFilters.includes(_block)) {\n            return\n          }\n          isReference = true\n          block = config?.blocks?.find((b) => b.slug === _block)\n          blockReferencesWithFilters.push(_block)\n        } else {\n          // Create a shallow copy to avoid mutating the original block reference\n          block = { ..._block }\n        }\n\n        if (block?.fields) {\n          block.fields = addFilterOptionsToFields({\n            blockReferencesWithFilters,\n            config,\n            fields: block.fields,\n            tenantEnabledCollectionSlugs,\n            tenantEnabledGlobalSlugs,\n            tenantFieldName,\n            tenantsArrayFieldName,\n            tenantsArrayTenantFieldName,\n            tenantsCollectionSlug,\n            userHasAccessToAllTenants,\n          })\n        }\n\n        if (block && !isReference) {\n          newBlocks.push(block)\n        }\n      })\n      newField.blocks = newBlocks\n    }\n\n    if (newField.type === 'tabs') {\n      newField.tabs = newField.tabs.map((tab) => {\n        const newTab = { ...tab }\n        newTab.fields = addFilterOptionsToFields({\n          blockReferencesWithFilters,\n          config,\n          fields: tab.fields,\n          tenantEnabledCollectionSlugs,\n          tenantEnabledGlobalSlugs,\n          tenantFieldName,\n          tenantsArrayFieldName,\n          tenantsArrayTenantFieldName,\n          tenantsCollectionSlug,\n          userHasAccessToAllTenants,\n        })\n        return newTab\n      })\n    }\n\n    newFields.push(newField)\n  }\n\n  return newFields\n}\n\ntype AddFilterArgs<ConfigType = unknown> = {\n  field: RelationshipField\n  tenantEnabledCollectionSlugs: string[]\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  userHasAccessToAllTenants: Required<\n    MultiTenantPluginConfig<ConfigType>\n  >['userHasAccessToAllTenants']\n}\nfunction addRelationshipFilter<ConfigType = unknown>({\n  field,\n  tenantEnabledCollectionSlugs,\n  tenantFieldName,\n  tenantsArrayFieldName = defaults.tenantsArrayFieldName,\n  tenantsArrayTenantFieldName = defaults.tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  userHasAccessToAllTenants,\n}: AddFilterArgs<ConfigType>): Field {\n  // User specified filter\n  const originalFilter = field.filterOptions\n  field.filterOptions = async (args) => {\n    const originalFilterResult =\n      typeof originalFilter === 'function' ? await originalFilter(args) : (originalFilter ?? true)\n\n    // If the relationTo is not a tenant enabled collection, return early\n    if (args.relationTo && !tenantEnabledCollectionSlugs.includes(args.relationTo)) {\n      return originalFilterResult\n    }\n\n    // If the original filtr returns false, return early\n    if (originalFilterResult === false) {\n      return false\n    }\n\n    // Custom tenant filter\n    const tenantFilterResults = filterDocumentsByTenants({\n      docTenantID: args.data?.[tenantFieldName],\n      filterFieldName: tenantFieldName,\n      req: args.req,\n      tenantsArrayFieldName,\n      tenantsArrayTenantFieldName,\n      tenantsCollectionSlug,\n      userHasAccessToAllTenants,\n    })\n\n    // If the tenant filter returns null, meaning no tenant filter, just use the original filter\n    if (tenantFilterResults === null) {\n      return originalFilterResult\n    }\n\n    // If the original filter returns true, just use the tenant filter\n    if (originalFilterResult === true) {\n      return tenantFilterResults\n    }\n\n    return {\n      and: [originalFilterResult, tenantFilterResults],\n    }\n  }\n\n  return field\n}\n"],"names":["defaults","filterDocumentsByTenants","addFilterOptionsToFields","blockReferencesWithFilters","config","fields","tenantEnabledCollectionSlugs","tenantEnabledGlobalSlugs","tenantFieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsCollectionSlug","userHasAccessToAllTenants","newFields","field","newField","type","hasTenantRelationsips","relationTo","includes","Error","addRelationshipFilter","newBlocks","blockReferences","blocks","forEach","_block","block","isReference","find","b","slug","push","tabs","map","tab","newTab","originalFilter","filterOptions","args","originalFilterResult","tenantFilterResults","docTenantID","data","filterFieldName","req","and"],"mappings":"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"}

package/dist/utilities/getGlobalViewRedirect.d.ts

@@ -1,6 +1,11 @@
 import type { Payload, TypedUser, ViewTypes } from 'payload';
 import type { MultiTenantPluginConfig } from '../types.js';
 type Args = {
+    /**
+     * This is no longer needed and is handled internally.
+     *
+     * @deprecated
+     */
     basePath?: string;
     docID?: number | string;
     headers: Headers;
@@ -15,6 +20,6 @@ type Args = {
     userHasAccessToAllTenants: Required<MultiTenantPluginConfig<any>>['userHasAccessToAllTenants'];
     view: ViewTypes;
 };
-export declare function getGlobalViewRedirect({ slug: collectionSlug, basePath, docID, headers, payload, tenantFieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, tenantsCollectionSlug, useAsTitle, user, userHasAccessToAllTenants, view, }: Args): Promise<string | void>;
+export declare function getGlobalViewRedirect({ slug: collectionSlug, docID, headers, payload, tenantFieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, tenantsCollectionSlug, useAsTitle, user, userHasAccessToAllTenants, view, }: Args): Promise<string | void>;
 export {};
 //# sourceMappingURL=getGlobalViewRedirect.d.ts.map

package/dist/utilities/getGlobalViewRedirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getGlobalViewRedirect.d.ts","sourceRoot":"","sources":["../../src/utilities/getGlobalViewRedirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAK5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAM1D,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,EAAE,MAAM,CAAA;IACvB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,yBAAyB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAA;IAC9F,IAAI,EAAE,SAAS,CAAA;CAChB,CAAA;AACD,wBAAsB,qBAAqB,CAAC,EAC1C,IAAI,EAAE,cAAc,EACpB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,OAAO,EACP,eAAe,EACf,qBAAqB,EACrB,2BAA2B,EAC3B,qBAAqB,EACrB,UAAU,EACV,IAAI,EACJ,yBAAyB,EACzB,IAAI,GACL,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqG/B"}
+{"version":3,"file":"getGlobalViewRedirect.d.ts","sourceRoot":"","sources":["../../src/utilities/getGlobalViewRedirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAK5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAM1D,KAAK,IAAI,GAAG;IACV;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,EAAE,MAAM,CAAA;IACvB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,yBAAyB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAA;IAC9F,IAAI,EAAE,SAAS,CAAA;CAChB,CAAA;AACD,wBAAsB,qBAAqB,CAAC,EAC1C,IAAI,EAAE,cAAc,EACpB,KAAK,EACL,OAAO,EACP,OAAO,EACP,eAAe,EACf,qBAAqB,EACrB,2BAA2B,EAC3B,qBAAqB,EACrB,UAAU,EACV,IAAI,EACJ,yBAAyB,EACzB,IAAI,GACL,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmG/B"}

package/dist/utilities/getGlobalViewRedirect.js

@@ -3,7 +3,7 @@ import { formatAdminURL, hasAutosaveEnabled } from 'payload/shared';
 import { getCollectionIDType } from './getCollectionIDType.js';
 import { getTenantFromCookie } from './getTenantFromCookie.js';
 import { getTenantOptions } from './getTenantOptions.js';
-export async function getGlobalViewRedirect({ slug: collectionSlug, basePath, docID, headers, payload, tenantFieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, tenantsCollectionSlug, useAsTitle, user, userHasAccessToAllTenants, view }) {
+export async function getGlobalViewRedirect({ slug: collectionSlug, docID, headers, payload, tenantFieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, tenantsCollectionSlug, useAsTitle, user, userHasAccessToAllTenants, view }) {
     const idType = getCollectionIDType({
         collectionSlug: tenantsCollectionSlug,
         payload
@@ -82,7 +82,6 @@ export async function getGlobalViewRedirect({ slug: collectionSlug, basePath, do
         // no tenants were found, redirect to the admin view
         return formatAdminURL({
             adminRoute: payload.config.routes.admin,
-            basePath,
             path: '',
             serverURL: payload.config.serverURL
         });
@@ -90,7 +89,6 @@ export async function getGlobalViewRedirect({ slug: collectionSlug, basePath, do
     if (redirectRoute) {
         return formatAdminURL({
             adminRoute: payload.config.routes.admin,
-            basePath,
             path: redirectRoute,
             serverURL: payload.config.serverURL
         });

package/dist/utilities/getGlobalViewRedirect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getGlobalViewRedirect.ts"],"sourcesContent":["import type { Payload, TypedUser, ViewTypes } from 'payload'\n\nimport { unauthorized } from 'next/navigation.js'\nimport { formatAdminURL, hasAutosaveEnabled } from 'payload/shared'\n\nimport type { MultiTenantPluginConfig } from '../types.js'\n\nimport { getCollectionIDType } from './getCollectionIDType.js'\nimport { getTenantFromCookie } from './getTenantFromCookie.js'\nimport { getTenantOptions } from './getTenantOptions.js'\n\ntype Args = {\n  basePath?: string\n  docID?: number | string\n  headers: Headers\n  payload: Payload\n  slug: string\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  useAsTitle: string\n  user?: TypedUser\n  userHasAccessToAllTenants: Required<MultiTenantPluginConfig<any>>['userHasAccessToAllTenants']\n  view: ViewTypes\n}\nexport async function getGlobalViewRedirect({\n  slug: collectionSlug,\n  basePath,\n  docID,\n  headers,\n  payload,\n  tenantFieldName,\n  tenantsArrayFieldName,\n  tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  useAsTitle,\n  user,\n  userHasAccessToAllTenants,\n  view,\n}: Args): Promise<string | void> {\n  const idType = getCollectionIDType({\n    collectionSlug: tenantsCollectionSlug,\n    payload,\n  })\n  let tenant = getTenantFromCookie(headers, idType)\n  let redirectRoute: `/${string}` | void = undefined\n\n  if (!user) {\n    return unauthorized()\n  }\n\n  if (!tenant) {\n    const tenantOptions = await getTenantOptions({\n      payload,\n      tenantsArrayFieldName,\n      tenantsArrayTenantFieldName,\n      tenantsCollectionSlug,\n      useAsTitle,\n      user,\n      userHasAccessToAllTenants,\n    })\n\n    tenant = tenantOptions[0]?.value || null\n  }\n\n  if (tenant) {\n    try {\n      const globalTenantDocQuery = await payload.find({\n        collection: collectionSlug,\n        depth: 0,\n        limit: 1,\n        pagination: false,\n        select: {\n          id: true,\n        },\n        where: {\n          [tenantFieldName]: {\n            in: [tenant],\n          },\n        },\n      })\n\n      const globalTenantDocID = globalTenantDocQuery?.docs?.[0]?.id\n\n      if (view === 'document') {\n        // global tenant document edit view\n        if (globalTenantDocID && docID !== globalTenantDocID) {\n          // tenant document already exists but does not match current route docID\n          // redirect to matching tenant docID from query\n          redirectRoute = `/collections/${collectionSlug}/${globalTenantDocID}`\n        } else if (docID && !globalTenantDocID) {\n          // a docID was found in the route but no global document with this tenant exists\n          // so we need to generate a redirect to the create route\n          redirectRoute = await generateCreateRedirect({\n            collectionSlug,\n            payload,\n            tenantID: tenant,\n          })\n        }\n      } else if (view === 'list') {\n        // global tenant document list view\n        if (globalTenantDocID) {\n          // tenant document exists, redirect from list view to the document edit view\n          redirectRoute = `/collections/${collectionSlug}/${globalTenantDocID}`\n        } else {\n          // no matching document was found for the current tenant\n          // so we need to generate a redirect to the create route\n          redirectRoute = await generateCreateRedirect({\n            collectionSlug,\n            payload,\n            tenantID: tenant,\n          })\n        }\n      }\n    } catch (e: unknown) {\n      const prefix = `${e && typeof e === 'object' && 'message' in e && typeof e.message === 'string' ? `${e.message} - ` : ''}`\n      payload.logger.error(e, `${prefix}Multi Tenant Redirect Error`)\n    }\n  } else {\n    // no tenants were found, redirect to the admin view\n    return formatAdminURL({\n      adminRoute: payload.config.routes.admin,\n      basePath,\n      path: '',\n      serverURL: payload.config.serverURL,\n    })\n  }\n\n  if (redirectRoute) {\n    return formatAdminURL({\n      adminRoute: payload.config.routes.admin,\n      basePath,\n      path: redirectRoute,\n      serverURL: payload.config.serverURL,\n    })\n  }\n\n  // no redirect is needed\n  // the current route is valid\n  return undefined\n}\n\ntype GenerateCreateArgs = {\n  collectionSlug: string\n  payload: Payload\n  tenantID: number | string\n}\n/**\n * Generate a redirect URL for creating a new document in a multi-tenant collection.\n *\n * If autosave is enabled on the collection, we need to create the document and then redirect to it.\n * Otherwise we can redirect to the default create route.\n */\nasync function generateCreateRedirect({\n  collectionSlug,\n  payload,\n  tenantID,\n}: GenerateCreateArgs): Promise<`/${string}` | undefined> {\n  const collectionConfig = payload.collections[collectionSlug]?.config\n  if (hasAutosaveEnabled(collectionConfig!)) {\n    // Autosave is enabled, create a document first\n    try {\n      const doc = await payload.create({\n        collection: collectionSlug,\n        data: {\n          tenant: tenantID,\n        },\n        depth: 0,\n        draft: true,\n        select: {\n          id: true,\n        },\n      })\n      return `/collections/${collectionSlug}/${doc.id}`\n    } catch (error) {\n      payload.logger.error(\n        error,\n        `Error creating autosave global multi tenant document for ${collectionSlug}`,\n      )\n    }\n\n    return '/'\n  }\n\n  // Autosave is not enabled, redirect to default create route\n  return `/collections/${collectionSlug}/create`\n}\n"],"names":["unauthorized","formatAdminURL","hasAutosaveEnabled","getCollectionIDType","getTenantFromCookie","getTenantOptions","getGlobalViewRedirect","slug","collectionSlug","basePath","docID","headers","payload","tenantFieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsCollectionSlug","useAsTitle","user","userHasAccessToAllTenants","view","idType","tenant","redirectRoute","undefined","tenantOptions","value","globalTenantDocQuery","find","collection","depth","limit","pagination","select","id","where","in","globalTenantDocID","docs","generateCreateRedirect","tenantID","e","prefix","message","logger","error","adminRoute","config","routes","admin","path","serverURL","collectionConfig","collections","doc","create","data","draft"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/getGlobalViewRedirect.ts"],"sourcesContent":["import type { Payload, TypedUser, ViewTypes } from 'payload'\n\nimport { unauthorized } from 'next/navigation.js'\nimport { formatAdminURL, hasAutosaveEnabled } from 'payload/shared'\n\nimport type { MultiTenantPluginConfig } from '../types.js'\n\nimport { getCollectionIDType } from './getCollectionIDType.js'\nimport { getTenantFromCookie } from './getTenantFromCookie.js'\nimport { getTenantOptions } from './getTenantOptions.js'\n\ntype Args = {\n  /**\n   * This is no longer needed and is handled internally.\n   *\n   * @deprecated\n   */\n  basePath?: string\n  docID?: number | string\n  headers: Headers\n  payload: Payload\n  slug: string\n  tenantFieldName: string\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  tenantsCollectionSlug: string\n  useAsTitle: string\n  user?: TypedUser\n  userHasAccessToAllTenants: Required<MultiTenantPluginConfig<any>>['userHasAccessToAllTenants']\n  view: ViewTypes\n}\nexport async function getGlobalViewRedirect({\n  slug: collectionSlug,\n  docID,\n  headers,\n  payload,\n  tenantFieldName,\n  tenantsArrayFieldName,\n  tenantsArrayTenantFieldName,\n  tenantsCollectionSlug,\n  useAsTitle,\n  user,\n  userHasAccessToAllTenants,\n  view,\n}: Args): Promise<string | void> {\n  const idType = getCollectionIDType({\n    collectionSlug: tenantsCollectionSlug,\n    payload,\n  })\n  let tenant = getTenantFromCookie(headers, idType)\n  let redirectRoute: `/${string}` | void = undefined\n\n  if (!user) {\n    return unauthorized()\n  }\n\n  if (!tenant) {\n    const tenantOptions = await getTenantOptions({\n      payload,\n      tenantsArrayFieldName,\n      tenantsArrayTenantFieldName,\n      tenantsCollectionSlug,\n      useAsTitle,\n      user,\n      userHasAccessToAllTenants,\n    })\n\n    tenant = tenantOptions[0]?.value || null\n  }\n\n  if (tenant) {\n    try {\n      const globalTenantDocQuery = await payload.find({\n        collection: collectionSlug,\n        depth: 0,\n        limit: 1,\n        pagination: false,\n        select: {\n          id: true,\n        },\n        where: {\n          [tenantFieldName]: {\n            in: [tenant],\n          },\n        },\n      })\n\n      const globalTenantDocID = globalTenantDocQuery?.docs?.[0]?.id\n\n      if (view === 'document') {\n        // global tenant document edit view\n        if (globalTenantDocID && docID !== globalTenantDocID) {\n          // tenant document already exists but does not match current route docID\n          // redirect to matching tenant docID from query\n          redirectRoute = `/collections/${collectionSlug}/${globalTenantDocID}`\n        } else if (docID && !globalTenantDocID) {\n          // a docID was found in the route but no global document with this tenant exists\n          // so we need to generate a redirect to the create route\n          redirectRoute = await generateCreateRedirect({\n            collectionSlug,\n            payload,\n            tenantID: tenant,\n          })\n        }\n      } else if (view === 'list') {\n        // global tenant document list view\n        if (globalTenantDocID) {\n          // tenant document exists, redirect from list view to the document edit view\n          redirectRoute = `/collections/${collectionSlug}/${globalTenantDocID}`\n        } else {\n          // no matching document was found for the current tenant\n          // so we need to generate a redirect to the create route\n          redirectRoute = await generateCreateRedirect({\n            collectionSlug,\n            payload,\n            tenantID: tenant,\n          })\n        }\n      }\n    } catch (e: unknown) {\n      const prefix = `${e && typeof e === 'object' && 'message' in e && typeof e.message === 'string' ? `${e.message} - ` : ''}`\n      payload.logger.error(e, `${prefix}Multi Tenant Redirect Error`)\n    }\n  } else {\n    // no tenants were found, redirect to the admin view\n    return formatAdminURL({\n      adminRoute: payload.config.routes.admin,\n      path: '',\n      serverURL: payload.config.serverURL,\n    })\n  }\n\n  if (redirectRoute) {\n    return formatAdminURL({\n      adminRoute: payload.config.routes.admin,\n      path: redirectRoute,\n      serverURL: payload.config.serverURL,\n    })\n  }\n\n  // no redirect is needed\n  // the current route is valid\n  return undefined\n}\n\ntype GenerateCreateArgs = {\n  collectionSlug: string\n  payload: Payload\n  tenantID: number | string\n}\n/**\n * Generate a redirect URL for creating a new document in a multi-tenant collection.\n *\n * If autosave is enabled on the collection, we need to create the document and then redirect to it.\n * Otherwise we can redirect to the default create route.\n */\nasync function generateCreateRedirect({\n  collectionSlug,\n  payload,\n  tenantID,\n}: GenerateCreateArgs): Promise<`/${string}` | undefined> {\n  const collectionConfig = payload.collections[collectionSlug]?.config\n  if (hasAutosaveEnabled(collectionConfig!)) {\n    // Autosave is enabled, create a document first\n    try {\n      const doc = await payload.create({\n        collection: collectionSlug,\n        data: {\n          tenant: tenantID,\n        },\n        depth: 0,\n        draft: true,\n        select: {\n          id: true,\n        },\n      })\n      return `/collections/${collectionSlug}/${doc.id}`\n    } catch (error) {\n      payload.logger.error(\n        error,\n        `Error creating autosave global multi tenant document for ${collectionSlug}`,\n      )\n    }\n\n    return '/'\n  }\n\n  // Autosave is not enabled, redirect to default create route\n  return `/collections/${collectionSlug}/create`\n}\n"],"names":["unauthorized","formatAdminURL","hasAutosaveEnabled","getCollectionIDType","getTenantFromCookie","getTenantOptions","getGlobalViewRedirect","slug","collectionSlug","docID","headers","payload","tenantFieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsCollectionSlug","useAsTitle","user","userHasAccessToAllTenants","view","idType","tenant","redirectRoute","undefined","tenantOptions","value","globalTenantDocQuery","find","collection","depth","limit","pagination","select","id","where","in","globalTenantDocID","docs","generateCreateRedirect","tenantID","e","prefix","message","logger","error","adminRoute","config","routes","admin","path","serverURL","collectionConfig","collections","doc","create","data","draft"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "3.69.0-internal.5029b68",
+  "version": "3.70.0-canary.0",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
     "payload",
@@ -80,14 +80,14 @@
     "types.d.ts"
   ],
   "devDependencies": {
-    "@payloadcms/translations": "3.69.0-internal.5029b68",
     "@payloadcms/eslint-config": "3.28.0",
-    "@payloadcms/ui": "3.69.0-internal.5029b68",
-    "payload": "3.69.0-internal.5029b68"
+    "@payloadcms/translations": "3.70.0-canary.0",
+    "payload": "3.70.0-canary.0",
+    "@payloadcms/ui": "3.70.0-canary.0"
   },
   "peerDependencies": {
-    "@payloadcms/ui": "3.69.0-internal.5029b68",
-    "payload": "3.69.0-internal.5029b68"
+    "@payloadcms/ui": "3.70.0-canary.0",
+    "payload": "3.70.0-canary.0"
   },
   "homepage:": "https://payloadcms.com",
   "scripts": {