@payloadcms/ui 4.0.0-internal.cd47d20 → 4.0.0-internal.ce66a41

package/dist/providers/ListQuery/index.js

@@ -2,7 +2,6 @@
 
 import { jsx as _jsx } from "react/jsx-runtime";
 import { transformWhereQuery, validateWhereQuery } from 'payload/shared';
-import * as qs from 'qs-esm';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useListDrawerContext } from '../../elements/ListDrawer/Provider.js';
 import { useEffectEvent } from '../../hooks/useEffectEvent.js';
@@ -10,6 +9,7 @@ import { useRouteTransition } from '../../providers/RouteTransition/index.js';
 import { parseSearchParams } from '../../utilities/parseSearchParams.js';
 import { useRouter, useSearchParams } from '../RouterAdapter/index.js';
 import { ListQueryContext, ListQueryModifiedContext } from './context.js';
+import { getSearchWithListQuery } from './getSearchWithListQuery.js';
 import { mergeQuery } from './mergeQuery.js';
 import { sanitizeQuery } from './sanitizeQuery.js';
 export { useListQuery } from './context.js';
@@ -40,7 +40,7 @@ export const ListQueryProvider = ({
   const queryFromURL = useMemo(() => sanitizeQuery(parseSearchParams(rawSearchParams)), [rawSearchParams]);
   const [query, setQuery] = useState(() => {
     if (modifySearchParams) {
-      return queryFromURL;
+      return queryFromProps ? sanitizeQuery(queryFromProps) : queryFromURL;
     } else {
       return {
         limit: queryFromProps.limit,
@@ -48,6 +48,7 @@ export const ListQueryProvider = ({
       };
     }
   });
+  const [searchInput, setSearchInput] = useState(query?.search || '');
   const refineListData = useCallback(
   // eslint-disable-next-line @typescript-eslint/require-await
   async (incomingQuery, modified_0) => {
@@ -59,11 +60,11 @@ export const ListQueryProvider = ({
       }
     });
     if (modifySearchParams) {
-      const search = `?${qs.stringify({
-        ...newQuery,
-        columns: JSON.stringify(newQuery.columns),
-        queryByGroup: JSON.stringify(newQuery.queryByGroup)
-      })}`;
+      const search = getSearchWithListQuery({
+        currentSearch: window.location.search,
+        query: newQuery,
+        updatedQuery: incomingQuery
+      });
       if (window.location.search !== search) {
         startRouteTransition(() => router.replace(search, {
           scroll: false
@@ -112,11 +113,10 @@ export const ListQueryProvider = ({
       ...(query || {}),
       ...(queryFromProps || {})
     });
-    const search_1 = `?${qs.stringify({
-      ...newQuery_0,
-      columns: JSON.stringify(newQuery_0.columns),
-      queryByGroup: JSON.stringify(newQuery_0.queryByGroup)
-    })}`;
+    const search_1 = getSearchWithListQuery({
+      currentSearch: window.location.search,
+      query: newQuery_0
+    });
     if (window.location.search !== search_1) {
       setQuery(newQuery_0);
       // Important: do not use router.replace here to avoid re-rendering.
@@ -172,7 +172,11 @@ export const ListQueryProvider = ({
       orderableFieldName,
       query,
       refineListData,
+      resolvedGroupBy: queryFromProps?.groupBy,
+      resolvedSearch: queryFromProps?.search,
+      searchInput,
       setModified,
+      setSearchInput,
       ...contextRef.current
     },
     children: /*#__PURE__*/_jsx(ListQueryModifiedContext, {

package/dist/providers/ListQuery/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["transformWhereQuery","validateWhereQuery","qs","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","useRouter","useSearchParams","ListQueryContext","ListQueryModifiedContext","mergeQuery","sanitizeQuery","useListQuery","ListQueryProvider","children","collectionSlug","data","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","query","queryFromProps","router","rawSearchParams","startRouteTransition","modified","setModified","contextRef","current","onQueryChangeFromContext","queryFromURL","setQuery","limit","sort","refineListData","incomingQuery","newQuery","defaults","search","stringify","columns","JSON","queryByGroup","window","location","replace","scroll","handlePageChange","arg","page","handlePerPageChange","handleSearchChange","undefined","handleSortChange","handleWhereChange","where","syncPropsToURL","replaceState","history","hasActiveFilters","normalizedWhere","or","some","orGroup","and","andGroup","field","Object","keys","operatorObj","operator","Boolean","_jsx","value","defaultLimit","isGroupingBy","groupBy"],"sources":["../../../src/providers/ListQuery/index.tsx"],"sourcesContent":["'use client'\nimport { type ListQuery, type Where } from 'payload'\nimport { transformWhereQuery, validateWhereQuery } from 'payload/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\n\nimport type { IListQueryContext, ListQueryProps } from './types.js'\n\nimport { useListDrawerContext } from '../../elements/ListDrawer/Provider.js'\nimport { useEffectEvent } from '../../hooks/useEffectEvent.js'\nimport { useRouteTransition } from '../../providers/RouteTransition/index.js'\nimport { parseSearchParams } from '../../utilities/parseSearchParams.js'\nimport { useRouter, useSearchParams } from '../RouterAdapter/index.js'\nimport { ListQueryContext, ListQueryModifiedContext } from './context.js'\nimport { mergeQuery } from './mergeQuery.js'\nimport { sanitizeQuery } from './sanitizeQuery.js'\n\nexport { useListQuery } from './context.js'\n\nexport const ListQueryProvider: React.FC<ListQueryProps> = ({\n  children,\n  collectionSlug,\n  data,\n  modifySearchParams,\n  onQueryChange: onQueryChangeFromProps,\n  orderableFieldName,\n  query: queryFromProps,\n}) => {\n  // TODO: Investigate if this is still needed\n  'use no memo'\n\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n  const contextRef = useRef({} as IListQueryContext)\n  contextRef.current.modified = modified\n\n  const { onQueryChange: onQueryChangeFromContext } = useListDrawerContext()\n  const onQueryChange = onQueryChangeFromContext || onQueryChangeFromProps\n\n  const queryFromURL = useMemo<ListQuery>(\n    () => sanitizeQuery(parseSearchParams(rawSearchParams)),\n    [rawSearchParams],\n  )\n\n  const [query, setQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return queryFromURL\n    } else {\n      return {\n        limit: queryFromProps.limit,\n        sort: queryFromProps.sort,\n      }\n    }\n  })\n\n  const refineListData = useCallback(\n    // eslint-disable-next-line @typescript-eslint/require-await\n    async (incomingQuery: ListQuery, modified?: boolean) => {\n      setModified(modified ?? true)\n\n      const newQuery = mergeQuery(query, incomingQuery, {\n        defaults: {\n          limit: queryFromProps.limit,\n          sort: queryFromProps.sort,\n        },\n      })\n\n      if (modifySearchParams) {\n        const search = `?${qs.stringify({\n          ...newQuery,\n          columns: JSON.stringify(newQuery.columns),\n          queryByGroup: JSON.stringify(newQuery.queryByGroup),\n        })}`\n        if (window.location.search !== search) {\n          startRouteTransition(() => router.replace(search, { scroll: false }))\n        }\n      } else if (typeof onQueryChange === 'function') {\n        onQueryChange(newQuery)\n      }\n\n      setQuery(newQuery)\n    },\n    [\n      query,\n      queryFromProps.limit,\n      queryFromProps.sort,\n      modifySearchParams,\n      onQueryChange,\n      startRouteTransition,\n      router,\n    ],\n  )\n\n  const handlePageChange = useCallback(\n    async (arg: number) => {\n      await refineListData({ page: arg })\n    },\n    [refineListData],\n  )\n\n  const handlePerPageChange = React.useCallback(\n    async (arg: number) => {\n      await refineListData({ limit: arg, page: 1 })\n    },\n    [refineListData],\n  )\n\n  const handleSearchChange = useCallback(\n    async (arg: string) => {\n      const search = arg === '' ? undefined : arg\n      await refineListData({ search })\n    },\n    [refineListData],\n  )\n\n  const handleSortChange = useCallback(\n    async (sort: string) => {\n      await refineListData({ sort })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (where: Where) => {\n      await refineListData({ where })\n    },\n    [refineListData],\n  )\n\n  /**\n   * The server component may pass props to this client component, e.g. from\n   * fetching the query from preferences.\n   * This effect is responsible for syncing the props back to the URL, without\n   * triggering a re-render.\n   */\n  const syncPropsToURL = useEffectEvent(() => {\n    const newQuery = sanitizeQuery({ ...(query || {}), ...(queryFromProps || {}) })\n\n    const search = `?${qs.stringify({\n      ...newQuery,\n      columns: JSON.stringify(newQuery.columns),\n      queryByGroup: JSON.stringify(newQuery.queryByGroup),\n    })}`\n\n    if (window.location.search !== search) {\n      setQuery(newQuery)\n      // Important: do not use router.replace here to avoid re-rendering.\n      // Go through the adapter's replaceState so routers that observe history\n      // mutations (e.g. TanStack) don't re-run their loader and double-load the\n      // view. Falls back to the native call for adapters that don't implement it.\n      if (router.replaceState) {\n        router.replaceState(search)\n      } else {\n        window.history.replaceState(null, '', search)\n      }\n    }\n  })\n\n  // If `query` is updated externally, update the local state\n  // E.g. when HMR runs, these properties may be different\n  useEffect(() => {\n    if (modifySearchParams && queryFromProps) {\n      syncPropsToURL()\n    }\n  }, [modifySearchParams, queryFromProps])\n\n  const hasActiveFilters = useMemo(() => {\n    if (!query?.where) {\n      return false\n    }\n\n    // Normalize flat/invalid where queries (e.g. `{ title: { equals } }`) into the\n    // `or/and` structure so they are detected the same way the WhereBuilder reads them.\n    const normalizedWhere = validateWhereQuery(query.where)\n      ? query.where\n      : transformWhereQuery(query.where)\n\n    return (normalizedWhere.or ?? []).some((orGroup) =>\n      (orGroup.and ?? []).some((andGroup) => {\n        const field = Object.keys(andGroup)[0]\n        if (!field) {\n          return false\n        }\n        const operatorObj = andGroup[field]\n        if (!operatorObj || typeof operatorObj !== 'object') {\n          return false\n        }\n        const operator = Object.keys(operatorObj)[0]\n        return Boolean(operator) && (operatorObj as Record<string, unknown>)[operator] !== undefined\n      }),\n    )\n  }, [query?.where])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        defaultLimit: data?.limit,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        hasActiveFilters,\n        isGroupingBy: Boolean(query?.groupBy),\n        orderableFieldName,\n        query,\n        refineListData,\n        setModified,\n        ...contextRef.current,\n      }}\n    >\n      <ListQueryModifiedContext value={modified}>{children}</ListQueryModifiedContext>\n    </ListQueryContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["transformWhereQuery","validateWhereQuery","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","useRouter","useSearchParams","ListQueryContext","ListQueryModifiedContext","getSearchWithListQuery","mergeQuery","sanitizeQuery","useListQuery","ListQueryProvider","children","collectionSlug","data","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","query","queryFromProps","router","rawSearchParams","startRouteTransition","modified","setModified","contextRef","current","onQueryChangeFromContext","queryFromURL","setQuery","limit","sort","searchInput","setSearchInput","search","refineListData","incomingQuery","newQuery","defaults","currentSearch","window","location","updatedQuery","replace","scroll","handlePageChange","arg","page","handlePerPageChange","handleSearchChange","undefined","handleSortChange","handleWhereChange","where","syncPropsToURL","replaceState","history","hasActiveFilters","normalizedWhere","or","some","orGroup","and","andGroup","field","Object","keys","operatorObj","operator","Boolean","_jsx","value","defaultLimit","isGroupingBy","groupBy","resolvedGroupBy","resolvedSearch"],"sources":["../../../src/providers/ListQuery/index.tsx"],"sourcesContent":["'use client'\nimport { type ListQuery, type Where } from 'payload'\nimport { transformWhereQuery, validateWhereQuery } from 'payload/shared'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\n\nimport type { IListQueryContext, ListQueryProps } from './types.js'\n\nimport { useListDrawerContext } from '../../elements/ListDrawer/Provider.js'\nimport { useEffectEvent } from '../../hooks/useEffectEvent.js'\nimport { useRouteTransition } from '../../providers/RouteTransition/index.js'\nimport { parseSearchParams } from '../../utilities/parseSearchParams.js'\nimport { useRouter, useSearchParams } from '../RouterAdapter/index.js'\nimport { ListQueryContext, ListQueryModifiedContext } from './context.js'\nimport { getSearchWithListQuery } from './getSearchWithListQuery.js'\nimport { mergeQuery } from './mergeQuery.js'\nimport { sanitizeQuery } from './sanitizeQuery.js'\n\nexport { useListQuery } from './context.js'\n\nexport const ListQueryProvider: React.FC<ListQueryProps> = ({\n  children,\n  collectionSlug,\n  data,\n  modifySearchParams,\n  onQueryChange: onQueryChangeFromProps,\n  orderableFieldName,\n  query: queryFromProps,\n}) => {\n  // TODO: Investigate if this is still needed\n  'use no memo'\n\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n  const contextRef = useRef({} as IListQueryContext)\n  contextRef.current.modified = modified\n\n  const { onQueryChange: onQueryChangeFromContext } = useListDrawerContext()\n  const onQueryChange = onQueryChangeFromContext || onQueryChangeFromProps\n\n  const queryFromURL = useMemo<ListQuery>(\n    () => sanitizeQuery(parseSearchParams(rawSearchParams)),\n    [rawSearchParams],\n  )\n\n  const [query, setQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return queryFromProps ? sanitizeQuery(queryFromProps) : queryFromURL\n    } else {\n      return {\n        limit: queryFromProps.limit,\n        sort: queryFromProps.sort,\n      }\n    }\n  })\n\n  const [searchInput, setSearchInput] = useState(query?.search || '')\n\n  const refineListData = useCallback(\n    // eslint-disable-next-line @typescript-eslint/require-await\n    async (incomingQuery: ListQuery, modified?: boolean) => {\n      setModified(modified ?? true)\n\n      const newQuery = mergeQuery(query, incomingQuery, {\n        defaults: {\n          limit: queryFromProps.limit,\n          sort: queryFromProps.sort,\n        },\n      })\n\n      if (modifySearchParams) {\n        const search = getSearchWithListQuery({\n          currentSearch: window.location.search,\n          query: newQuery,\n          updatedQuery: incomingQuery,\n        })\n        if (window.location.search !== search) {\n          startRouteTransition(() => router.replace(search, { scroll: false }))\n        }\n      } else if (typeof onQueryChange === 'function') {\n        onQueryChange(newQuery)\n      }\n\n      setQuery(newQuery)\n    },\n    [\n      query,\n      queryFromProps.limit,\n      queryFromProps.sort,\n      modifySearchParams,\n      onQueryChange,\n      startRouteTransition,\n      router,\n    ],\n  )\n\n  const handlePageChange = useCallback(\n    async (arg: number) => {\n      await refineListData({ page: arg })\n    },\n    [refineListData],\n  )\n\n  const handlePerPageChange = React.useCallback(\n    async (arg: number) => {\n      await refineListData({ limit: arg, page: 1 })\n    },\n    [refineListData],\n  )\n\n  const handleSearchChange = useCallback(\n    async (arg: string) => {\n      const search = arg === '' ? undefined : arg\n      await refineListData({ search })\n    },\n    [refineListData],\n  )\n\n  const handleSortChange = useCallback(\n    async (sort: string) => {\n      await refineListData({ sort })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (where: Where) => {\n      await refineListData({ where })\n    },\n    [refineListData],\n  )\n\n  /**\n   * The server component may pass props to this client component, e.g. from\n   * fetching the query from preferences.\n   * This effect is responsible for syncing the props back to the URL, without\n   * triggering a re-render.\n   */\n  const syncPropsToURL = useEffectEvent(() => {\n    const newQuery = sanitizeQuery({ ...(query || {}), ...(queryFromProps || {}) })\n\n    const search = getSearchWithListQuery({\n      currentSearch: window.location.search,\n      query: newQuery,\n    })\n\n    if (window.location.search !== search) {\n      setQuery(newQuery)\n      // Important: do not use router.replace here to avoid re-rendering.\n      // Go through the adapter's replaceState so routers that observe history\n      // mutations (e.g. TanStack) don't re-run their loader and double-load the\n      // view. Falls back to the native call for adapters that don't implement it.\n      if (router.replaceState) {\n        router.replaceState(search)\n      } else {\n        window.history.replaceState(null, '', search)\n      }\n    }\n  })\n\n  // If `query` is updated externally, update the local state\n  // E.g. when HMR runs, these properties may be different\n  useEffect(() => {\n    if (modifySearchParams && queryFromProps) {\n      syncPropsToURL()\n    }\n  }, [modifySearchParams, queryFromProps])\n\n  const hasActiveFilters = useMemo(() => {\n    if (!query?.where) {\n      return false\n    }\n\n    // Normalize flat/invalid where queries (e.g. `{ title: { equals } }`) into the\n    // `or/and` structure so they are detected the same way the WhereBuilder reads them.\n    const normalizedWhere = validateWhereQuery(query.where)\n      ? query.where\n      : transformWhereQuery(query.where)\n\n    return (normalizedWhere.or ?? []).some((orGroup) =>\n      (orGroup.and ?? []).some((andGroup) => {\n        const field = Object.keys(andGroup)[0]\n        if (!field) {\n          return false\n        }\n        const operatorObj = andGroup[field]\n        if (!operatorObj || typeof operatorObj !== 'object') {\n          return false\n        }\n        const operator = Object.keys(operatorObj)[0]\n        return Boolean(operator) && (operatorObj as Record<string, unknown>)[operator] !== undefined\n      }),\n    )\n  }, [query?.where])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        defaultLimit: data?.limit,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        hasActiveFilters,\n        isGroupingBy: Boolean(query?.groupBy),\n        orderableFieldName,\n        query,\n        refineListData,\n        resolvedGroupBy: queryFromProps?.groupBy,\n        resolvedSearch: queryFromProps?.search,\n        searchInput,\n        setModified,\n        setSearchInput,\n        ...contextRef.current,\n      }}\n    >\n      <ListQueryModifiedContext value={modified}>{children}</ListQueryModifiedContext>\n    </ListQueryContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/ListQuery/types.d.ts

@@ -35,7 +35,11 @@ export type IListQueryContext = {
     orderableFieldName?: string;
     query: ListQuery;
     refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>;
+    resolvedGroupBy?: string;
+    resolvedSearch?: string;
+    searchInput: string;
     setModified: (modified: boolean) => void;
+    setSearchInput: (search: string) => void;
 } & ContextHandlers;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/providers/ListQuery/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,SAAS,EAET,aAAa,EACb,IAAI,EACJ,KAAK,EACN,MAAM,SAAS,CAAA;AAEhB,KAAK,eAAe,GAAG;IACrB,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACxD,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,8EAA8E;IAC9E,gBAAgB,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,SAAS,CAAA;IAChB,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;CACzC,GAAG,eAAe,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,SAAS,EAET,aAAa,EACb,IAAI,EACJ,KAAK,EACN,MAAM,SAAS,CAAA;AAEhB,KAAK,eAAe,GAAG;IACrB,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACxD,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,8EAA8E;IAC9E,gBAAgB,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,SAAS,CAAA;IAChB,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACzC,GAAG,eAAe,CAAA"}

package/dist/providers/ListQuery/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/ListQuery/types.ts"],"sourcesContent":["import type {\n  ClientCollectionConfig,\n  ListQuery,\n  PaginatedDistinctDocs,\n  PaginatedDocs,\n  Sort,\n  Where,\n} from 'payload'\n\ntype ContextHandlers = {\n  handlePageChange?: (page: number) => Promise<void>\n  handlePerPageChange?: (limit: number) => Promise<void>\n  handleSearchChange?: (search: string) => Promise<void>\n  handleSortChange?: (sort: string) => Promise<void>\n  handleWhereChange?: (where: Where) => Promise<void>\n}\n\nexport type OnListQueryChange = (query: ListQuery) => void\n\nexport type ListQueryProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug?: ClientCollectionConfig['slug']\n  readonly data: PaginatedDocs | undefined\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  readonly query?: ListQuery\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: ListQueryProps['data']\n  defaultLimit?: number\n  defaultSort?: Sort\n  /** True when the where query contains at least one condition with a value. */\n  hasActiveFilters: boolean\n  /**\n   * @experimental This prop is subject to change. Use at your own risk.\n   */\n  isGroupingBy: boolean\n  modified: boolean\n  orderableFieldName?: string\n  query: ListQuery\n  refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>\n  setModified: (modified: boolean) => void\n} & ContextHandlers\n"],"mappings":"AAiCA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/ListQuery/types.ts"],"sourcesContent":["import type {\n  ClientCollectionConfig,\n  ListQuery,\n  PaginatedDistinctDocs,\n  PaginatedDocs,\n  Sort,\n  Where,\n} from 'payload'\n\ntype ContextHandlers = {\n  handlePageChange?: (page: number) => Promise<void>\n  handlePerPageChange?: (limit: number) => Promise<void>\n  handleSearchChange?: (search: string) => Promise<void>\n  handleSortChange?: (sort: string) => Promise<void>\n  handleWhereChange?: (where: Where) => Promise<void>\n}\n\nexport type OnListQueryChange = (query: ListQuery) => void\n\nexport type ListQueryProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug?: ClientCollectionConfig['slug']\n  readonly data: PaginatedDocs | undefined\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  readonly query?: ListQuery\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: ListQueryProps['data']\n  defaultLimit?: number\n  defaultSort?: Sort\n  /** True when the where query contains at least one condition with a value. */\n  hasActiveFilters: boolean\n  /**\n   * @experimental This prop is subject to change. Use at your own risk.\n   */\n  isGroupingBy: boolean\n  modified: boolean\n  orderableFieldName?: string\n  query: ListQuery\n  refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>\n  resolvedGroupBy?: string\n  resolvedSearch?: string\n  searchInput: string\n  setModified: (modified: boolean) => void\n  setSearchInput: (search: string) => void\n} & ContextHandlers\n"],"mappings":"AAiCA","ignoreList":[]}

package/dist/providers/Preferences/index.d.ts

@@ -1,5 +1,10 @@
 import React from 'react';
 import type { Preferences } from '../../forms/Form/types.js';
+type PreferenceUpdater<T> = (current: null | T) => T;
+type SetPreference = {
+    <T = Preferences>(key: string, updater: PreferenceUpdater<T>): Promise<void>;
+    <T = Preferences>(key: string, value: T, merge?: boolean): Promise<void>;
+};
 type PreferencesContext = {
     getPreference: <T = Preferences>(key: string) => Promise<T>;
     /**
@@ -7,7 +12,8 @@ type PreferencesContext = {
      * @param value - preference data to store
      * @param merge - when true will combine the existing preference object batch the change into one request for objects, default = false
      */
-    setPreference: <T = Preferences>(key: string, value: T, merge?: boolean) => Promise<void>;
+    setPreference: SetPreference;
+    syncPreference: <T = Preferences>(key: string, value: T) => void;
 };
 export declare const PreferencesProvider: React.FC<{
     children?: React.ReactNode;

package/dist/providers/Preferences/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/Preferences/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA6D,MAAM,OAAO,CAAA;AAEjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAQ5D,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IAC3D;;;;OAIG;IACH,aAAa,EAAE,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1F,CAAA;AAYD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CA6IxE,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,kBAAkC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/Preferences/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA6D,MAAM,OAAO,CAAA;AAEjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAQ5D,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAA;AAEpD,KAAK,aAAa,GAAG;IACnB,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5E,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACzE,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IAC3D;;;;OAIG;IACH,aAAa,EAAE,aAAa,CAAA;IAC5B,cAAc,EAAE,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAA;CACjE,CAAA;AAYD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAmMxE,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,kBAAkC,CAAA"}

package/dist/providers/Preferences/index.js

@@ -25,6 +25,8 @@ export const PreferencesProvider = ({
   const contextRef = useRef({});
   const preferencesRef = useRef({});
   const pendingUpdate = useRef({});
+  const pendingWrites = useRef({});
+  const updateQueues = useRef({});
   const {
     config
   } = useConfig();
@@ -43,6 +45,9 @@ export const PreferencesProvider = ({
     if (!user) {
       // clear preferences between users
       preferencesRef.current = {};
+      pendingUpdate.current = {};
+      pendingWrites.current = {};
+      updateQueues.current = {};
     }
   }, [user]);
   const getPreference = useCallback(async key => {
@@ -66,26 +71,62 @@ export const PreferencesProvider = ({
           const preference = await request.json();
           value = preference.value;
         }
-        preferencesRef.current[key] = value;
-        resolve(value);
+        if (prefs[key] === promise) {
+          prefs[key] = value;
+          resolve(value);
+        } else {
+          resolve(await prefs[key]);
+        }
       })();
     });
     prefs[key] = promise;
     return promise;
   }, [i18n.language, api, preferencesRef]);
-  const setPreference = useCallback(async (key_0, value_0, merge = false) => {
+  const syncPreference = useCallback((key_0, value_0) => {
+    if (pendingWrites.current[key_0] || typeof pendingUpdate.current[key_0] !== 'undefined') {
+      return;
+    }
+    preferencesRef.current[key_0] = value_0;
+  }, []);
+  const setPreference = useCallback(async (key_1, value_1, merge = false) => {
+    if (typeof value_1 === 'function') {
+      const updater = value_1;
+      const previousUpdate = updateQueues.current[key_1] ?? Promise.resolve();
+      pendingWrites.current[key_1] = (pendingWrites.current[key_1] ?? 0) + 1;
+      const update = previousUpdate.then(async () => {
+        const current = await getPreference(key_1);
+        const nextValue = updater(current ?? null);
+        preferencesRef.current[key_1] = nextValue;
+        await requests.post(formatAdminURL({
+          apiRoute: api,
+          path: `/payload-preferences/${key_1}`
+        }), requestOptions(nextValue, i18n.language));
+      });
+      updateQueues.current[key_1] = update.catch(() => undefined);
+      try {
+        await update;
+      } finally {
+        pendingWrites.current[key_1] -= 1;
+      }
+      return;
+    }
     if (merge === false) {
-      preferencesRef.current[key_0] = value_0;
-      await requests.post(formatAdminURL({
-        apiRoute: api,
-        path: `/payload-preferences/${key_0}`
-      }), requestOptions(value_0, i18n.language));
+      preferencesRef.current[key_1] = value_1;
+      pendingWrites.current[key_1] = (pendingWrites.current[key_1] ?? 0) + 1;
+      try {
+        await requests.post(formatAdminURL({
+          apiRoute: api,
+          path: `/payload-preferences/${key_1}`
+        }), requestOptions(value_1, i18n.language));
+      } finally {
+        pendingWrites.current[key_1] -= 1;
+      }
       return;
     }
-    let newValue = value_0;
-    const currentPreference = await getPreference(key_0);
+    let newValue = value_1;
+    const currentPreference = await getPreference(key_1);
     // handle value objects where multiple values can be set under one key
-    if (typeof value_0 === 'object' && typeof currentPreference === 'object' && typeof newValue === 'object') {
+    if (typeof value_1 === 'object' && typeof currentPreference === 'object' && typeof newValue === 'object') {
       // merge the value with any existing preference for the key
       if (currentPreference) {
         newValue = deepMergeSimple(currentPreference, newValue);
@@ -94,37 +135,38 @@ export const PreferencesProvider = ({
         return;
       }
       // add the requested changes to a pendingUpdate batch for the key
-      pendingUpdate.current[key_0] = {
-        ...pendingUpdate.current[key_0],
+      pendingUpdate.current[key_1] = {
+        ...pendingUpdate.current[key_1],
         ...newValue
       };
     } else {
       if (newValue === currentPreference) {
         return;
       }
-      pendingUpdate.current[key_0] = newValue;
+      pendingUpdate.current[key_1] = newValue;
     }
     const updatePreference = async () => {
       // compare the value stored in context before sending to eliminate duplicate requests
-      if (dequal(pendingUpdate.current[key_0], preferencesRef.current[key_0])) {
+      if (dequal(pendingUpdate.current[key_1], preferencesRef.current[key_1])) {
         return;
       }
       // preference set in context here to prevent other updatePreference at the same time
-      preferencesRef.current[key_0] = pendingUpdate.current[key_0];
+      preferencesRef.current[key_1] = pendingUpdate.current[key_1];
       await requests.post(formatAdminURL({
         apiRoute: api,
-        path: `/payload-preferences/${key_0}`
-      }), requestOptions(preferencesRef.current[key_0], i18n.language));
+        path: `/payload-preferences/${key_1}`
+      }), requestOptions(preferencesRef.current[key_1], i18n.language));
       // reset any changes for this key after sending the request
-      delete pendingUpdate.current[key_0];
+      delete pendingUpdate.current[key_1];
     };
     // use timeout to allow multiple changes of different values using the same key in one request
     setTimeout(() => {
       void updatePreference();
     });
-  }, [api, getPreference, i18n.language, pendingUpdate]);
+  }, [api, getPreference, i18n.language, pendingUpdate, updateQueues]);
   contextRef.current.getPreference = getPreference;
   contextRef.current.setPreference = setPreference;
+  contextRef.current.syncPreference = syncPreference;
   return /*#__PURE__*/_jsx(Context, {
     value: contextRef.current,
     children: children

package/dist/providers/Preferences/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["dequal","formatAdminURL","React","createContext","use","useCallback","useEffect","useRef","useTranslation","requests","deepMergeSimple","useAuth","useConfig","Context","requestOptions","value","language","body","JSON","stringify","headers","PreferencesProvider","children","contextRef","preferencesRef","pendingUpdate","config","user","i18n","routes","api","current","getPreference","key","prefs","promise","Promise","resolve","request","get","apiRoute","path","credentials","status","preference","json","setPreference","merge","post","newValue","currentPreference","updatePreference","setTimeout","_jsx","usePreferences"],"sources":["../../../src/providers/Preferences/index.tsx"],"sourcesContent":["'use client'\nimport { dequal } from 'dequal/lite' // lite: no need for Map and Set support\nimport { formatAdminURL } from 'payload/shared'\nimport React, { createContext, use, useCallback, useEffect, useRef } from 'react'\n\nimport type { Preferences } from '../../forms/Form/types.js'\n\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { requests } from '../../utilities/api.js'\nimport { deepMergeSimple } from '../../utilities/deepMerge.js'\nimport { useAuth } from '../Auth/index.js'\nimport { useConfig } from '../Config/index.js'\n\ntype PreferencesContext = {\n  getPreference: <T = Preferences>(key: string) => Promise<T>\n  /**\n   * @param key - a string identifier for the property being set\n   * @param value - preference data to store\n   * @param merge - when true will combine the existing preference object batch the change into one request for objects, default = false\n   */\n  setPreference: <T = Preferences>(key: string, value: T, merge?: boolean) => Promise<void>\n}\n\nconst Context = createContext({} as PreferencesContext)\n\nconst requestOptions = (value, language) => ({\n  body: JSON.stringify({ value }),\n  headers: {\n    'Accept-Language': language,\n    'Content-Type': 'application/json',\n  },\n})\n\nexport const PreferencesProvider: React.FC<{ children?: React.ReactNode }> = ({ children }) => {\n  const contextRef = useRef({} as PreferencesContext)\n  const preferencesRef = useRef({})\n  const pendingUpdate = useRef({})\n  const { config } = useConfig()\n  const { user } = useAuth()\n  const { i18n } = useTranslation()\n\n  const {\n    routes: { api },\n  } = config\n\n  useEffect(() => {\n    if (!user) {\n      // clear preferences between users\n      preferencesRef.current = {}\n    }\n  }, [user])\n\n  const getPreference = useCallback(\n    async <T = unknown,>(key: string): Promise<T> => {\n      const prefs = preferencesRef.current\n\n      if (typeof prefs[key] !== 'undefined') {\n        return prefs[key]\n      }\n\n      const promise = new Promise((resolve: (value: T) => void) => {\n        void (async () => {\n          const request = await requests.get(\n            formatAdminURL({\n              apiRoute: api,\n              path: `/payload-preferences/${key}`,\n            }),\n            {\n              credentials: 'include',\n              headers: {\n                'Accept-Language': i18n.language,\n              },\n            },\n          )\n\n          let value = null\n\n          if (request.status === 200) {\n            const preference = await request.json()\n            value = preference.value\n          }\n\n          preferencesRef.current[key] = value\n\n          resolve(value)\n        })()\n      })\n\n      prefs[key] = promise\n\n      return promise\n    },\n    [i18n.language, api, preferencesRef],\n  )\n\n  const setPreference = useCallback(\n    async (key: string, value: unknown, merge = false): Promise<void> => {\n      if (merge === false) {\n        preferencesRef.current[key] = value\n\n        await requests.post(\n          formatAdminURL({\n            apiRoute: api,\n            path: `/payload-preferences/${key}`,\n          }),\n          requestOptions(value, i18n.language),\n        )\n\n        return\n      }\n\n      let newValue = value\n      const currentPreference = await getPreference(key)\n\n      // handle value objects where multiple values can be set under one key\n      if (\n        typeof value === 'object' &&\n        typeof currentPreference === 'object' &&\n        typeof newValue === 'object'\n      ) {\n        // merge the value with any existing preference for the key\n        if (currentPreference) {\n          newValue = deepMergeSimple(currentPreference, newValue)\n        }\n\n        if (dequal(newValue, currentPreference)) {\n          return\n        }\n\n        // add the requested changes to a pendingUpdate batch for the key\n        pendingUpdate.current[key] = {\n          ...pendingUpdate.current[key],\n          ...(newValue as Record<string, unknown>),\n        }\n      } else {\n        if (newValue === currentPreference) {\n          return\n        }\n\n        pendingUpdate.current[key] = newValue\n      }\n\n      const updatePreference = async () => {\n        // compare the value stored in context before sending to eliminate duplicate requests\n        if (dequal(pendingUpdate.current[key], preferencesRef.current[key])) {\n          return\n        }\n\n        // preference set in context here to prevent other updatePreference at the same time\n        preferencesRef.current[key] = pendingUpdate.current[key]\n\n        await requests.post(\n          formatAdminURL({\n            apiRoute: api,\n            path: `/payload-preferences/${key}`,\n          }),\n          requestOptions(preferencesRef.current[key], i18n.language),\n        )\n\n        // reset any changes for this key after sending the request\n        delete pendingUpdate.current[key]\n      }\n\n      // use timeout to allow multiple changes of different values using the same key in one request\n      setTimeout(() => {\n        void updatePreference()\n      })\n    },\n    [api, getPreference, i18n.language, pendingUpdate],\n  )\n\n  contextRef.current.getPreference = getPreference\n  contextRef.current.setPreference = setPreference\n  return <Context value={contextRef.current}>{children}</Context>\n}\n\nexport const usePreferences = (): PreferencesContext => use(Context)\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["dequal","formatAdminURL","React","createContext","use","useCallback","useEffect","useRef","useTranslation","requests","deepMergeSimple","useAuth","useConfig","Context","requestOptions","value","language","body","JSON","stringify","headers","PreferencesProvider","children","contextRef","preferencesRef","pendingUpdate","pendingWrites","updateQueues","config","user","i18n","routes","api","current","getPreference","key","prefs","promise","Promise","resolve","request","get","apiRoute","path","credentials","status","preference","json","syncPreference","setPreference","merge","updater","previousUpdate","update","then","nextValue","post","catch","undefined","newValue","currentPreference","updatePreference","setTimeout","_jsx","usePreferences"],"sources":["../../../src/providers/Preferences/index.tsx"],"sourcesContent":["'use client'\nimport { dequal } from 'dequal/lite' // lite: no need for Map and Set support\nimport { formatAdminURL } from 'payload/shared'\nimport React, { createContext, use, useCallback, useEffect, useRef } from 'react'\n\nimport type { Preferences } from '../../forms/Form/types.js'\n\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { requests } from '../../utilities/api.js'\nimport { deepMergeSimple } from '../../utilities/deepMerge.js'\nimport { useAuth } from '../Auth/index.js'\nimport { useConfig } from '../Config/index.js'\n\ntype PreferenceUpdater<T> = (current: null | T) => T\n\ntype SetPreference = {\n  <T = Preferences>(key: string, updater: PreferenceUpdater<T>): Promise<void>\n  <T = Preferences>(key: string, value: T, merge?: boolean): Promise<void>\n}\n\ntype PreferencesContext = {\n  getPreference: <T = Preferences>(key: string) => Promise<T>\n  /**\n   * @param key - a string identifier for the property being set\n   * @param value - preference data to store\n   * @param merge - when true will combine the existing preference object batch the change into one request for objects, default = false\n   */\n  setPreference: SetPreference\n  syncPreference: <T = Preferences>(key: string, value: T) => void\n}\n\nconst Context = createContext({} as PreferencesContext)\n\nconst requestOptions = (value, language) => ({\n  body: JSON.stringify({ value }),\n  headers: {\n    'Accept-Language': language,\n    'Content-Type': 'application/json',\n  },\n})\n\nexport const PreferencesProvider: React.FC<{ children?: React.ReactNode }> = ({ children }) => {\n  const contextRef = useRef({} as PreferencesContext)\n  const preferencesRef = useRef({})\n  const pendingUpdate = useRef({})\n  const pendingWrites = useRef<Record<string, number>>({})\n  const updateQueues = useRef<Record<string, Promise<void>>>({})\n  const { config } = useConfig()\n  const { user } = useAuth()\n  const { i18n } = useTranslation()\n\n  const {\n    routes: { api },\n  } = config\n\n  useEffect(() => {\n    if (!user) {\n      // clear preferences between users\n      preferencesRef.current = {}\n      pendingUpdate.current = {}\n      pendingWrites.current = {}\n      updateQueues.current = {}\n    }\n  }, [user])\n\n  const getPreference = useCallback(\n    async <T = unknown,>(key: string): Promise<T> => {\n      const prefs = preferencesRef.current\n\n      if (typeof prefs[key] !== 'undefined') {\n        return prefs[key]\n      }\n\n      const promise = new Promise((resolve: (value: T) => void) => {\n        void (async () => {\n          const request = await requests.get(\n            formatAdminURL({\n              apiRoute: api,\n              path: `/payload-preferences/${key}`,\n            }),\n            {\n              credentials: 'include',\n              headers: {\n                'Accept-Language': i18n.language,\n              },\n            },\n          )\n\n          let value = null\n\n          if (request.status === 200) {\n            const preference = await request.json()\n            value = preference.value\n          }\n\n          if (prefs[key] === promise) {\n            prefs[key] = value\n            resolve(value)\n          } else {\n            resolve(await prefs[key])\n          }\n        })()\n      })\n\n      prefs[key] = promise\n\n      return promise\n    },\n    [i18n.language, api, preferencesRef],\n  )\n\n  const syncPreference = useCallback(<T = Preferences,>(key: string, value: T): void => {\n    if (pendingWrites.current[key] || typeof pendingUpdate.current[key] !== 'undefined') {\n      return\n    }\n\n    preferencesRef.current[key] = value\n  }, [])\n\n  const setPreference = useCallback(\n    async <T = Preferences,>(\n      key: string,\n      value: PreferenceUpdater<T> | T,\n      merge = false,\n    ): Promise<void> => {\n      if (typeof value === 'function') {\n        const updater = value as PreferenceUpdater<T>\n        const previousUpdate = updateQueues.current[key] ?? Promise.resolve()\n        pendingWrites.current[key] = (pendingWrites.current[key] ?? 0) + 1\n        const update = previousUpdate.then(async () => {\n          const current = await getPreference<T>(key)\n          const nextValue = updater(current ?? null)\n\n          preferencesRef.current[key] = nextValue\n\n          await requests.post(\n            formatAdminURL({\n              apiRoute: api,\n              path: `/payload-preferences/${key}`,\n            }),\n            requestOptions(nextValue, i18n.language),\n          )\n        })\n\n        updateQueues.current[key] = update.catch(() => undefined)\n        try {\n          await update\n        } finally {\n          pendingWrites.current[key] -= 1\n        }\n        return\n      }\n\n      if (merge === false) {\n        preferencesRef.current[key] = value\n        pendingWrites.current[key] = (pendingWrites.current[key] ?? 0) + 1\n\n        try {\n          await requests.post(\n            formatAdminURL({\n              apiRoute: api,\n              path: `/payload-preferences/${key}`,\n            }),\n            requestOptions(value, i18n.language),\n          )\n        } finally {\n          pendingWrites.current[key] -= 1\n        }\n\n        return\n      }\n\n      let newValue = value\n      const currentPreference = await getPreference(key)\n\n      // handle value objects where multiple values can be set under one key\n      if (\n        typeof value === 'object' &&\n        typeof currentPreference === 'object' &&\n        typeof newValue === 'object'\n      ) {\n        // merge the value with any existing preference for the key\n        if (currentPreference) {\n          newValue = deepMergeSimple(currentPreference, newValue)\n        }\n\n        if (dequal(newValue, currentPreference)) {\n          return\n        }\n\n        // add the requested changes to a pendingUpdate batch for the key\n        pendingUpdate.current[key] = {\n          ...pendingUpdate.current[key],\n          ...(newValue as Record<string, unknown>),\n        }\n      } else {\n        if (newValue === currentPreference) {\n          return\n        }\n\n        pendingUpdate.current[key] = newValue\n      }\n\n      const updatePreference = async () => {\n        // compare the value stored in context before sending to eliminate duplicate requests\n        if (dequal(pendingUpdate.current[key], preferencesRef.current[key])) {\n          return\n        }\n\n        // preference set in context here to prevent other updatePreference at the same time\n        preferencesRef.current[key] = pendingUpdate.current[key]\n\n        await requests.post(\n          formatAdminURL({\n            apiRoute: api,\n            path: `/payload-preferences/${key}`,\n          }),\n          requestOptions(preferencesRef.current[key], i18n.language),\n        )\n\n        // reset any changes for this key after sending the request\n        delete pendingUpdate.current[key]\n      }\n\n      // use timeout to allow multiple changes of different values using the same key in one request\n      setTimeout(() => {\n        void updatePreference()\n      })\n    },\n    [api, getPreference, i18n.language, pendingUpdate, updateQueues],\n  )\n\n  contextRef.current.getPreference = getPreference\n  contextRef.current.setPreference = setPreference\n  contextRef.current.syncPreference = syncPreference\n  return <Context value={contextRef.current}>{children}</Context>\n}\n\nexport const usePreferences = (): PreferencesContext => use(Context)\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/TableColumns/buildColumnState/index.d.ts

@@ -10,6 +10,7 @@ export type BuildColumnStateArgs = {
     enableRowSelections: boolean;
     enableRowTypes?: boolean;
     fieldPermissions?: SanitizedFieldsPermissions;
+    hierarchyParentFieldName?: string;
     i18n: I18nClient;
     payload: Payload;
     req?: PayloadRequest;

package/dist/providers/TableColumns/buildColumnState/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAEV,WAAW,EACX,qBAAqB,EACrB,cAAc,EACd,MAAM,EACN,yBAAyB,EACzB,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,EACP,cAAc,EACd,yBAAyB,EACzB,0BAA0B,EAG1B,SAAS,EACV,MAAM,SAAS,CAAA;AAUhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAA;AAY5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAC1C,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,0BAA0B,CAAA;IAC7C,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,YAAY,EAAE,KAAK,EAAE,CAAA;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAC1C,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;IAC5D,QAAQ,CAAC,EAAE,SAAS,CAAA;CACrB,GAAG,CACA;IACE,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAC5B,GACD;IACE,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;CACJ,CACJ,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,oBAAoB,KAAG,MAAM,EA+NnE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAEV,WAAW,EACX,qBAAqB,EACrB,cAAc,EACd,MAAM,EACN,yBAAyB,EACzB,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,EACP,cAAc,EACd,yBAAyB,EACzB,0BAA0B,EAG1B,SAAS,EACV,MAAM,SAAS,CAAA;AAUhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAA;AAY5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAC1C,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,0BAA0B,CAAA;IAC7C,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,YAAY,EAAE,KAAK,EAAE,CAAA;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAC1C,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;IAC5D,QAAQ,CAAC,EAAE,SAAS,CAAA;CACrB,GAAG,CACA;IACE,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAC5B,GACD;IACE,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;CACJ,CACJ,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,oBAAoB,KAAG,MAAM,EAiOnE,CAAA"}

package/dist/providers/TableColumns/buildColumnState/index.js

@@ -19,6 +19,7 @@ export const buildColumnState = args => {
     enableLinkedCell = true,
     enableRowSelections,
     fieldPermissions,
+    hierarchyParentFieldName,
     i18n,
     payload,
     req,
@@ -138,6 +139,7 @@ export const buildColumnState = args => {
           customCellProps,
           doc: dataType === 'monomorphic' ? doc : doc.value,
           enableRowSelections,
+          hierarchyParentFieldName,
           i18n,
           isLinkedColumn,
           payload,

package/dist/providers/TableColumns/buildColumnState/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["fieldIsHiddenOrDisabled","fieldIsID","fieldIsPresentationalOnly","flattenTopLevelFields","React","RenderServerComponent","SortColumn","filterFieldsWithPermissions","isColumnActive","renderCell","sortFieldMap","buildColumnState","args","beforeRows","clientFields","collectionSlug","columns","customCellProps","dataType","docs","enableLinkedCell","enableRowSelections","fieldPermissions","i18n","payload","req","serverFields","sortColumnProps","useAsTitle","viewType","sortedFieldMap","fields","keepPresentationalFields","moveSubFieldsToTop","_sortedFieldMap","idFieldIndex","findIndex","field","idField","splice","unshift","useAsTitleFieldIndex","name","useAsTitleField","sortTo","activeColumnsIndices","sorted","reduce","acc","clientField","colIndex","accessor","undefined","serverField","find","f","fAccessor","hasCustomCell","admin","components","Cell","type","columnPref","preference","isActive","column","includes","push","CustomLabel","CustomLabelToRender","Label","clientProps","customLabelServerProps","Component","importMap","serverProps","fieldAffectsDataSubFields","label","labelWithPrefix","dotAccessor","replace","isVirtualField","virtual","Heading","_jsx","disable","isLinkedColumn","active","renderedCells","map","doc","rowIndex","relationTo","columnIndex","value"],"sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientComponentProps,\n  ClientField,\n  CollectionPreferences,\n  CollectionSlug,\n  Column,\n  DefaultCellComponentProps,\n  Document,\n  Field,\n  PaginatedDocs,\n  Payload,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedFieldsPermissions,\n  ServerComponentProps,\n  StaticLabel,\n  ViewTypes,\n} from 'payload'\n\nimport {\n  fieldIsHiddenOrDisabled,\n  fieldIsID,\n  fieldIsPresentationalOnly,\n  flattenTopLevelFields,\n} from 'payload/shared'\nimport React from 'react'\n\nimport type { SortColumnProps } from '../../../elements/SortColumn/index.js'\n\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  SortColumn,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { filterFieldsWithPermissions } from './filterFieldsWithPermissions.js'\nimport { isColumnActive } from './isColumnActive.js'\nimport { renderCell } from './renderCell.js'\nimport { sortFieldMap } from './sortFieldMap.js'\n\nexport type BuildColumnStateArgs = {\n  beforeRows?: Column[]\n  clientFields: ClientField[]\n  columns?: CollectionPreferences['columns']\n  customCellProps: DefaultCellComponentProps['customCellProps']\n  enableLinkedCell?: boolean\n  enableRowSelections: boolean\n  enableRowTypes?: boolean\n  fieldPermissions?: SanitizedFieldsPermissions\n  i18n: I18nClient\n  payload: Payload\n  req?: PayloadRequest\n  serverFields: Field[]\n  sortColumnProps?: Partial<SortColumnProps>\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n  viewType?: ViewTypes\n} & (\n  | {\n      collectionSlug: CollectionSlug\n      dataType: 'monomorphic'\n      docs: PaginatedDocs['docs']\n    }\n  | {\n      collectionSlug?: undefined\n      dataType: 'polymorphic'\n      docs: {\n        relationTo: CollectionSlug\n        value: Document\n      }[]\n    }\n)\n\nexport const buildColumnState = (args: BuildColumnStateArgs): Column[] => {\n  const {\n    beforeRows,\n    clientFields,\n    collectionSlug,\n    columns,\n    customCellProps,\n    dataType,\n    docs,\n    enableLinkedCell = true,\n    enableRowSelections,\n    fieldPermissions,\n    i18n,\n    payload,\n    req,\n    serverFields,\n    sortColumnProps,\n    useAsTitle,\n    viewType,\n  } = args\n\n  // clientFields contains the fake `id` column\n  let sortedFieldMap = flattenTopLevelFields(\n    filterFieldsWithPermissions({ fieldPermissions, fields: clientFields }),\n    {\n      i18n,\n      keepPresentationalFields: true,\n      moveSubFieldsToTop: true,\n    },\n  ) as ClientField[]\n\n  let _sortedFieldMap = flattenTopLevelFields(\n    filterFieldsWithPermissions({\n      fieldPermissions,\n      fields: serverFields,\n    }),\n    {\n      i18n,\n      keepPresentationalFields: true,\n      moveSubFieldsToTop: true,\n    },\n  ) as Field[] // TODO: think of a way to avoid this additional flatten\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columns`\n  const idFieldIndex = sortedFieldMap?.findIndex((field) => fieldIsID(field))\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => 'name' in field && field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columns`\n    sortedFieldMap = sortFieldMap<ClientField>(sortedFieldMap, sortTo)\n    _sortedFieldMap = sortFieldMap<Field>(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap?.reduce((acc, clientField, colIndex) => {\n    if (fieldIsHiddenOrDisabled(clientField) && !fieldIsID(clientField)) {\n      return acc\n    }\n\n    const accessor =\n      (clientField as any).accessor ?? ('name' in clientField ? clientField.name : undefined)\n\n    const serverField = _sortedFieldMap.find((f) => {\n      const fAccessor = (f as any).accessor ?? ('name' in f ? f.name : undefined)\n      return fAccessor === accessor\n    })\n\n    const hasCustomCell =\n      serverField?.admin &&\n      'components' in serverField.admin &&\n      serverField.admin.components &&\n      'Cell' in serverField.admin.components &&\n      serverField.admin.components.Cell\n\n    if (serverField && serverField.type === 'group' && !hasCustomCell) {\n      return acc // skip any group without a custom cell\n    }\n\n    const columnPref = columns?.find(\n      (preference) => clientField && 'name' in clientField && preference.accessor === accessor,\n    )\n\n    const isActive = isColumnActive({\n      accessor,\n      activeColumnsIndices,\n      column: columnPref,\n      columns,\n    })\n\n    if (isActive && !activeColumnsIndices.includes(colIndex)) {\n      activeColumnsIndices.push(colIndex)\n    }\n\n    let CustomLabel = undefined\n\n    if (dataType === 'monomorphic') {\n      const CustomLabelToRender =\n        serverField &&\n        'admin' in serverField &&\n        'components' in serverField.admin &&\n        serverField.admin.components &&\n        'Label' in serverField.admin.components &&\n        serverField.admin.components.Label !== undefined // let it return `null`\n          ? serverField.admin.components.Label\n          : undefined\n\n      const clientProps: ClientComponentProps = {\n        field: clientField,\n      }\n\n      const customLabelServerProps: Pick<\n        ServerComponentProps,\n        'clientField' | 'collectionSlug' | 'field' | 'i18n' | 'payload'\n      > = {\n        clientField,\n        collectionSlug,\n        field: serverField,\n        i18n,\n        payload,\n      }\n\n      CustomLabel = CustomLabelToRender\n        ? RenderServerComponent({\n            clientProps,\n            Component: CustomLabelToRender,\n            importMap: payload.importMap,\n            serverProps: customLabelServerProps,\n          })\n        : undefined\n    }\n\n    const fieldAffectsDataSubFields =\n      clientField &&\n      clientField.type &&\n      (clientField.type === 'array' ||\n        clientField.type === 'group' ||\n        clientField.type === 'blocks')\n\n    const label =\n      clientField && 'labelWithPrefix' in clientField && clientField.labelWithPrefix !== undefined\n        ? clientField.labelWithPrefix\n        : 'label' in clientField\n          ? clientField.label\n          : undefined\n\n    // Convert accessor to dot notation specifically for SortColumn sorting behavior\n    const dotAccessor = accessor?.replace(/-/g, '.')\n\n    const isVirtualField = serverField && 'virtual' in serverField && serverField.virtual === true\n\n    const Heading = (\n      <SortColumn\n        disable={\n          fieldAffectsDataSubFields ||\n          fieldIsPresentationalOnly(clientField) ||\n          isVirtualField ||\n          undefined\n        }\n        Label={CustomLabel}\n        label={label as StaticLabel}\n        name={dotAccessor}\n        {...(sortColumnProps || {})}\n      />\n    )\n\n    const isLinkedColumn = enableLinkedCell && colIndex === activeColumnsIndices[0]\n\n    const column: Column = {\n      accessor,\n      active: isActive,\n      CustomLabel,\n      field: clientField,\n      Heading,\n      isLinkedColumn,\n      renderedCells: isActive\n        ? docs.map((doc, rowIndex) => {\n            return renderCell({\n              clientField,\n              collectionSlug: dataType === 'monomorphic' ? collectionSlug : doc.relationTo,\n              columnIndex: colIndex,\n              customCellProps,\n              doc: dataType === 'monomorphic' ? doc : doc.value,\n              enableRowSelections,\n              i18n,\n              isLinkedColumn,\n              payload,\n              req,\n              rowIndex,\n              serverField,\n              viewType,\n            })\n          })\n        : [],\n    }\n\n    acc.push(column)\n\n    return acc\n  }, [])\n\n  if (beforeRows) {\n    sorted.unshift(...beforeRows)\n  }\n\n  return sorted\n}\n"],"mappings":";AAoBA,SACEA,uBAAuB,EACvBC,SAAS,EACTC,yBAAyB,EACzBC,qBAAqB,QAChB;AACP,OAAOC,KAAA,MAAW;AAIlB,SAASC,qBAAqB,QAAQ;AACtC,SACEC,UAAU,QAEL;AACP,SAASC,2BAA2B,QAAQ;AAC5C,SAASC,cAAc,QAAQ;AAC/B,SAASC,UAAU,QAAQ;AAC3B,SAASC,YAAY,QAAQ;AAkC7B,OAAO,MAAMC,gBAAA,GAAoBC,IAAA;EAC/B,MAAM;IACJC,UAAU;IACVC,YAAY;IACZC,cAAc;IACdC,OAAO;IACPC,eAAe;IACfC,QAAQ;IACRC,IAAI;IACJC,gBAAA,GAAmB,IAAI;IACvBC,mBAAmB;IACnBC,gBAAgB;IAChBC,IAAI;IACJC,OAAO;IACPC,GAAG;IACHC,YAAY;IACZC,eAAe;IACfC,UAAU;IACVC;EAAQ,CACT,GAAGjB,IAAA;EAEJ;EACA,IAAIkB,cAAA,GAAiB3B,qBAAA,CACnBI,2BAAA,CAA4B;IAAEe,gBAAA;IAAkBS,MAAA,EAAQjB;EAAa,IACrE;IACES,IAAA;IACAS,wBAAA,EAA0B;IAC1BC,kBAAA,EAAoB;EACtB;EAGF,IAAIC,eAAA,GAAkB/B,qBAAA,CACpBI,2BAAA,CAA4B;IAC1Be,gBAAA;IACAS,MAAA,EAAQL;EACV,IACA;IACEH,IAAA;IACAS,wBAAA,EAA0B;IAC1BC,kBAAA,EAAoB;EACtB,EACW;AAAA;EAEb;EACA;EACA;EACA,MAAME,YAAA,GAAeL,cAAA,EAAgBM,SAAA,CAAWC,KAAA,IAAUpC,SAAA,CAAUoC,KAAA;EAEpE,IAAIF,YAAA,GAAe,CAAC,GAAG;IACrB,MAAMG,OAAA,GAAUR,cAAA,CAAeS,MAAM,CAACJ,YAAA,EAAc,EAAE,CAAC,EAAE;IACzDL,cAAA,CAAeU,OAAO,CAACF,OAAA;EACzB;EAEA,MAAMG,oBAAA,GAAuBb,UAAA,GACzBE,cAAA,CAAeM,SAAS,CAAEC,KAAA,IAAU,UAAUA,KAAA,IAASA,KAAA,CAAMK,IAAI,KAAKd,UAAA,IACtE,CAAC;EAEL,IAAIa,oBAAA,GAAuB,CAAC,GAAG;IAC7B,MAAME,eAAA,GAAkBb,cAAA,CAAeS,MAAM,CAACE,oBAAA,EAAsB,EAAE,CAAC,EAAE;IACzEX,cAAA,CAAeU,OAAO,CAACG,eAAA;EACzB;EAEA,MAAMC,MAAA,GAAS5B,OAAA;EAEf,IAAI4B,MAAA,EAAQ;IACV;IACAd,cAAA,GAAiBpB,YAAA,CAA0BoB,cAAA,EAAgBc,MAAA;IAC3DV,eAAA,GAAkBxB,YAAA,CAAoBwB,eAAA,EAAiBU,MAAA,GAAQ;EACjE;EAEA,MAAMC,oBAAA,GAAuB,EAAE;EAE/B,MAAMC,MAAA,GAAmBhB,cAAA,EAAgBiB,MAAA,CAAO,CAACC,GAAA,EAAKC,WAAA,EAAaC,QAAA;IACjE,IAAIlD,uBAAA,CAAwBiD,WAAA,KAAgB,CAAChD,SAAA,CAAUgD,WAAA,GAAc;MACnE,OAAOD,GAAA;IACT;IAEA,MAAMG,QAAA,GACJF,WAAC,CAAoBE,QAAQ,KAAK,UAAUF,WAAA,GAAcA,WAAA,CAAYP,IAAI,GAAGU,SAAQ;IAEvF,MAAMC,WAAA,GAAcnB,eAAA,CAAgBoB,IAAI,CAAEC,CAAA;MACxC,MAAMC,SAAA,GAAYD,CAAC,CAAUJ,QAAQ,KAAK,UAAUI,CAAA,GAAIA,CAAA,CAAEb,IAAI,GAAGU,SAAQ;MACzE,OAAOI,SAAA,KAAcL,QAAA;IACvB;IAEA,MAAMM,aAAA,GACJJ,WAAA,EAAaK,KAAA,IACb,gBAAgBL,WAAA,CAAYK,KAAK,IACjCL,WAAA,CAAYK,KAAK,CAACC,UAAU,IAC5B,UAAUN,WAAA,CAAYK,KAAK,CAACC,UAAU,IACtCN,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACC,IAAI;IAEnC,IAAIP,WAAA,IAAeA,WAAA,CAAYQ,IAAI,KAAK,WAAW,CAACJ,aAAA,EAAe;MACjE,OAAOT,GAAA,CAAI;AAAA;IACb;IAEA,MAAMc,UAAA,GAAa9C,OAAA,EAASsC,IAAA,CACzBS,UAAA,IAAed,WAAA,IAAe,UAAUA,WAAA,IAAec,UAAA,CAAWZ,QAAQ,KAAKA,QAAA;IAGlF,MAAMa,QAAA,GAAWxD,cAAA,CAAe;MAC9B2C,QAAA;MACAN,oBAAA;MACAoB,MAAA,EAAQH,UAAA;MACR9C;IACF;IAEA,IAAIgD,QAAA,IAAY,CAACnB,oBAAA,CAAqBqB,QAAQ,CAAChB,QAAA,GAAW;MACxDL,oBAAA,CAAqBsB,IAAI,CAACjB,QAAA;IAC5B;IAEA,IAAIkB,WAAA,GAAchB,SAAA;IAElB,IAAIlC,QAAA,KAAa,eAAe;MAC9B,MAAMmD,mBAAA,GACJhB,WAAA,IACA,WAAWA,WAAA,IACX,gBAAgBA,WAAA,CAAYK,KAAK,IACjCL,WAAA,CAAYK,KAAK,CAACC,UAAU,IAC5B,WAAWN,WAAA,CAAYK,KAAK,CAACC,UAAU,IACvCN,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACW,KAAK,KAAKlB,SAAA,CAAU;MAAA,EAC7CC,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACW,KAAK,GAClClB,SAAA;MAEN,MAAMmB,WAAA,GAAoC;QACxClC,KAAA,EAAOY;MACT;MAEA,MAAMuB,sBAAA,GAGF;QACFvB,WAAA;QACAlC,cAAA;QACAsB,KAAA,EAAOgB,WAAA;QACP9B,IAAA;QACAC;MACF;MAEA4C,WAAA,GAAcC,mBAAA,GACVhE,qBAAA,CAAsB;QACpBkE,WAAA;QACAE,SAAA,EAAWJ,mBAAA;QACXK,SAAA,EAAWlD,OAAA,CAAQkD,SAAS;QAC5BC,WAAA,EAAaH;MACf,KACApB,SAAA;IACN;IAEA,MAAMwB,yBAAA,GACJ3B,WAAA,IACAA,WAAA,CAAYY,IAAI,KACfZ,WAAA,CAAYY,IAAI,KAAK,WACpBZ,WAAA,CAAYY,IAAI,KAAK,WACrBZ,WAAA,CAAYY,IAAI,KAAK,QAAO;IAEhC,MAAMgB,KAAA,GACJ5B,WAAA,IAAe,qBAAqBA,WAAA,IAAeA,WAAA,CAAY6B,eAAe,KAAK1B,SAAA,GAC/EH,WAAA,CAAY6B,eAAe,GAC3B,WAAW7B,WAAA,GACTA,WAAA,CAAY4B,KAAK,GACjBzB,SAAA;IAER;IACA,MAAM2B,WAAA,GAAc5B,QAAA,EAAU6B,OAAA,CAAQ,MAAM;IAE5C,MAAMC,cAAA,GAAiB5B,WAAA,IAAe,aAAaA,WAAA,IAAeA,WAAA,CAAY6B,OAAO,KAAK;IAE1F,MAAMC,OAAA,gBACJC,IAAA,CAAC9E,UAAA;MACC+E,OAAA,EACET,yBAAA,IACA1E,yBAAA,CAA0B+C,WAAA,KAC1BgC,cAAA,IACA7B,SAAA;MAEFkB,KAAA,EAAOF,WAAA;MACPS,KAAA,EAAOA,KAAA;MACPnC,IAAA,EAAMqC,WAAA;MACL,IAAIpD,eAAA,IAAmB,CAAC,CAAC;;IAI9B,MAAM2D,cAAA,GAAiBlE,gBAAA,IAAoB8B,QAAA,KAAaL,oBAAoB,CAAC,EAAE;IAE/E,MAAMoB,MAAA,GAAiB;MACrBd,QAAA;MACAoC,MAAA,EAAQvB,QAAA;MACRI,WAAA;MACA/B,KAAA,EAAOY,WAAA;MACPkC,OAAA;MACAG,cAAA;MACAE,aAAA,EAAexB,QAAA,GACX7C,IAAA,CAAKsE,GAAG,CAAC,CAACC,GAAA,EAAKC,QAAA;QACb,OAAOlF,UAAA,CAAW;UAChBwC,WAAA;UACAlC,cAAA,EAAgBG,QAAA,KAAa,gBAAgBH,cAAA,GAAiB2E,GAAA,CAAIE,UAAU;UAC5EC,WAAA,EAAa3C,QAAA;UACbjC,eAAA;UACAyE,GAAA,EAAKxE,QAAA,KAAa,gBAAgBwE,GAAA,GAAMA,GAAA,CAAII,KAAK;UACjDzE,mBAAA;UACAE,IAAA;UACA+D,cAAA;UACA9D,OAAA;UACAC,GAAA;UACAkE,QAAA;UACAtC,WAAA;UACAxB;QACF;MACF,KACA;IACN;IAEAmB,GAAA,CAAImB,IAAI,CAACF,MAAA;IAET,OAAOjB,GAAA;EACT,GAAG,EAAE;EAEL,IAAInC,UAAA,EAAY;IACdiC,MAAA,CAAON,OAAO,IAAI3B,UAAA;EACpB;EAEA,OAAOiC,MAAA;AACT","ignoreList":[]}
+{"version":3,"file":"index.js","names":["fieldIsHiddenOrDisabled","fieldIsID","fieldIsPresentationalOnly","flattenTopLevelFields","React","RenderServerComponent","SortColumn","filterFieldsWithPermissions","isColumnActive","renderCell","sortFieldMap","buildColumnState","args","beforeRows","clientFields","collectionSlug","columns","customCellProps","dataType","docs","enableLinkedCell","enableRowSelections","fieldPermissions","hierarchyParentFieldName","i18n","payload","req","serverFields","sortColumnProps","useAsTitle","viewType","sortedFieldMap","fields","keepPresentationalFields","moveSubFieldsToTop","_sortedFieldMap","idFieldIndex","findIndex","field","idField","splice","unshift","useAsTitleFieldIndex","name","useAsTitleField","sortTo","activeColumnsIndices","sorted","reduce","acc","clientField","colIndex","accessor","undefined","serverField","find","f","fAccessor","hasCustomCell","admin","components","Cell","type","columnPref","preference","isActive","column","includes","push","CustomLabel","CustomLabelToRender","Label","clientProps","customLabelServerProps","Component","importMap","serverProps","fieldAffectsDataSubFields","label","labelWithPrefix","dotAccessor","replace","isVirtualField","virtual","Heading","_jsx","disable","isLinkedColumn","active","renderedCells","map","doc","rowIndex","relationTo","columnIndex","value"],"sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientComponentProps,\n  ClientField,\n  CollectionPreferences,\n  CollectionSlug,\n  Column,\n  DefaultCellComponentProps,\n  Document,\n  Field,\n  PaginatedDocs,\n  Payload,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedFieldsPermissions,\n  ServerComponentProps,\n  StaticLabel,\n  ViewTypes,\n} from 'payload'\n\nimport {\n  fieldIsHiddenOrDisabled,\n  fieldIsID,\n  fieldIsPresentationalOnly,\n  flattenTopLevelFields,\n} from 'payload/shared'\nimport React from 'react'\n\nimport type { SortColumnProps } from '../../../elements/SortColumn/index.js'\n\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  SortColumn,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { filterFieldsWithPermissions } from './filterFieldsWithPermissions.js'\nimport { isColumnActive } from './isColumnActive.js'\nimport { renderCell } from './renderCell.js'\nimport { sortFieldMap } from './sortFieldMap.js'\n\nexport type BuildColumnStateArgs = {\n  beforeRows?: Column[]\n  clientFields: ClientField[]\n  columns?: CollectionPreferences['columns']\n  customCellProps: DefaultCellComponentProps['customCellProps']\n  enableLinkedCell?: boolean\n  enableRowSelections: boolean\n  enableRowTypes?: boolean\n  fieldPermissions?: SanitizedFieldsPermissions\n  hierarchyParentFieldName?: string\n  i18n: I18nClient\n  payload: Payload\n  req?: PayloadRequest\n  serverFields: Field[]\n  sortColumnProps?: Partial<SortColumnProps>\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n  viewType?: ViewTypes\n} & (\n  | {\n      collectionSlug: CollectionSlug\n      dataType: 'monomorphic'\n      docs: PaginatedDocs['docs']\n    }\n  | {\n      collectionSlug?: undefined\n      dataType: 'polymorphic'\n      docs: {\n        relationTo: CollectionSlug\n        value: Document\n      }[]\n    }\n)\n\nexport const buildColumnState = (args: BuildColumnStateArgs): Column[] => {\n  const {\n    beforeRows,\n    clientFields,\n    collectionSlug,\n    columns,\n    customCellProps,\n    dataType,\n    docs,\n    enableLinkedCell = true,\n    enableRowSelections,\n    fieldPermissions,\n    hierarchyParentFieldName,\n    i18n,\n    payload,\n    req,\n    serverFields,\n    sortColumnProps,\n    useAsTitle,\n    viewType,\n  } = args\n\n  // clientFields contains the fake `id` column\n  let sortedFieldMap = flattenTopLevelFields(\n    filterFieldsWithPermissions({ fieldPermissions, fields: clientFields }),\n    {\n      i18n,\n      keepPresentationalFields: true,\n      moveSubFieldsToTop: true,\n    },\n  ) as ClientField[]\n\n  let _sortedFieldMap = flattenTopLevelFields(\n    filterFieldsWithPermissions({\n      fieldPermissions,\n      fields: serverFields,\n    }),\n    {\n      i18n,\n      keepPresentationalFields: true,\n      moveSubFieldsToTop: true,\n    },\n  ) as Field[] // TODO: think of a way to avoid this additional flatten\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columns`\n  const idFieldIndex = sortedFieldMap?.findIndex((field) => fieldIsID(field))\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => 'name' in field && field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columns`\n    sortedFieldMap = sortFieldMap<ClientField>(sortedFieldMap, sortTo)\n    _sortedFieldMap = sortFieldMap<Field>(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap?.reduce((acc, clientField, colIndex) => {\n    if (fieldIsHiddenOrDisabled(clientField) && !fieldIsID(clientField)) {\n      return acc\n    }\n\n    const accessor =\n      (clientField as any).accessor ?? ('name' in clientField ? clientField.name : undefined)\n\n    const serverField = _sortedFieldMap.find((f) => {\n      const fAccessor = (f as any).accessor ?? ('name' in f ? f.name : undefined)\n      return fAccessor === accessor\n    })\n\n    const hasCustomCell =\n      serverField?.admin &&\n      'components' in serverField.admin &&\n      serverField.admin.components &&\n      'Cell' in serverField.admin.components &&\n      serverField.admin.components.Cell\n\n    if (serverField && serverField.type === 'group' && !hasCustomCell) {\n      return acc // skip any group without a custom cell\n    }\n\n    const columnPref = columns?.find(\n      (preference) => clientField && 'name' in clientField && preference.accessor === accessor,\n    )\n\n    const isActive = isColumnActive({\n      accessor,\n      activeColumnsIndices,\n      column: columnPref,\n      columns,\n    })\n\n    if (isActive && !activeColumnsIndices.includes(colIndex)) {\n      activeColumnsIndices.push(colIndex)\n    }\n\n    let CustomLabel = undefined\n\n    if (dataType === 'monomorphic') {\n      const CustomLabelToRender =\n        serverField &&\n        'admin' in serverField &&\n        'components' in serverField.admin &&\n        serverField.admin.components &&\n        'Label' in serverField.admin.components &&\n        serverField.admin.components.Label !== undefined // let it return `null`\n          ? serverField.admin.components.Label\n          : undefined\n\n      const clientProps: ClientComponentProps = {\n        field: clientField,\n      }\n\n      const customLabelServerProps: Pick<\n        ServerComponentProps,\n        'clientField' | 'collectionSlug' | 'field' | 'i18n' | 'payload'\n      > = {\n        clientField,\n        collectionSlug,\n        field: serverField,\n        i18n,\n        payload,\n      }\n\n      CustomLabel = CustomLabelToRender\n        ? RenderServerComponent({\n            clientProps,\n            Component: CustomLabelToRender,\n            importMap: payload.importMap,\n            serverProps: customLabelServerProps,\n          })\n        : undefined\n    }\n\n    const fieldAffectsDataSubFields =\n      clientField &&\n      clientField.type &&\n      (clientField.type === 'array' ||\n        clientField.type === 'group' ||\n        clientField.type === 'blocks')\n\n    const label =\n      clientField && 'labelWithPrefix' in clientField && clientField.labelWithPrefix !== undefined\n        ? clientField.labelWithPrefix\n        : 'label' in clientField\n          ? clientField.label\n          : undefined\n\n    // Convert accessor to dot notation specifically for SortColumn sorting behavior\n    const dotAccessor = accessor?.replace(/-/g, '.')\n\n    const isVirtualField = serverField && 'virtual' in serverField && serverField.virtual === true\n\n    const Heading = (\n      <SortColumn\n        disable={\n          fieldAffectsDataSubFields ||\n          fieldIsPresentationalOnly(clientField) ||\n          isVirtualField ||\n          undefined\n        }\n        Label={CustomLabel}\n        label={label as StaticLabel}\n        name={dotAccessor}\n        {...(sortColumnProps || {})}\n      />\n    )\n\n    const isLinkedColumn = enableLinkedCell && colIndex === activeColumnsIndices[0]\n\n    const column: Column = {\n      accessor,\n      active: isActive,\n      CustomLabel,\n      field: clientField,\n      Heading,\n      isLinkedColumn,\n      renderedCells: isActive\n        ? docs.map((doc, rowIndex) => {\n            return renderCell({\n              clientField,\n              collectionSlug: dataType === 'monomorphic' ? collectionSlug : doc.relationTo,\n              columnIndex: colIndex,\n              customCellProps,\n              doc: dataType === 'monomorphic' ? doc : doc.value,\n              enableRowSelections,\n              hierarchyParentFieldName,\n              i18n,\n              isLinkedColumn,\n              payload,\n              req,\n              rowIndex,\n              serverField,\n              viewType,\n            })\n          })\n        : [],\n    }\n\n    acc.push(column)\n\n    return acc\n  }, [])\n\n  if (beforeRows) {\n    sorted.unshift(...beforeRows)\n  }\n\n  return sorted\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/TableColumns/buildColumnState/renderCell.d.ts

@@ -8,6 +8,7 @@ type RenderCellArgs = {
     readonly customCellProps: DefaultCellComponentProps['customCellProps'];
     readonly doc: Document;
     readonly enableRowSelections: boolean;
+    readonly hierarchyParentFieldName?: string;
     readonly i18n: I18nClient;
     readonly isLinkedColumn: boolean;
     readonly payload: Payload;
@@ -16,6 +17,6 @@ type RenderCellArgs = {
     readonly serverField: Field;
     readonly viewType?: ViewTypes;
 };
-export declare function renderCell({ clientField, collectionSlug, columnIndex, customCellProps, doc, enableRowSelections, i18n, isLinkedColumn, payload, req, rowIndex, serverField, viewType, }: RenderCellArgs): React.JSX.Element;
+export declare function renderCell({ clientField, collectionSlug, columnIndex, customCellProps, doc, enableRowSelections, hierarchyParentFieldName, i18n, isLinkedColumn, payload, req, rowIndex, serverField, viewType, }: RenderCellArgs): React.JSX.Element;
 export {};
 //# sourceMappingURL=renderCell.d.ts.map

package/dist/providers/TableColumns/buildColumnState/renderCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderCell.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/renderCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EACV,WAAW,EACX,yBAAyB,EAEzB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,EACd,SAAS,EACV,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IACtE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAC9B,CAAA;AACD,wBAAgB,UAAU,CAAC,EACzB,WAAW,EACX,cAAc,EACd,WAAW,EACX,eAAe,EACf,GAAG,EACH,mBAAmB,EACnB,IAAI,EACJ,cAAc,EACd,OAAO,EACP,GAAG,EACH,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,cAAc,qBAqOhB"}
+{"version":3,"file":"renderCell.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/renderCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EACV,WAAW,EACX,yBAAyB,EAEzB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,EACd,SAAS,EACV,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAezB,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IACtE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,MAAM,CAAA;IAC1C,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAC9B,CAAA;AACD,wBAAgB,UAAU,CAAC,EACzB,WAAW,EACX,cAAc,EACd,WAAW,EACX,eAAe,EACf,GAAG,EACH,mBAAmB,EACnB,wBAAwB,EACxB,IAAI,EACJ,cAAc,EACd,OAAO,EACP,GAAG,EACH,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,cAAc,qBAkNhB"}

package/dist/providers/TableColumns/buildColumnState/renderCell.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { MissingEditorProp } from 'payload';
-import { formatAdminURL } from 'payload/shared';
 import React from 'react';
 import { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js';
 import { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js';
 import { DefaultCell, FolderIcon, RenderDefaultCell, TagIcon } from '../../../exports/client/index.js';
 import { hasOptionLabelJSXElement } from '../../../utilities/hasOptionLabelJSXElement.js';
+import { resolveDocumentListItemURL } from '../../../views/List/resolveDocumentListItemURL.js';
 import { findValueFromPath } from './findValueFromPath.js';
 export function renderCell({
   clientField,
@@ -14,6 +14,7 @@ export function renderCell({
   customCellProps,
   doc,
   enableRowSelections,
+  hierarchyParentFieldName,
   i18n,
   isLinkedColumn,
   payload,
@@ -36,33 +37,16 @@ export function renderCell({
   let customLinkURL;
   if (isLinkedColumn && req) {
     const collectionConfig = payload.collections[collectionSlug]?.config;
-    const formatDocURL = collectionConfig?.admin?.formatDocURL;
-    if (typeof formatDocURL === 'function') {
-      // Generate the default URL that would normally be used
-      const adminRoute = req.payload.config.routes?.admin || '/admin';
-      const defaultURL = formatAdminURL({
-        adminRoute,
-        path: `/collections/${collectionSlug}${viewType === 'trash' ? '/trash' : ''}/${encodeURIComponent(String(doc.id))}`
-      });
-      const customURL = formatDocURL({
-        collectionSlug,
-        defaultURL,
-        doc,
-        req,
-        viewType
-      });
-      if (customURL === null) {
-        // formatDocURL returned null = disable linking entirely
-        shouldLink = false;
-      } else if (typeof customURL === 'string') {
-        // formatDocURL returned a string = use custom URL
-        shouldLink = true;
-        customLinkURL = customURL;
-      } else {
-        // formatDocURL returned unexpected type = disable linking for safety
-        shouldLink = false;
-      }
-    }
+    const resolvedURL = resolveDocumentListItemURL({
+      collectionSlug,
+      doc,
+      formatDocURL: collectionConfig?.admin?.formatDocURL,
+      hierarchyParentFieldName,
+      req,
+      viewType
+    });
+    shouldLink = resolvedURL !== null;
+    customLinkURL = resolvedURL ?? undefined;
   }
   // For _status field, use _displayStatus if available (for showing "changed" status in list view)
   const cellData = 'name' in clientField && accessor === '_status' && '_displayStatus' in doc ? doc._displayStatus : 'name' in clientField ? findValueFromPath(doc, accessor) : undefined;