@payloadcms/ui 3.0.0-beta.7 → 3.0.0-beta.71

package/dist/elements/WhereBuilder/index.js

@@ -1,11 +1,14 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
 import React, { useEffect, useState } from 'react';
 import { useListQuery } from '../../providers/ListQuery/index.js';
+import { useLocale } from '../../providers/Locale/index.js';
 import { useSearchParams } from '../../providers/SearchParams/index.js';
 import { useTranslation } from '../../providers/Translation/index.js';
 import { Button } from '../Button/index.js';
-import { useTableColumns } from '../TableColumns/index.js';
 import { Condition } from './Condition/index.js';
+import './index.scss';
 import { reduceFieldMap } from './reduceFieldMap.js';
 import { transformWhereQuery } from './transformWhereQuery.js';
 import validateWhereQuery from './validateWhereQuery.js';
@@ -14,14 +17,20 @@ const baseClass = 'where-builder';
  * The WhereBuilder component is used to render the filter controls for a collection's list view.
  * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).
  */ export const WhereBuilder = (props)=>{
-    const { collectionPluralLabel } = props;
+    const { collectionPluralLabel, fieldMap } = props;
     const { i18n, t } = useTranslation();
-    const { columns } = useTableColumns();
-    const [reducedFields, setReducedColumns] = useState(()=>reduceFieldMap(columns, i18n));
+    const { code: currentLocale } = useLocale();
+    const [reducedFields, setReducedColumns] = useState(()=>reduceFieldMap({
+            fieldMap,
+            i18n
+        }));
     useEffect(()=>{
-        setReducedColumns(reduceFieldMap(columns, i18n));
+        setReducedColumns(reduceFieldMap({
+            fieldMap,
+            i18n
+        }));
     }, [
-        columns,
+        fieldMap,
         i18n
     ]);
     const { searchParams } = useSearchParams();
@@ -69,63 +78,63 @@ const baseClass = 'where-builder';
         return [];
     });
     const addCondition = React.useCallback(({ andIndex, fieldName, orIndex, relation })=>{
-        setConditions((prevConditions)=>{
-            const newConditions = [
-                ...prevConditions
-            ];
-            if (relation === 'and') {
-                newConditions[orIndex].and.splice(andIndex, 0, {
-                    [fieldName]: {}
-                });
-            } else {
-                newConditions.push({
-                    and: [
-                        {
-                            [fieldName]: {}
-                        }
-                    ]
-                });
-            }
-            return newConditions;
-        });
-    }, []);
-    const updateCondition = React.useCallback(({ andIndex, fieldName: fieldNameArg, operator: operatorArg, orIndex, value: valueArg })=>{
-        setConditions((prevConditions)=>{
-            const newConditions = [
-                ...prevConditions
-            ];
-            if (typeof newConditions[orIndex].and[andIndex] === 'object') {
-                const fieldName = fieldNameArg;
-                const operator = operatorArg;
-                const value = valueArg ?? (operator ? newConditions[orIndex].and[andIndex][operator] : '');
-                if (fieldName && operator && ![
+        const newConditions = [
+            ...conditions
+        ];
+        if (relation === 'and') {
+            newConditions[orIndex].and.splice(andIndex, 0, {
+                [fieldName]: {}
+            });
+        } else {
+            newConditions.push({
+                and: [
+                    {
+                        [fieldName]: {}
+                    }
+                ]
+            });
+        }
+        setConditions(newConditions);
+    }, [
+        conditions
+    ]);
+    const updateCondition = React.useCallback(({ andIndex, fieldName, operator, orIndex, value: valueArg })=>{
+        const existingRowCondition = conditions[orIndex].and[andIndex];
+        if (typeof existingRowCondition === 'object' && fieldName && operator) {
+            const value = valueArg ?? (operator ? existingRowCondition[operator] : '');
+            const newRowCondition = {
+                [fieldName]: operator ? {
+                    [operator]: value
+                } : {}
+            };
+            if (JSON.stringify(existingRowCondition) !== JSON.stringify(newRowCondition)) {
+                conditions[orIndex].and[andIndex] = newRowCondition;
+                setConditions(conditions);
+                if (![
                     null,
                     undefined
                 ].includes(value)) {
-                    newConditions[orIndex].and[andIndex] = {
-                        [fieldName]: operator ? {
-                            [operator]: value
-                        } : {}
-                    };
+                    // only update query when field/operator/value are filled out
                     setShouldUpdateQuery(true);
                 }
             }
-            return newConditions;
-        });
-    }, []);
+        }
+    }, [
+        conditions
+    ]);
     const removeCondition = React.useCallback(({ andIndex, orIndex })=>{
-        setConditions((prevConditions)=>{
-            const newConditions = [
-                ...prevConditions
-            ];
-            newConditions[orIndex].and.splice(andIndex, 1);
-            if (newConditions[orIndex].and.length === 0) {
-                newConditions.splice(orIndex, 1);
-            }
-            return newConditions;
-        });
+        const newConditions = [
+            ...conditions
+        ];
+        newConditions[orIndex].and.splice(andIndex, 1);
+        if (newConditions[orIndex].and.length === 0) {
+            newConditions.splice(orIndex, 1);
+        }
+        setConditions(newConditions);
         setShouldUpdateQuery(true);
-    }, []);
+    }, [
+        conditions
+    ]);
     React.useEffect(()=>{
         if (shouldUpdateQuery) {
             handleWhereChange({
@@ -138,75 +147,105 @@ const baseClass = 'where-builder';
         handleWhereChange,
         shouldUpdateQuery
     ]);
-    return /*#__PURE__*/ React.createElement("div", {
-        className: baseClass
-    }, conditions.length > 0 && /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
-        className: `${baseClass}__label`
-    }, t('general:filterWhere', {
-        label: getTranslation(collectionPluralLabel, i18n)
-    })), /*#__PURE__*/ React.createElement("ul", {
-        className: `${baseClass}__or-filters`
-    }, conditions.map((or, orIndex)=>/*#__PURE__*/ React.createElement("li", {
-            key: orIndex
-        }, orIndex !== 0 && /*#__PURE__*/ React.createElement("div", {
-            className: `${baseClass}__label`
-        }, t('general:or')), /*#__PURE__*/ React.createElement("ul", {
-            className: `${baseClass}__and-filters`
-        }, Array.isArray(or?.and) && or.and.map((_, andIndex)=>{
-            const initialFieldName = Object.keys(conditions[orIndex].and[andIndex])[0];
-            const initialOperator = Object.keys(conditions[orIndex].and[andIndex]?.[initialFieldName] || {})?.[0] || undefined;
-            const initialValue = conditions[orIndex].and[andIndex]?.[initialFieldName]?.[initialOperator] || '';
-            return /*#__PURE__*/ React.createElement("li", {
-                key: andIndex
-            }, andIndex !== 0 && /*#__PURE__*/ React.createElement("div", {
-                className: `${baseClass}__label`
-            }, t('general:and')), /*#__PURE__*/ React.createElement(Condition, {
-                addCondition: addCondition,
-                andIndex: andIndex,
-                fieldName: initialFieldName,
-                fields: reducedFields,
-                initialValue: initialValue,
-                key: andIndex,
-                operator: initialOperator,
-                orIndex: orIndex,
-                removeCondition: removeCondition,
-                updateCondition: updateCondition
-            }));
-        }))))), /*#__PURE__*/ React.createElement(Button, {
-        buttonStyle: "icon-label",
-        className: `${baseClass}__add-or`,
-        icon: "plus",
-        iconPosition: "left",
-        iconStyle: "with-border",
-        onClick: ()=>{
-            addCondition({
-                andIndex: 0,
-                fieldName: reducedFields[0].value,
-                orIndex: conditions.length,
-                relation: 'or'
-            });
-        }
-    }, t('general:or'))), conditions.length === 0 && /*#__PURE__*/ React.createElement("div", {
-        className: `${baseClass}__no-filters`
-    }, /*#__PURE__*/ React.createElement("div", {
-        className: `${baseClass}__label`
-    }, t('general:noFiltersSet')), /*#__PURE__*/ React.createElement(Button, {
-        buttonStyle: "icon-label",
-        className: `${baseClass}__add-first-filter`,
-        icon: "plus",
-        iconPosition: "left",
-        iconStyle: "with-border",
-        onClick: ()=>{
-            if (reducedFields.length > 0) {
-                addCondition({
-                    andIndex: 0,
-                    fieldName: reducedFields[0].value,
-                    orIndex: conditions.length,
-                    relation: 'or'
-                });
-            }
-        }
-    }, t('general:addFilter'))));
+    return /*#__PURE__*/ _jsxs("div", {
+        className: baseClass,
+        children: [
+            conditions.length > 0 && /*#__PURE__*/ _jsxs(React.Fragment, {
+                children: [
+                    /*#__PURE__*/ _jsx("div", {
+                        className: `${baseClass}__label`,
+                        children: t('general:filterWhere', {
+                            label: getTranslation(collectionPluralLabel, i18n)
+                        })
+                    }),
+                    /*#__PURE__*/ _jsx("ul", {
+                        className: `${baseClass}__or-filters`,
+                        children: conditions.map((or, orIndex)=>{
+                            const compoundOrKey = `${orIndex}_${Array.isArray(or?.and) ? or.and.length : ''}`;
+                            return /*#__PURE__*/ _jsxs("li", {
+                                children: [
+                                    orIndex !== 0 && /*#__PURE__*/ _jsx("div", {
+                                        className: `${baseClass}__label`,
+                                        children: t('general:or')
+                                    }),
+                                    /*#__PURE__*/ _jsx("ul", {
+                                        className: `${baseClass}__and-filters`,
+                                        children: Array.isArray(or?.and) && or.and.map((_, andIndex)=>{
+                                            const initialFieldName = Object.keys(conditions[orIndex].and[andIndex])[0];
+                                            const initialOperator = Object.keys(conditions[orIndex].and[andIndex]?.[initialFieldName] || {})?.[0] || undefined;
+                                            const initialValue = conditions[orIndex].and[andIndex]?.[initialFieldName]?.[initialOperator] || '';
+                                            return /*#__PURE__*/ _jsxs("li", {
+                                                children: [
+                                                    andIndex !== 0 && /*#__PURE__*/ _jsx("div", {
+                                                        className: `${baseClass}__label`,
+                                                        children: t('general:and')
+                                                    }),
+                                                    /*#__PURE__*/ _jsx(Condition, {
+                                                        addCondition: addCondition,
+                                                        andIndex: andIndex,
+                                                        fieldName: initialFieldName,
+                                                        fields: reducedFields,
+                                                        initialValue: initialValue,
+                                                        operator: initialOperator,
+                                                        orIndex: orIndex,
+                                                        removeCondition: removeCondition,
+                                                        updateCondition: updateCondition
+                                                    })
+                                                ]
+                                            }, andIndex);
+                                        })
+                                    })
+                                ]
+                            }, compoundOrKey);
+                        })
+                    }),
+                    /*#__PURE__*/ _jsx(Button, {
+                        buttonStyle: "icon-label",
+                        className: `${baseClass}__add-or`,
+                        icon: "plus",
+                        iconPosition: "left",
+                        iconStyle: "with-border",
+                        onClick: ()=>{
+                            addCondition({
+                                andIndex: 0,
+                                fieldName: reducedFields[0].value,
+                                orIndex: conditions.length,
+                                relation: 'or'
+                            });
+                        },
+                        children: t('general:or')
+                    })
+                ]
+            }),
+            conditions.length === 0 && /*#__PURE__*/ _jsxs("div", {
+                className: `${baseClass}__no-filters`,
+                children: [
+                    /*#__PURE__*/ _jsx("div", {
+                        className: `${baseClass}__label`,
+                        children: t('general:noFiltersSet')
+                    }),
+                    /*#__PURE__*/ _jsx(Button, {
+                        buttonStyle: "icon-label",
+                        className: `${baseClass}__add-first-filter`,
+                        icon: "plus",
+                        iconPosition: "left",
+                        iconStyle: "with-border",
+                        onClick: ()=>{
+                            if (reducedFields.length > 0) {
+                                addCondition({
+                                    andIndex: 0,
+                                    fieldName: reducedFields[0].value,
+                                    orIndex: conditions.length,
+                                    relation: 'or'
+                                });
+                            }
+                        },
+                        children: t('general:addFilter')
+                    })
+                ]
+            })
+        ]
+    });
 };
 
 //# sourceMappingURL=index.js.map

package/dist/elements/WhereBuilder/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/index.tsx"],"sourcesContent":["import { getTranslation } from '@payloadcms/translations'\nimport React, { useEffect, useState } from 'react'\n\nimport type { WhereBuilderProps } from './types.js'\n\nimport { useListQuery } from '../../providers/ListQuery/index.js'\nimport { useSearchParams } from '../../providers/SearchParams/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { useTableColumns } from '../TableColumns/index.js'\nimport { Condition } from './Condition/index.js'\nimport './index.scss'\nimport { reduceFieldMap } from './reduceFieldMap.js'\nimport { transformWhereQuery } from './transformWhereQuery.js'\nimport validateWhereQuery from './validateWhereQuery.js'\n\nconst baseClass = 'where-builder'\n\nexport { WhereBuilderProps }\n\n/**\n * The WhereBuilder component is used to render the filter controls for a collection's list view.\n * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).\n */\nexport const WhereBuilder: React.FC<WhereBuilderProps> = (props) => {\n  const { collectionPluralLabel } = props\n  const { i18n, t } = useTranslation()\n  const { columns } = useTableColumns()\n\n  const [reducedFields, setReducedColumns] = useState(() => reduceFieldMap(columns, i18n))\n\n  useEffect(() => {\n    setReducedColumns(reduceFieldMap(columns, i18n))\n  }, [columns, i18n])\n\n  const { searchParams } = useSearchParams()\n  const { handleWhereChange } = useListQuery()\n  const [shouldUpdateQuery, setShouldUpdateQuery] = React.useState(false)\n\n  // This handles initializing the where conditions from the search query (URL). That way, if you pass in\n  // query params to the URL, the where conditions will be initialized from those and displayed in the UI.\n  // Example: /admin/collections/posts?where[or][0][and][0][text][equals]=example%20post\n  /*\n    stored conditions look like this:\n    [\n      _or_ & _and_ queries have the same shape:\n      {\n        and: [{\n          category: {\n            equals: 'category-a'\n          }\n        }]\n      },\n\n      {\n        and:[{\n          category: {\n            equals: 'category-b'\n          },\n          text: {\n            not_equals: 'oranges'\n          },\n        }]\n      }\n    ]\n  */\n\n  const [conditions, setConditions] = React.useState(() => {\n    const whereFromSearch = searchParams.where\n    if (whereFromSearch) {\n      if (validateWhereQuery(whereFromSearch)) {\n        return whereFromSearch.or\n      }\n\n      // Transform the where query to be in the right format. This will transform something simple like [text][equals]=example%20post to the right format\n      const transformedWhere = transformWhereQuery(whereFromSearch)\n\n      if (validateWhereQuery(transformedWhere)) {\n        return transformedWhere.or\n      }\n\n      console.warn(`Invalid where query in URL: ${JSON.stringify(whereFromSearch)}`)\n    }\n\n    return []\n  })\n\n  const addCondition = React.useCallback(({ andIndex, fieldName, orIndex, relation }) => {\n    setConditions((prevConditions) => {\n      const newConditions = [...prevConditions]\n      if (relation === 'and') {\n        newConditions[orIndex].and.splice(andIndex, 0, { [fieldName]: {} })\n      } else {\n        newConditions.push({\n          and: [\n            {\n              [fieldName]: {},\n            },\n          ],\n        })\n      }\n\n      return newConditions\n    })\n  }, [])\n\n  const updateCondition = React.useCallback(\n    ({ andIndex, fieldName: fieldNameArg, operator: operatorArg, orIndex, value: valueArg }) => {\n      setConditions((prevConditions) => {\n        const newConditions = [...prevConditions]\n        if (typeof newConditions[orIndex].and[andIndex] === 'object') {\n          const fieldName = fieldNameArg\n          const operator = operatorArg\n          const value = valueArg ?? (operator ? newConditions[orIndex].and[andIndex][operator] : '')\n\n          if (fieldName && operator && ![null, undefined].includes(value)) {\n            newConditions[orIndex].and[andIndex] = {\n              [fieldName]: operator ? { [operator]: value } : {},\n            }\n            setShouldUpdateQuery(true)\n          }\n        }\n\n        return newConditions\n      })\n    },\n    [],\n  )\n\n  const removeCondition = React.useCallback(({ andIndex, orIndex }) => {\n    setConditions((prevConditions) => {\n      const newConditions = [...prevConditions]\n      newConditions[orIndex].and.splice(andIndex, 1)\n\n      if (newConditions[orIndex].and.length === 0) {\n        newConditions.splice(orIndex, 1)\n      }\n\n      return newConditions\n    })\n    setShouldUpdateQuery(true)\n  }, [])\n\n  React.useEffect(() => {\n    if (shouldUpdateQuery) {\n      handleWhereChange({ or: conditions })\n      setShouldUpdateQuery(false)\n    }\n  }, [conditions, handleWhereChange, shouldUpdateQuery])\n\n  return (\n    <div className={baseClass}>\n      {conditions.length > 0 && (\n        <React.Fragment>\n          <div className={`${baseClass}__label`}>\n            {t('general:filterWhere', { label: getTranslation(collectionPluralLabel, i18n) })}\n          </div>\n          <ul className={`${baseClass}__or-filters`}>\n            {conditions.map((or, orIndex) => (\n              <li key={orIndex}>\n                {orIndex !== 0 && <div className={`${baseClass}__label`}>{t('general:or')}</div>}\n                <ul className={`${baseClass}__and-filters`}>\n                  {Array.isArray(or?.and) &&\n                    or.and.map((_, andIndex) => {\n                      const initialFieldName = Object.keys(conditions[orIndex].and[andIndex])[0]\n                      const initialOperator =\n                        Object.keys(\n                          conditions[orIndex].and[andIndex]?.[initialFieldName] || {},\n                        )?.[0] || undefined\n                      const initialValue =\n                        conditions[orIndex].and[andIndex]?.[initialFieldName]?.[initialOperator] ||\n                        ''\n\n                      return (\n                        <li key={andIndex}>\n                          {andIndex !== 0 && (\n                            <div className={`${baseClass}__label`}>{t('general:and')}</div>\n                          )}\n                          <Condition\n                            addCondition={addCondition}\n                            andIndex={andIndex}\n                            fieldName={initialFieldName}\n                            fields={reducedFields}\n                            initialValue={initialValue}\n                            key={andIndex}\n                            operator={initialOperator}\n                            orIndex={orIndex}\n                            removeCondition={removeCondition}\n                            updateCondition={updateCondition}\n                          />\n                        </li>\n                      )\n                    })}\n                </ul>\n              </li>\n            ))}\n          </ul>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-or`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              addCondition({\n                andIndex: 0,\n                fieldName: reducedFields[0].value,\n                orIndex: conditions.length,\n                relation: 'or',\n              })\n            }}\n          >\n            {t('general:or')}\n          </Button>\n        </React.Fragment>\n      )}\n      {conditions.length === 0 && (\n        <div className={`${baseClass}__no-filters`}>\n          <div className={`${baseClass}__label`}>{t('general:noFiltersSet')}</div>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-first-filter`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0) {\n                addCondition({\n                  andIndex: 0,\n                  fieldName: reducedFields[0].value,\n                  orIndex: conditions.length,\n                  relation: 'or',\n                })\n              }\n            }}\n          >\n            {t('general:addFilter')}\n          </Button>\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["getTranslation","React","useEffect","useState","useListQuery","useSearchParams","useTranslation","Button","useTableColumns","Condition","reduceFieldMap","transformWhereQuery","validateWhereQuery","baseClass","WhereBuilder","props","collectionPluralLabel","i18n","t","columns","reducedFields","setReducedColumns","searchParams","handleWhereChange","shouldUpdateQuery","setShouldUpdateQuery","conditions","setConditions","whereFromSearch","where","or","transformedWhere","console","warn","JSON","stringify","addCondition","useCallback","andIndex","fieldName","orIndex","relation","prevConditions","newConditions","and","splice","push","updateCondition","fieldNameArg","operator","operatorArg","value","valueArg","undefined","includes","removeCondition","length","div","className","Fragment","label","ul","map","li","key","Array","isArray","_","initialFieldName","Object","keys","initialOperator","initialValue","fields","buttonStyle","icon","iconPosition","iconStyle","onClick"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/index.tsx"],"sourcesContent":["'use client'\nimport type { Operator } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport React, { useEffect, useState } from 'react'\n\nimport type { WhereBuilderProps } from './types.js'\n\nimport { useListQuery } from '../../providers/ListQuery/index.js'\nimport { useLocale } from '../../providers/Locale/index.js'\nimport { useSearchParams } from '../../providers/SearchParams/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { Condition } from './Condition/index.js'\nimport './index.scss'\nimport { reduceFieldMap } from './reduceFieldMap.js'\nimport { transformWhereQuery } from './transformWhereQuery.js'\nimport validateWhereQuery from './validateWhereQuery.js'\n\nconst baseClass = 'where-builder'\n\nexport { WhereBuilderProps }\n\n/**\n * The WhereBuilder component is used to render the filter controls for a collection's list view.\n * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).\n */\nexport const WhereBuilder: React.FC<WhereBuilderProps> = (props) => {\n  const { collectionPluralLabel, fieldMap } = props\n  const { i18n, t } = useTranslation()\n  const { code: currentLocale } = useLocale()\n\n  const [reducedFields, setReducedColumns] = useState(() => reduceFieldMap({ fieldMap, i18n }))\n\n  useEffect(() => {\n    setReducedColumns(reduceFieldMap({ fieldMap, i18n }))\n  }, [fieldMap, i18n])\n\n  const { searchParams } = useSearchParams()\n  const { handleWhereChange } = useListQuery()\n  const [shouldUpdateQuery, setShouldUpdateQuery] = React.useState(false)\n\n  // This handles initializing the where conditions from the search query (URL). That way, if you pass in\n  // query params to the URL, the where conditions will be initialized from those and displayed in the UI.\n  // Example: /admin/collections/posts?where[or][0][and][0][text][equals]=example%20post\n  /*\n    stored conditions look like this:\n    [\n      _or_ & _and_ queries have the same shape:\n      {\n        and: [{\n          category: {\n            equals: 'category-a'\n          }\n        }]\n      },\n\n      {\n        and:[{\n          category: {\n            equals: 'category-b'\n          },\n          text: {\n            not_equals: 'oranges'\n          },\n        }]\n      }\n    ]\n  */\n\n  const [conditions, setConditions] = React.useState(() => {\n    const whereFromSearch = searchParams.where\n    if (whereFromSearch) {\n      if (validateWhereQuery(whereFromSearch)) {\n        return whereFromSearch.or\n      }\n      // Transform the where query to be in the right format. This will transform something simple like [text][equals]=example%20post to the right format\n      const transformedWhere = transformWhereQuery(whereFromSearch)\n\n      if (validateWhereQuery(transformedWhere)) {\n        return transformedWhere.or\n      }\n\n      console.warn(`Invalid where query in URL: ${JSON.stringify(whereFromSearch)}`)\n    }\n\n    return []\n  })\n\n  const addCondition = React.useCallback(\n    ({ andIndex, fieldName, orIndex, relation }) => {\n      const newConditions = [...conditions]\n      if (relation === 'and') {\n        newConditions[orIndex].and.splice(andIndex, 0, { [fieldName]: {} })\n      } else {\n        newConditions.push({\n          and: [\n            {\n              [fieldName]: {},\n            },\n          ],\n        })\n      }\n      setConditions(newConditions)\n    },\n    [conditions],\n  )\n\n  const updateCondition = React.useCallback(\n    ({ andIndex, fieldName, operator, orIndex, value: valueArg }) => {\n      const existingRowCondition = conditions[orIndex].and[andIndex]\n      if (typeof existingRowCondition === 'object' && fieldName && operator) {\n        const value = valueArg ?? (operator ? existingRowCondition[operator] : '')\n        const newRowCondition = {\n          [fieldName]: operator ? { [operator]: value } : {},\n        }\n\n        if (JSON.stringify(existingRowCondition) !== JSON.stringify(newRowCondition)) {\n          conditions[orIndex].and[andIndex] = newRowCondition\n          setConditions(conditions)\n          if (![null, undefined].includes(value)) {\n            // only update query when field/operator/value are filled out\n            setShouldUpdateQuery(true)\n          }\n        }\n      }\n    },\n    [conditions],\n  )\n\n  const removeCondition = React.useCallback(\n    ({ andIndex, orIndex }) => {\n      const newConditions = [...conditions]\n      newConditions[orIndex].and.splice(andIndex, 1)\n      if (newConditions[orIndex].and.length === 0) {\n        newConditions.splice(orIndex, 1)\n      }\n      setConditions(newConditions)\n      setShouldUpdateQuery(true)\n    },\n    [conditions],\n  )\n\n  React.useEffect(() => {\n    if (shouldUpdateQuery) {\n      handleWhereChange({ or: conditions })\n      setShouldUpdateQuery(false)\n    }\n  }, [conditions, handleWhereChange, shouldUpdateQuery])\n\n  return (\n    <div className={baseClass}>\n      {conditions.length > 0 && (\n        <React.Fragment>\n          <div className={`${baseClass}__label`}>\n            {t('general:filterWhere', { label: getTranslation(collectionPluralLabel, i18n) })}\n          </div>\n          <ul className={`${baseClass}__or-filters`}>\n            {conditions.map((or, orIndex) => {\n              const compoundOrKey = `${orIndex}_${Array.isArray(or?.and) ? or.and.length : ''}`\n\n              return (\n                <li key={compoundOrKey}>\n                  {orIndex !== 0 && <div className={`${baseClass}__label`}>{t('general:or')}</div>}\n                  <ul className={`${baseClass}__and-filters`}>\n                    {Array.isArray(or?.and) &&\n                      or.and.map((_, andIndex) => {\n                        const initialFieldName = Object.keys(conditions[orIndex].and[andIndex])[0]\n                        const initialOperator =\n                          (Object.keys(\n                            conditions[orIndex].and[andIndex]?.[initialFieldName] || {},\n                          )?.[0] as Operator) || undefined\n                        const initialValue =\n                          conditions[orIndex].and[andIndex]?.[initialFieldName]?.[\n                            initialOperator\n                          ] || ''\n\n                        return (\n                          <li key={andIndex}>\n                            {andIndex !== 0 && (\n                              <div className={`${baseClass}__label`}>{t('general:and')}</div>\n                            )}\n                            <Condition\n                              addCondition={addCondition}\n                              andIndex={andIndex}\n                              fieldName={initialFieldName}\n                              fields={reducedFields}\n                              initialValue={initialValue}\n                              operator={initialOperator}\n                              orIndex={orIndex}\n                              removeCondition={removeCondition}\n                              updateCondition={updateCondition}\n                            />\n                          </li>\n                        )\n                      })}\n                  </ul>\n                </li>\n              )\n            })}\n          </ul>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-or`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              addCondition({\n                andIndex: 0,\n                fieldName: reducedFields[0].value,\n                orIndex: conditions.length,\n                relation: 'or',\n              })\n            }}\n          >\n            {t('general:or')}\n          </Button>\n        </React.Fragment>\n      )}\n      {conditions.length === 0 && (\n        <div className={`${baseClass}__no-filters`}>\n          <div className={`${baseClass}__label`}>{t('general:noFiltersSet')}</div>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-first-filter`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0) {\n                addCondition({\n                  andIndex: 0,\n                  fieldName: reducedFields[0].value,\n                  orIndex: conditions.length,\n                  relation: 'or',\n                })\n              }\n            }}\n          >\n            {t('general:addFilter')}\n          </Button>\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["getTranslation","React","useEffect","useState","useListQuery","useLocale","useSearchParams","useTranslation","Button","Condition","reduceFieldMap","transformWhereQuery","validateWhereQuery","baseClass","WhereBuilder","props","collectionPluralLabel","fieldMap","i18n","t","code","currentLocale","reducedFields","setReducedColumns","searchParams","handleWhereChange","shouldUpdateQuery","setShouldUpdateQuery","conditions","setConditions","whereFromSearch","where","or","transformedWhere","console","warn","JSON","stringify","addCondition","useCallback","andIndex","fieldName","orIndex","relation","newConditions","and","splice","push","updateCondition","operator","value","valueArg","existingRowCondition","newRowCondition","undefined","includes","removeCondition","length","div","className","Fragment","label","ul","map","compoundOrKey","Array","isArray","li","_","initialFieldName","Object","keys","initialOperator","initialValue","fields","buttonStyle","icon","iconPosition","iconStyle","onClick"],"mappings":"AAAA;;AAGA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,OAAOC,SAASC,SAAS,EAAEC,QAAQ,QAAQ,QAAO;AAIlD,SAASC,YAAY,QAAQ,qCAAoC;AACjE,SAASC,SAAS,QAAQ,kCAAiC;AAC3D,SAASC,eAAe,QAAQ,wCAAuC;AACvE,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,MAAM,QAAQ,qBAAoB;AAC3C,SAASC,SAAS,QAAQ,uBAAsB;AAChD,OAAO,eAAc;AACrB,SAASC,cAAc,QAAQ,sBAAqB;AACpD,SAASC,mBAAmB,QAAQ,2BAA0B;AAC9D,OAAOC,wBAAwB,0BAAyB;AAExD,MAAMC,YAAY;AAIlB;;;CAGC,GACD,OAAO,MAAMC,eAA4C,CAACC;IACxD,MAAM,EAAEC,qBAAqB,EAAEC,QAAQ,EAAE,GAAGF;IAC5C,MAAM,EAAEG,IAAI,EAAEC,CAAC,EAAE,GAAGZ;IACpB,MAAM,EAAEa,MAAMC,aAAa,EAAE,GAAGhB;IAEhC,MAAM,CAACiB,eAAeC,kBAAkB,GAAGpB,SAAS,IAAMO,eAAe;YAAEO;YAAUC;QAAK;IAE1FhB,UAAU;QACRqB,kBAAkBb,eAAe;YAAEO;YAAUC;QAAK;IACpD,GAAG;QAACD;QAAUC;KAAK;IAEnB,MAAM,EAAEM,YAAY,EAAE,GAAGlB;IACzB,MAAM,EAAEmB,iBAAiB,EAAE,GAAGrB;IAC9B,MAAM,CAACsB,mBAAmBC,qBAAqB,GAAG1B,MAAME,QAAQ,CAAC;IAEjE,uGAAuG;IACvG,wGAAwG;IACxG,sFAAsF;IACtF;;;;;;;;;;;;;;;;;;;;;;;EAuBA,GAEA,MAAM,CAACyB,YAAYC,cAAc,GAAG5B,MAAME,QAAQ,CAAC;QACjD,MAAM2B,kBAAkBN,aAAaO,KAAK;QAC1C,IAAID,iBAAiB;YACnB,IAAIlB,mBAAmBkB,kBAAkB;gBACvC,OAAOA,gBAAgBE,EAAE;YAC3B;YACA,mJAAmJ;YACnJ,MAAMC,mBAAmBtB,oBAAoBmB;YAE7C,IAAIlB,mBAAmBqB,mBAAmB;gBACxC,OAAOA,iBAAiBD,EAAE;YAC5B;YAEAE,QAAQC,IAAI,CAAC,CAAC,4BAA4B,EAAEC,KAAKC,SAAS,CAACP,iBAAiB,CAAC;QAC/E;QAEA,OAAO,EAAE;IACX;IAEA,MAAMQ,eAAerC,MAAMsC,WAAW,CACpC,CAAC,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,EAAE;QACzC,MAAMC,gBAAgB;eAAIhB;SAAW;QACrC,IAAIe,aAAa,OAAO;YACtBC,aAAa,CAACF,QAAQ,CAACG,GAAG,CAACC,MAAM,CAACN,UAAU,GAAG;gBAAE,CAACC,UAAU,EAAE,CAAC;YAAE;QACnE,OAAO;YACLG,cAAcG,IAAI,CAAC;gBACjBF,KAAK;oBACH;wBACE,CAACJ,UAAU,EAAE,CAAC;oBAChB;iBACD;YACH;QACF;QACAZ,cAAce;IAChB,GACA;QAAChB;KAAW;IAGd,MAAMoB,kBAAkB/C,MAAMsC,WAAW,CACvC,CAAC,EAAEC,QAAQ,EAAEC,SAAS,EAAEQ,QAAQ,EAAEP,OAAO,EAAEQ,OAAOC,QAAQ,EAAE;QAC1D,MAAMC,uBAAuBxB,UAAU,CAACc,QAAQ,CAACG,GAAG,CAACL,SAAS;QAC9D,IAAI,OAAOY,yBAAyB,YAAYX,aAAaQ,UAAU;YACrE,MAAMC,QAAQC,YAAaF,CAAAA,WAAWG,oBAAoB,CAACH,SAAS,GAAG,EAAC;YACxE,MAAMI,kBAAkB;gBACtB,CAACZ,UAAU,EAAEQ,WAAW;oBAAE,CAACA,SAAS,EAAEC;gBAAM,IAAI,CAAC;YACnD;YAEA,IAAId,KAAKC,SAAS,CAACe,0BAA0BhB,KAAKC,SAAS,CAACgB,kBAAkB;gBAC5EzB,UAAU,CAACc,QAAQ,CAACG,GAAG,CAACL,SAAS,GAAGa;gBACpCxB,cAAcD;gBACd,IAAI,CAAC;oBAAC;oBAAM0B;iBAAU,CAACC,QAAQ,CAACL,QAAQ;oBACtC,6DAA6D;oBAC7DvB,qBAAqB;gBACvB;YACF;QACF;IACF,GACA;QAACC;KAAW;IAGd,MAAM4B,kBAAkBvD,MAAMsC,WAAW,CACvC,CAAC,EAAEC,QAAQ,EAAEE,OAAO,EAAE;QACpB,MAAME,gBAAgB;eAAIhB;SAAW;QACrCgB,aAAa,CAACF,QAAQ,CAACG,GAAG,CAACC,MAAM,CAACN,UAAU;QAC5C,IAAII,aAAa,CAACF,QAAQ,CAACG,GAAG,CAACY,MAAM,KAAK,GAAG;YAC3Cb,cAAcE,MAAM,CAACJ,SAAS;QAChC;QACAb,cAAce;QACdjB,qBAAqB;IACvB,GACA;QAACC;KAAW;IAGd3B,MAAMC,SAAS,CAAC;QACd,IAAIwB,mBAAmB;YACrBD,kBAAkB;gBAAEO,IAAIJ;YAAW;YACnCD,qBAAqB;QACvB;IACF,GAAG;QAACC;QAAYH;QAAmBC;KAAkB;IAErD,qBACE,MAACgC;QAAIC,WAAW9C;;YACbe,WAAW6B,MAAM,GAAG,mBACnB,MAACxD,MAAM2D,QAAQ;;kCACb,KAACF;wBAAIC,WAAW,CAAC,EAAE9C,UAAU,OAAO,CAAC;kCAClCM,EAAE,uBAAuB;4BAAE0C,OAAO7D,eAAegB,uBAAuBE;wBAAM;;kCAEjF,KAAC4C;wBAAGH,WAAW,CAAC,EAAE9C,UAAU,YAAY,CAAC;kCACtCe,WAAWmC,GAAG,CAAC,CAAC/B,IAAIU;4BACnB,MAAMsB,gBAAgB,CAAC,EAAEtB,QAAQ,CAAC,EAAEuB,MAAMC,OAAO,CAAClC,IAAIa,OAAOb,GAAGa,GAAG,CAACY,MAAM,GAAG,GAAG,CAAC;4BAEjF,qBACE,MAACU;;oCACEzB,YAAY,mBAAK,KAACgB;wCAAIC,WAAW,CAAC,EAAE9C,UAAU,OAAO,CAAC;kDAAGM,EAAE;;kDAC5D,KAAC2C;wCAAGH,WAAW,CAAC,EAAE9C,UAAU,aAAa,CAAC;kDACvCoD,MAAMC,OAAO,CAAClC,IAAIa,QACjBb,GAAGa,GAAG,CAACkB,GAAG,CAAC,CAACK,GAAG5B;4CACb,MAAM6B,mBAAmBC,OAAOC,IAAI,CAAC3C,UAAU,CAACc,QAAQ,CAACG,GAAG,CAACL,SAAS,CAAC,CAAC,EAAE;4CAC1E,MAAMgC,kBACJ,AAACF,OAAOC,IAAI,CACV3C,UAAU,CAACc,QAAQ,CAACG,GAAG,CAACL,SAAS,EAAE,CAAC6B,iBAAiB,IAAI,CAAC,IACzD,CAAC,EAAE,IAAiBf;4CACzB,MAAMmB,eACJ7C,UAAU,CAACc,QAAQ,CAACG,GAAG,CAACL,SAAS,EAAE,CAAC6B,iBAAiB,EAAE,CACrDG,gBACD,IAAI;4CAEP,qBACE,MAACL;;oDACE3B,aAAa,mBACZ,KAACkB;wDAAIC,WAAW,CAAC,EAAE9C,UAAU,OAAO,CAAC;kEAAGM,EAAE;;kEAE5C,KAACV;wDACC6B,cAAcA;wDACdE,UAAUA;wDACVC,WAAW4B;wDACXK,QAAQpD;wDACRmD,cAAcA;wDACdxB,UAAUuB;wDACV9B,SAASA;wDACTc,iBAAiBA;wDACjBR,iBAAiBA;;;+CAbZR;wCAiBb;;;+BAjCGwB;wBAqCb;;kCAEF,KAACxD;wBACCmE,aAAY;wBACZhB,WAAW,CAAC,EAAE9C,UAAU,QAAQ,CAAC;wBACjC+D,MAAK;wBACLC,cAAa;wBACbC,WAAU;wBACVC,SAAS;4BACPzC,aAAa;gCACXE,UAAU;gCACVC,WAAWnB,aAAa,CAAC,EAAE,CAAC4B,KAAK;gCACjCR,SAASd,WAAW6B,MAAM;gCAC1Bd,UAAU;4BACZ;wBACF;kCAECxB,EAAE;;;;YAIRS,WAAW6B,MAAM,KAAK,mBACrB,MAACC;gBAAIC,WAAW,CAAC,EAAE9C,UAAU,YAAY,CAAC;;kCACxC,KAAC6C;wBAAIC,WAAW,CAAC,EAAE9C,UAAU,OAAO,CAAC;kCAAGM,EAAE;;kCAC1C,KAACX;wBACCmE,aAAY;wBACZhB,WAAW,CAAC,EAAE9C,UAAU,kBAAkB,CAAC;wBAC3C+D,MAAK;wBACLC,cAAa;wBACbC,WAAU;wBACVC,SAAS;4BACP,IAAIzD,cAAcmC,MAAM,GAAG,GAAG;gCAC5BnB,aAAa;oCACXE,UAAU;oCACVC,WAAWnB,aAAa,CAAC,EAAE,CAAC4B,KAAK;oCACjCR,SAASd,WAAW6B,MAAM;oCAC1Bd,UAAU;gCACZ;4BACF;wBACF;kCAECxB,EAAE;;;;;;AAMf,EAAC"}

package/dist/elements/WhereBuilder/reduceFieldMap.d.ts

@@ -1,3 +1,14 @@
-import type { Column } from '../Table/index.js';
-export declare const reduceFieldMap: (fieldMap: Column[], i18n: any) => any[];
+import type { I18nClient } from '@payloadcms/translations';
+import type { FieldMap } from 'payload';
+export type ReduceFieldMapArgs = {
+    fieldMap: FieldMap;
+    i18n: I18nClient;
+    labelPrefix?: string;
+    pathPrefix?: string;
+};
+/**
+ * Reduces a field map to a flat array of fields with labels and values.
+ * Used in the WhereBuilder component to render the fields in the dropdown.
+ */
+export declare const reduceFieldMap: ({ fieldMap, i18n, labelPrefix, pathPrefix }: ReduceFieldMapArgs) => any[];
 //# sourceMappingURL=reduceFieldMap.d.ts.map

package/dist/elements/WhereBuilder/reduceFieldMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reduceFieldMap.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI/C,eAAO,MAAM,cAAc,aAAc,MAAM,EAAE,qBAkCzC,CAAA"}
+{"version":3,"file":"reduceFieldMap.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyB,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQvC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,QAAQ,CAAA;IAClB,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,gDAAiD,kBAAkB,UA2I7F,CAAA"}

package/dist/elements/WhereBuilder/reduceFieldMap.js

@@ -1,36 +1,102 @@
+'use client';
+import { getTranslation } from '@payloadcms/translations';
+import { createNestedClientFieldPath } from '../../forms/Form/createNestedFieldPath.js';
+import { combineLabel } from '../FieldSelect/index.js';
 import fieldTypes from './field-types.js';
-export const reduceFieldMap = (fieldMap, i18n)=>fieldMap.reduce((reduced, field)=>{
+/**
+ * Reduces a field map to a flat array of fields with labels and values.
+ * Used in the WhereBuilder component to render the fields in the dropdown.
+ */ export const reduceFieldMap = ({ fieldMap, i18n, labelPrefix, pathPrefix })=>{
+    return fieldMap.reduce((reduced, field)=>{
+        if (field.disableListFilter) return reduced;
+        if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {
+            const tabs = field.fieldComponentProps.tabs;
+            tabs.forEach((tab)=>{
+                if (typeof tab.label !== 'boolean') {
+                    const localizedTabLabel = getTranslation(tab.label, i18n);
+                    const labelWithPrefix = labelPrefix ? labelPrefix + ' > ' + localizedTabLabel : localizedTabLabel;
+                    // Make sure we handle nested tabs
+                    const tabPathPrefix = tab.name ? pathPrefix ? pathPrefix + '.' + tab.name : tab.name : pathPrefix;
+                    if (typeof localizedTabLabel === 'string') {
+                        reduced.push(...reduceFieldMap({
+                            fieldMap: tab.fieldMap,
+                            i18n,
+                            labelPrefix: labelWithPrefix,
+                            pathPrefix: tabPathPrefix
+                        }));
+                    }
+                }
+            });
+            return reduced;
+        }
+        // Rows cant have labels, so we need to handle them differently
+        if (field.type === 'row' && 'fieldMap' in field.fieldComponentProps) {
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix,
+                pathPrefix
+            }));
+            return reduced;
+        }
+        if (field.type === 'collapsible' && 'fieldMap' in field.fieldComponentProps) {
+            const localizedTabLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const labelWithPrefix = labelPrefix ? labelPrefix + ' > ' + localizedTabLabel : localizedTabLabel;
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix: labelWithPrefix,
+                pathPrefix
+            }));
+            return reduced;
+        }
+        if (field.type === 'group' && 'fieldMap' in field.fieldComponentProps) {
+            const translatedLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const labelWithPrefix = labelPrefix ? translatedLabel ? labelPrefix + ' > ' + translatedLabel : labelPrefix : translatedLabel;
+            // Make sure we handle deeply nested groups
+            const pathWithPrefix = field.name ? pathPrefix ? pathPrefix + '.' + field.name : field.name : pathPrefix;
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix: labelWithPrefix,
+                pathPrefix: pathWithPrefix
+            }));
+            return reduced;
+        }
         if (typeof fieldTypes[field.type] === 'object') {
             const operatorKeys = new Set();
             const operators = fieldTypes[field.type].operators.reduce((acc, operator)=>{
                 if (!operatorKeys.has(operator.value)) {
                     operatorKeys.add(operator.value);
-                    return [
-                        ...acc,
-                        {
-                            ...operator,
-                            label: i18n.t(`operators:${operator.label}`)
-                        }
-                    ];
+                    const operatorKey = `operators:${operator.label}`;
+                    acc.push({
+                        ...operator,
+                        label: i18n.t(operatorKey)
+                    });
                 }
                 return acc;
             }, []);
+            const localizedLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const formattedLabel = labelPrefix ? combineLabel({
+                field,
+                prefix: labelPrefix
+            }) : localizedLabel;
+            const formattedValue = pathPrefix ? createNestedClientFieldPath(pathPrefix, field) : field.name;
             const formattedField = {
-                label: field.Label,
-                value: field.name,
+                label: formattedLabel,
+                value: formattedValue,
                 ...fieldTypes[field.type],
                 operators,
                 props: {
                     ...field,
-                    ...field?.cellProps || {}
+                    ...field?.cellComponentProps || {}
                 }
             };
-            return [
-                ...reduced,
-                formattedField
-            ];
+            reduced.push(formattedField);
+            return reduced;
         }
         return reduced;
     }, []);
+};
 
 //# sourceMappingURL=reduceFieldMap.js.map

package/dist/elements/WhereBuilder/reduceFieldMap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"sourcesContent":["import type { Column } from '../Table/index.js'\n\nimport fieldTypes from './field-types.js'\n\nexport const reduceFieldMap = (fieldMap: Column[], i18n) =>\n  fieldMap.reduce((reduced, field) => {\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          return [\n            ...acc,\n            {\n              ...operator,\n              label: i18n.t(`operators:${operator.label}`),\n            },\n          ]\n        }\n        return acc\n      }, [])\n\n      const formattedField = {\n        label: field.Label,\n        value: field.name,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n          ...(field?.cellProps || {}),\n        },\n      }\n\n      return [...reduced, formattedField]\n    }\n\n    return reduced\n  }, [])\n"],"names":["fieldTypes","reduceFieldMap","fieldMap","i18n","reduce","reduced","field","type","operatorKeys","Set","operators","acc","operator","has","value","add","label","t","formattedField","Label","name","props","cellProps"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAOA,gBAAgB,mBAAkB;AAEzC,OAAO,MAAMC,iBAAiB,CAACC,UAAoBC,OACjDD,SAASE,MAAM,CAAC,CAACC,SAASC;QACxB,IAAI,OAAON,UAAU,CAACM,MAAMC,IAAI,CAAC,KAAK,UAAU;YAC9C,MAAMC,eAAe,IAAIC;YAEzB,MAAMC,YAAYV,UAAU,CAACM,MAAMC,IAAI,CAAC,CAACG,SAAS,CAACN,MAAM,CAAC,CAACO,KAAKC;gBAC9D,IAAI,CAACJ,aAAaK,GAAG,CAACD,SAASE,KAAK,GAAG;oBACrCN,aAAaO,GAAG,CAACH,SAASE,KAAK;oBAC/B,OAAO;2BACFH;wBACH;4BACE,GAAGC,QAAQ;4BACXI,OAAOb,KAAKc,CAAC,CAAC,CAAC,UAAU,EAAEL,SAASI,KAAK,CAAC,CAAC;wBAC7C;qBACD;gBACH;gBACA,OAAOL;YACT,GAAG,EAAE;YAEL,MAAMO,iBAAiB;gBACrBF,OAAOV,MAAMa,KAAK;gBAClBL,OAAOR,MAAMc,IAAI;gBACjB,GAAGpB,UAAU,CAACM,MAAMC,IAAI,CAAC;gBACzBG;gBACAW,OAAO;oBACL,GAAGf,KAAK;oBACR,GAAIA,OAAOgB,aAAa,CAAC,CAAC;gBAC5B;YACF;YAEA,OAAO;mBAAIjB;gBAASa;aAAe;QACrC;QAEA,OAAOb;IACT,GAAG,EAAE,EAAC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"sourcesContent":["'use client'\nimport type { ClientTranslationKeys, I18nClient } from '@payloadcms/translations'\nimport type { FieldMap } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport { createNestedClientFieldPath } from '../../forms/Form/createNestedFieldPath.js'\nimport { combineLabel } from '../FieldSelect/index.js'\nimport fieldTypes from './field-types.js'\n\nexport type ReduceFieldMapArgs = {\n  fieldMap: FieldMap\n  i18n: I18nClient\n  labelPrefix?: string\n  pathPrefix?: string\n}\n\n/**\n * Reduces a field map to a flat array of fields with labels and values.\n * Used in the WhereBuilder component to render the fields in the dropdown.\n */\nexport const reduceFieldMap = ({ fieldMap, i18n, labelPrefix, pathPrefix }: ReduceFieldMapArgs) => {\n  return fieldMap.reduce((reduced, field) => {\n    if (field.disableListFilter) return reduced\n\n    if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {\n      const tabs = field.fieldComponentProps.tabs\n\n      tabs.forEach((tab) => {\n        if (typeof tab.label !== 'boolean') {\n          const localizedTabLabel = getTranslation(tab.label, i18n)\n\n          const labelWithPrefix = labelPrefix\n            ? labelPrefix + ' > ' + localizedTabLabel\n            : localizedTabLabel\n\n          // Make sure we handle nested tabs\n          const tabPathPrefix = tab.name\n            ? pathPrefix\n              ? pathPrefix + '.' + tab.name\n              : tab.name\n            : pathPrefix\n\n          if (typeof localizedTabLabel === 'string') {\n            reduced.push(\n              ...reduceFieldMap({\n                fieldMap: tab.fieldMap,\n                i18n,\n                labelPrefix: labelWithPrefix,\n                pathPrefix: tabPathPrefix,\n              }),\n            )\n          }\n        }\n      })\n      return reduced\n    }\n\n    // Rows cant have labels, so we need to handle them differently\n    if (field.type === 'row' && 'fieldMap' in field.fieldComponentProps) {\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix,\n          pathPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (field.type === 'collapsible' && 'fieldMap' in field.fieldComponentProps) {\n      const localizedTabLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const labelWithPrefix = labelPrefix\n        ? labelPrefix + ' > ' + localizedTabLabel\n        : localizedTabLabel\n\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix: labelWithPrefix,\n          pathPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (field.type === 'group' && 'fieldMap' in field.fieldComponentProps) {\n      const translatedLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const labelWithPrefix = labelPrefix\n        ? translatedLabel\n          ? labelPrefix + ' > ' + translatedLabel\n          : labelPrefix\n        : translatedLabel\n\n      // Make sure we handle deeply nested groups\n      const pathWithPrefix = field.name\n        ? pathPrefix\n          ? pathPrefix + '.' + field.name\n          : field.name\n        : pathPrefix\n\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix: labelWithPrefix,\n          pathPrefix: pathWithPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          const operatorKey = `operators:${operator.label}` as ClientTranslationKeys\n          acc.push({\n            ...operator,\n            label: i18n.t(operatorKey),\n          })\n        }\n        return acc\n      }, [])\n\n      const localizedLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const formattedLabel = labelPrefix\n        ? combineLabel({\n            field,\n            prefix: labelPrefix,\n          })\n        : localizedLabel\n\n      const formattedValue = pathPrefix\n        ? createNestedClientFieldPath(pathPrefix, field)\n        : field.name\n\n      const formattedField = {\n        label: formattedLabel,\n        value: formattedValue,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n          ...(field?.cellComponentProps || {}),\n        },\n      }\n\n      reduced.push(formattedField)\n      return reduced\n    }\n\n    return reduced\n  }, [])\n}\n"],"names":["getTranslation","createNestedClientFieldPath","combineLabel","fieldTypes","reduceFieldMap","fieldMap","i18n","labelPrefix","pathPrefix","reduce","reduced","field","disableListFilter","type","fieldComponentProps","tabs","forEach","tab","label","localizedTabLabel","labelWithPrefix","tabPathPrefix","name","push","translatedLabel","pathWithPrefix","operatorKeys","Set","operators","acc","operator","has","value","add","operatorKey","t","localizedLabel","formattedLabel","prefix","formattedValue","formattedField","props","cellComponentProps"],"mappings":"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"}

package/dist/elements/WhereBuilder/transformWhereQuery.d.ts

@@ -1,4 +1,4 @@
-import type { Where } from 'payload/types';
+import type { Where } from 'payload';
 /**
  * Something like [or][0][and][0][text][equals]=example%20post will work and pass through the validateWhereQuery check.
  * However, something like [text][equals]=example%20post will not work and will fail the validateWhereQuery check,

package/dist/elements/WhereBuilder/transformWhereQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformWhereQuery.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAE1C;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,uBAAiB,KA2ChD,CAAA"}
+{"version":3,"file":"transformWhereQuery.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,uBAAiB,KA2ChD,CAAA"}

package/dist/elements/WhereBuilder/transformWhereQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"sourcesContent":["import type { Where } from 'payload/types'\n\n/**\n * Something like [or][0][and][0][text][equals]=example%20post will work and pass through the validateWhereQuery check.\n * However, something like [text][equals]=example%20post will not work and will fail the validateWhereQuery check,\n * even though it is a valid Where query. This needs to be transformed here.\n */\nexport const transformWhereQuery = (whereQuery): Where => {\n  if (!whereQuery) {\n    return {}\n  }\n  // Check if 'whereQuery' has 'or' field but no 'and'. This is the case for \"correct\" queries\n  if (whereQuery.or && !whereQuery.and) {\n    return {\n      or: whereQuery.or.map((query) => {\n        // ...but if the or query does not have an and, we need to add it\n        if (!query.and) {\n          return {\n            and: [query],\n          }\n        }\n        return query\n      }),\n    }\n  }\n\n  // Check if 'whereQuery' has 'and' field but no 'or'.\n  if (whereQuery.and && !whereQuery.or) {\n    return {\n      or: [\n        {\n          and: whereQuery.and,\n        },\n      ],\n    }\n  }\n\n  // Check if 'whereQuery' has neither 'or' nor 'and'.\n  if (!whereQuery.or && !whereQuery.and) {\n    return {\n      or: [\n        {\n          and: [whereQuery], // top-level siblings are considered 'and'\n        },\n      ],\n    }\n  }\n\n  // If 'whereQuery' has 'or' and 'and', just return it as it is.\n  return whereQuery\n}\n"],"names":["transformWhereQuery","whereQuery","or","and","map","query"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA;;;;CAIC,GACD,OAAO,MAAMA,sBAAsB,CAACC;IAClC,IAAI,CAACA,YAAY;QACf,OAAO,CAAC;IACV;IACA,4FAA4F;IAC5F,IAAIA,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACpC,OAAO;YACLD,IAAID,WAAWC,EAAE,CAACE,GAAG,CAAC,CAACC;gBACrB,iEAAiE;gBACjE,IAAI,CAACA,MAAMF,GAAG,EAAE;oBACd,OAAO;wBACLA,KAAK;4BAACE;yBAAM;oBACd;gBACF;gBACA,OAAOA;YACT;QACF;IACF;IAEA,qDAAqD;IACrD,IAAIJ,WAAWE,GAAG,IAAI,CAACF,WAAWC,EAAE,EAAE;QACpC,OAAO;YACLA,IAAI;gBACF;oBACEC,KAAKF,WAAWE,GAAG;gBACrB;aACD;QACH;IACF;IAEA,oDAAoD;IACpD,IAAI,CAACF,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACrC,OAAO;YACLD,IAAI;gBACF;oBACEC,KAAK;wBAACF;qBAAW;gBACnB;aACD;QACH;IACF;IAEA,+DAA+D;IAC/D,OAAOA;AACT,EAAC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"sourcesContent":["import type { Where } from 'payload'\n\n/**\n * Something like [or][0][and][0][text][equals]=example%20post will work and pass through the validateWhereQuery check.\n * However, something like [text][equals]=example%20post will not work and will fail the validateWhereQuery check,\n * even though it is a valid Where query. This needs to be transformed here.\n */\nexport const transformWhereQuery = (whereQuery): Where => {\n  if (!whereQuery) {\n    return {}\n  }\n  // Check if 'whereQuery' has 'or' field but no 'and'. This is the case for \"correct\" queries\n  if (whereQuery.or && !whereQuery.and) {\n    return {\n      or: whereQuery.or.map((query) => {\n        // ...but if the or query does not have an and, we need to add it\n        if (!query.and) {\n          return {\n            and: [query],\n          }\n        }\n        return query\n      }),\n    }\n  }\n\n  // Check if 'whereQuery' has 'and' field but no 'or'.\n  if (whereQuery.and && !whereQuery.or) {\n    return {\n      or: [\n        {\n          and: whereQuery.and,\n        },\n      ],\n    }\n  }\n\n  // Check if 'whereQuery' has neither 'or' nor 'and'.\n  if (!whereQuery.or && !whereQuery.and) {\n    return {\n      or: [\n        {\n          and: [whereQuery], // top-level siblings are considered 'and'\n        },\n      ],\n    }\n  }\n\n  // If 'whereQuery' has 'or' and 'and', just return it as it is.\n  return whereQuery\n}\n"],"names":["transformWhereQuery","whereQuery","or","and","map","query"],"mappings":"AAEA;;;;CAIC,GACD,OAAO,MAAMA,sBAAsB,CAACC;IAClC,IAAI,CAACA,YAAY;QACf,OAAO,CAAC;IACV;IACA,4FAA4F;IAC5F,IAAIA,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACpC,OAAO;YACLD,IAAID,WAAWC,EAAE,CAACE,GAAG,CAAC,CAACC;gBACrB,iEAAiE;gBACjE,IAAI,CAACA,MAAMF,GAAG,EAAE;oBACd,OAAO;wBACLA,KAAK;4BAACE;yBAAM;oBACd;gBACF;gBACA,OAAOA;YACT;QACF;IACF;IAEA,qDAAqD;IACrD,IAAIJ,WAAWE,GAAG,IAAI,CAACF,WAAWC,EAAE,EAAE;QACpC,OAAO;YACLA,IAAI;gBACF;oBACEC,KAAKF,WAAWE,GAAG;gBACrB;aACD;QACH;IACF;IAEA,oDAAoD;IACpD,IAAI,CAACF,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACrC,OAAO;YACLD,IAAI;gBACF;oBACEC,KAAK;wBAACF;qBAAW;gBACnB;aACD;QACH;IACF;IAEA,+DAA+D;IAC/D,OAAOA;AACT,EAAC"}

package/dist/elements/WhereBuilder/types.d.ts

@@ -1,7 +1,8 @@
-import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload/types';
+import type { Field, FieldMap, Operator, SanitizedCollectionConfig, Where } from 'payload';
 export type WhereBuilderProps = {
     collectionPluralLabel: SanitizedCollectionConfig['labels']['plural'];
     collectionSlug: SanitizedCollectionConfig['slug'];
+    fieldMap?: FieldMap;
 };
 export type FieldCondition = {
     component?: string;