@payloadcms/next 3.24.0-canary.72057b1 → 3.24.0-canary.7d9fbaf

package/dist/views/Version/RenderFieldsToDiff/utilities/countChangedFields.js

@@ -1,3 +1,4 @@
+import { fieldShouldBeLocalized } from 'payload/shared';
 import { fieldHasChanges } from './fieldHasChanges.js';
 import { getFieldsForRowComparison } from './getFieldsForRowComparison.js';
 /**
@@ -6,8 +7,10 @@ import { getFieldsForRowComparison } from './getFieldsForRowComparison.js';
  */
 export function countChangedFields({
   comparison,
+  config,
   fields,
   locales,
+  parentIsLocalized,
   version
 }) {
   let count = 0;
@@ -23,14 +26,19 @@ export function countChangedFields({
       case 'array':
       case 'blocks':
         {
-          if (locales && field.localized) {
+          if (locales && fieldShouldBeLocalized({
+            field,
+            parentIsLocalized
+          })) {
             locales.forEach(locale => {
               const comparisonRows = comparison?.[field.name]?.[locale] ?? [];
               const versionRows = version?.[field.name]?.[locale] ?? [];
               count += countChangedFieldsInRows({
                 comparisonRows,
+                config,
                 field,
                 locales,
+                parentIsLocalized: parentIsLocalized || field.localized,
                 versionRows
               });
             });
@@ -39,8 +47,10 @@ export function countChangedFields({
             const versionRows = version?.[field.name] ?? [];
             count += countChangedFieldsInRows({
               comparisonRows,
+              config,
               field,
               locales,
+              parentIsLocalized: parentIsLocalized || field.localized,
               versionRows
             });
           }
@@ -64,7 +74,10 @@ export function countChangedFields({
       case 'upload':
         {
           // Fields that have a name and contain data. We can just check if the data has changed.
-          if (locales && field.localized) {
+          if (locales && fieldShouldBeLocalized({
+            field,
+            parentIsLocalized
+          })) {
             locales.forEach(locale => {
               if (fieldHasChanges(version?.[field.name]?.[locale], comparison?.[field.name]?.[locale])) {
                 count++;
@@ -81,8 +94,10 @@ export function countChangedFields({
         {
           count += countChangedFields({
             comparison,
+            config,
             fields: field.fields,
             locales,
+            parentIsLocalized: parentIsLocalized || field.localized,
             version
           });
           break;
@@ -90,20 +105,27 @@ export function countChangedFields({
       // Fields that have nested fields and nest their fields' data.
       case 'group':
         {
-          if (locales && field.localized) {
+          if (locales && fieldShouldBeLocalized({
+            field,
+            parentIsLocalized
+          })) {
             locales.forEach(locale => {
               count += countChangedFields({
                 comparison: comparison?.[field.name]?.[locale],
+                config,
                 fields: field.fields,
                 locales,
+                parentIsLocalized: parentIsLocalized || field.localized,
                 version: version?.[field.name]?.[locale]
               });
             });
           } else {
             count += countChangedFields({
               comparison: comparison?.[field.name],
+              config,
               fields: field.fields,
               locales,
+              parentIsLocalized: parentIsLocalized || field.localized,
               version: version?.[field.name]
             });
           }
@@ -119,8 +141,10 @@ export function countChangedFields({
               locales.forEach(locale => {
                 count += countChangedFields({
                   comparison: comparison?.[tab.name]?.[locale],
+                  config,
                   fields: tab.fields,
                   locales,
+                  parentIsLocalized: parentIsLocalized || tab.localized,
                   version: version?.[tab.name]?.[locale]
                 });
               });
@@ -128,16 +152,20 @@ export function countChangedFields({
               // Named tab
               count += countChangedFields({
                 comparison: comparison?.[tab.name],
+                config,
                 fields: tab.fields,
                 locales,
+                parentIsLocalized: parentIsLocalized || tab.localized,
                 version: version?.[tab.name]
               });
             } else {
               // Unnamed tab
               count += countChangedFields({
                 comparison,
+                config,
                 fields: tab.fields,
                 locales,
+                parentIsLocalized: parentIsLocalized || tab.localized,
                 version
               });
             }
@@ -161,8 +189,10 @@ export function countChangedFields({
 }
 export function countChangedFieldsInRows({
   comparisonRows = [],
+  config,
   field,
   locales,
+  parentIsLocalized,
   versionRows = []
 }) {
   let count = 0;
@@ -180,14 +210,17 @@ export function countChangedFieldsInRows({
         schemaPath: ''
       },
       comparisonRow,
+      config,
       field,
       row: i,
       versionRow
     });
     count += countChangedFields({
       comparison: comparisonRow,
+      config,
       fields: rowFields,
       locales,
+      parentIsLocalized: parentIsLocalized || field.localized,
       version: versionRow
     });
     i++;

package/dist/views/Version/RenderFieldsToDiff/utilities/countChangedFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"countChangedFields.js","names":["fieldHasChanges","getFieldsForRowComparison","countChangedFields","comparison","fields","locales","version","count","forEach","field","name","fieldType","type","localized","locale","comparisonRows","versionRows","countChangedFieldsInRows","tabs","tab","_exhaustiveCheck","Error","String","i","comparisonRow","versionRow","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientField } from 'payload'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  comparison: unknown\n  fields: ClientField[]\n  locales: string[] | undefined\n  version: unknown\n}\n\n/**\n * Recursively counts the number of changed fields between comparison and\n * version data for a given set of fields.\n */\nexport function countChangedFields({ comparison, fields, locales, version }: Args) {\n  let count = 0\n\n  fields.forEach((field) => {\n    // Don't count the id field since it is not displayed in the UI\n    if ('name' in field && field.name === 'id') {\n      return\n    }\n    const fieldType = field.type\n    switch (fieldType) {\n      // Iterable fields are arrays and blocks fields. We iterate over each row and\n      // count the number of changed fields in each.\n      case 'array':\n      case 'blocks': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            const comparisonRows = comparison?.[field.name]?.[locale] ?? []\n            const versionRows = version?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({ comparisonRows, field, locales, versionRows })\n          })\n        } else {\n          const comparisonRows = comparison?.[field.name] ?? []\n          const versionRows = version?.[field.name] ?? []\n          count += countChangedFieldsInRows({ comparisonRows, field, locales, versionRows })\n        }\n        break\n      }\n\n      // Regular fields without nested fields.\n      case 'checkbox':\n      case 'code':\n      case 'date':\n      case 'email':\n      case 'join':\n      case 'json':\n      case 'number':\n      case 'point':\n      case 'radio':\n      case 'relationship':\n      case 'richText':\n      case 'select':\n      case 'text':\n      case 'textarea':\n      case 'upload': {\n        // Fields that have a name and contain data. We can just check if the data has changed.\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(version?.[field.name]?.[locale], comparison?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(version?.[field.name], comparison?.[field.name])) {\n          count++\n        }\n        break\n      }\n      // Fields that have nested fields, but don't nest their fields' data.\n      case 'collapsible':\n      case 'row': {\n        count += countChangedFields({\n          comparison,\n          fields: field.fields,\n          locales,\n          version,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            count += countChangedFields({\n              comparison: comparison?.[field.name]?.[locale],\n              fields: field.fields,\n              locales,\n              version: version?.[field.name]?.[locale],\n            })\n          })\n        } else {\n          count += countChangedFields({\n            comparison: comparison?.[field.name],\n            fields: field.fields,\n            locales,\n            version: version?.[field.name],\n          })\n        }\n        break\n      }\n\n      // Each tab in a tabs field has nested fields. The fields data may be\n      // nested or not depending on the existence of a name property.\n      case 'tabs': {\n        field.tabs.forEach((tab) => {\n          if ('name' in tab && locales && tab.localized) {\n            // Named localized tab\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                comparison: comparison?.[tab.name]?.[locale],\n                fields: tab.fields,\n                locales,\n                version: version?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              comparison: comparison?.[tab.name],\n              fields: tab.fields,\n              locales,\n              version: version?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              comparison,\n              fields: tab.fields,\n              locales,\n              version,\n            })\n          }\n        })\n        break\n      }\n\n      // UI fields don't have data and are not displayed in the version view\n      // so we can ignore them.\n      case 'ui': {\n        break\n      }\n\n      default: {\n        const _exhaustiveCheck: never = fieldType\n        throw new Error(`Unexpected field.type in countChangedFields : ${String(fieldType)}`)\n      }\n    }\n  })\n\n  return count\n}\n\ntype countChangedFieldsInRowsArgs = {\n  comparisonRows: unknown[]\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  versionRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  comparisonRows = [],\n  field,\n  locales,\n  versionRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (comparisonRows[i] || versionRows[i]) {\n    const comparisonRow = comparisonRows?.[i] || {}\n    const versionRow = versionRows?.[i] || {}\n\n    const { fields: rowFields } = getFieldsForRowComparison({\n      baseVersionField: { type: 'text', fields: [], path: '', schemaPath: '' }, // Doesn't matter, as we don't need the versionFields output here\n      comparisonRow,\n      field,\n      row: i,\n      versionRow,\n    })\n\n    count += countChangedFields({\n      comparison: comparisonRow,\n      fields: rowFields,\n      locales,\n      version: versionRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"countChangedFields.js","names":["fieldShouldBeLocalized","fieldHasChanges","getFieldsForRowComparison","countChangedFields","comparison","config","fields","locales","parentIsLocalized","version","count","forEach","field","name","fieldType","type","locale","comparisonRows","versionRows","countChangedFieldsInRows","localized","tabs","tab","_exhaustiveCheck","Error","String","i","comparisonRow","versionRow","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientConfig, ClientField } from 'payload'\n\nimport { fieldShouldBeLocalized } from 'payload/shared'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  comparison: unknown\n  config: ClientConfig\n  fields: ClientField[]\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  version: unknown\n}\n\n/**\n * Recursively counts the number of changed fields between comparison and\n * version data for a given set of fields.\n */\nexport function countChangedFields({\n  comparison,\n  config,\n  fields,\n  locales,\n  parentIsLocalized,\n  version,\n}: Args) {\n  let count = 0\n\n  fields.forEach((field) => {\n    // Don't count the id field since it is not displayed in the UI\n    if ('name' in field && field.name === 'id') {\n      return\n    }\n    const fieldType = field.type\n    switch (fieldType) {\n      // Iterable fields are arrays and blocks fields. We iterate over each row and\n      // count the number of changed fields in each.\n      case 'array':\n      case 'blocks': {\n        if (locales && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            const comparisonRows = comparison?.[field.name]?.[locale] ?? []\n            const versionRows = version?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({\n              comparisonRows,\n              config,\n              field,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              versionRows,\n            })\n          })\n        } else {\n          const comparisonRows = comparison?.[field.name] ?? []\n          const versionRows = version?.[field.name] ?? []\n          count += countChangedFieldsInRows({\n            comparisonRows,\n            config,\n            field,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            versionRows,\n          })\n        }\n        break\n      }\n\n      // Regular fields without nested fields.\n      case 'checkbox':\n      case 'code':\n      case 'date':\n      case 'email':\n      case 'join':\n      case 'json':\n      case 'number':\n      case 'point':\n      case 'radio':\n      case 'relationship':\n      case 'richText':\n      case 'select':\n      case 'text':\n      case 'textarea':\n      case 'upload': {\n        // Fields that have a name and contain data. We can just check if the data has changed.\n        if (locales && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(version?.[field.name]?.[locale], comparison?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(version?.[field.name], comparison?.[field.name])) {\n          count++\n        }\n        break\n      }\n      // Fields that have nested fields, but don't nest their fields' data.\n      case 'collapsible':\n      case 'row': {\n        count += countChangedFields({\n          comparison,\n          config,\n          fields: field.fields,\n          locales,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          version,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (locales && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            count += countChangedFields({\n              comparison: comparison?.[field.name]?.[locale],\n              config,\n              fields: field.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              version: version?.[field.name]?.[locale],\n            })\n          })\n        } else {\n          count += countChangedFields({\n            comparison: comparison?.[field.name],\n            config,\n            fields: field.fields,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            version: version?.[field.name],\n          })\n        }\n        break\n      }\n\n      // Each tab in a tabs field has nested fields. The fields data may be\n      // nested or not depending on the existence of a name property.\n      case 'tabs': {\n        field.tabs.forEach((tab) => {\n          if ('name' in tab && locales && tab.localized) {\n            // Named localized tab\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                comparison: comparison?.[tab.name]?.[locale],\n                config,\n                fields: tab.fields,\n                locales,\n                parentIsLocalized: parentIsLocalized || tab.localized,\n                version: version?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              comparison: comparison?.[tab.name],\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              version: version?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              comparison,\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              version,\n            })\n          }\n        })\n        break\n      }\n\n      // UI fields don't have data and are not displayed in the version view\n      // so we can ignore them.\n      case 'ui': {\n        break\n      }\n\n      default: {\n        const _exhaustiveCheck: never = fieldType\n        throw new Error(`Unexpected field.type in countChangedFields : ${String(fieldType)}`)\n      }\n    }\n  })\n\n  return count\n}\n\ntype countChangedFieldsInRowsArgs = {\n  comparisonRows: unknown[]\n  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  versionRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  comparisonRows = [],\n  config,\n  field,\n  locales,\n  parentIsLocalized,\n  versionRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (comparisonRows[i] || versionRows[i]) {\n    const comparisonRow = comparisonRows?.[i] || {}\n    const versionRow = versionRows?.[i] || {}\n\n    const { fields: rowFields } = getFieldsForRowComparison({\n      baseVersionField: { type: 'text', fields: [], path: '', schemaPath: '' }, // Doesn't matter, as we don't need the versionFields output here\n      comparisonRow,\n      config,\n      field,\n      row: i,\n      versionRow,\n    })\n\n    count += countChangedFields({\n      comparison: comparisonRow,\n      config,\n      fields: rowFields,\n      locales,\n      parentIsLocalized: parentIsLocalized || field.localized,\n      version: versionRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.d.ts

@@ -1,13 +1,14 @@
-import type { ArrayFieldClient, BaseVersionField, BlocksFieldClient, ClientField, VersionField } from 'payload';
+import type { ArrayFieldClient, BaseVersionField, BlocksFieldClient, ClientConfig, ClientField, VersionField } from 'payload';
 /**
  * Get the fields for a row in an iterable field for comparison.
  * - Array fields: the fields of the array field, because the fields are the same for each row.
  * - Blocks fields: the union of fields from the comparison and version row,
  *   because the fields from the version and comparison rows may differ.
  */
-export declare function getFieldsForRowComparison({ baseVersionField, comparisonRow, field, row, versionRow, }: {
+export declare function getFieldsForRowComparison({ baseVersionField, comparisonRow, config, field, row, versionRow, }: {
     baseVersionField: BaseVersionField;
     comparisonRow: any;
+    config: ClientConfig;
     field: ArrayFieldClient | BlocksFieldClient;
     row: number;
     versionRow: any;

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFieldsForRowComparison.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,GAAG,EACH,UAAU,GACX,EAAE;IACD,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,aAAa,EAAE,GAAG,CAAA;IAClB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,YAAY,EAAE,CAAA;CAAE,CA2C3D"}
+{"version":3,"file":"getFieldsForRowComparison.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAEjB,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,gBAAgB,EAChB,aAAa,EACb,MAAM,EACN,KAAK,EACL,GAAG,EACH,UAAU,GACX,EAAE;IACD,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,aAAa,EAAE,GAAG,CAAA;IAClB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,YAAY,EAAE,CAAA;CAAE,CAwD3D"}

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.js

@@ -8,6 +8,7 @@ import { getUniqueListBy } from 'payload/shared';
 export function getFieldsForRowComparison({
   baseVersionField,
   comparisonRow,
+  config,
   field,
   row,
   versionRow
@@ -19,18 +20,18 @@ export function getFieldsForRowComparison({
     versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;
   } else if (field.type === 'blocks') {
     if (versionRow?.blockType === comparisonRow?.blockType) {
-      const matchedBlock = 'blocks' in field && field.blocks?.find(block => block.slug === versionRow?.blockType) || {
+      const matchedBlock = config?.blocksMap?.[versionRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === versionRow?.blockType) || {
         fields: []
-      };
+      });
       fields = matchedBlock.fields;
       versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;
     } else {
-      const matchedVersionBlock = 'blocks' in field && field.blocks?.find(block => block.slug === versionRow?.blockType) || {
+      const matchedVersionBlock = config?.blocksMap?.[versionRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === versionRow?.blockType) || {
         fields: []
-      };
-      const matchedComparisonBlock = 'blocks' in field && field.blocks?.find(block => block.slug === comparisonRow?.blockType) || {
+      });
+      const matchedComparisonBlock = config?.blocksMap?.[comparisonRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === comparisonRow?.blockType) || {
         fields: []
-      };
+      });
       fields = getUniqueListBy([...matchedVersionBlock.fields, ...matchedComparisonBlock.fields], 'name');
       // buildVersionFields already merged the fields of the version and comparison rows together
       versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFieldsForRowComparison.js","names":["getUniqueListBy","getFieldsForRowComparison","baseVersionField","comparisonRow","field","row","versionRow","fields","versionFields","type","rows","length","blockType","matchedBlock","blocks","find","block","slug","matchedVersionBlock","matchedComparisonBlock"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"sourcesContent":["import type {\n  ArrayFieldClient,\n  BaseVersionField,\n  BlocksFieldClient,\n  ClientField,\n  VersionField,\n} from 'payload'\n\nimport { getUniqueListBy } from 'payload/shared'\n\n/**\n * Get the fields for a row in an iterable field for comparison.\n * - Array fields: the fields of the array field, because the fields are the same for each row.\n * - Blocks fields: the union of fields from the comparison and version row,\n *   because the fields from the version and comparison rows may differ.\n */\nexport function getFieldsForRowComparison({\n  baseVersionField,\n  comparisonRow,\n  field,\n  row,\n  versionRow,\n}: {\n  baseVersionField: BaseVersionField\n  comparisonRow: any\n  field: ArrayFieldClient | BlocksFieldClient\n  row: number\n  versionRow: any\n}): { fields: ClientField[]; versionFields: VersionField[] } {\n  let fields: ClientField[] = []\n  let versionFields: VersionField[] = []\n\n  if (field.type === 'array' && 'fields' in field) {\n    fields = field.fields\n    versionFields = baseVersionField.rows?.length\n      ? baseVersionField.rows[row]\n      : baseVersionField.fields\n  } else if (field.type === 'blocks') {\n    if (versionRow?.blockType === comparisonRow?.blockType) {\n      const matchedBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {\n        fields: [],\n      }\n\n      fields = matchedBlock.fields\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    } else {\n      const matchedVersionBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {\n        fields: [],\n      }\n      const matchedComparisonBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === comparisonRow?.blockType)) || {\n        fields: [],\n      }\n\n      fields = getUniqueListBy<ClientField>(\n        [...matchedVersionBlock.fields, ...matchedComparisonBlock.fields],\n        'name',\n      )\n\n      // buildVersionFields already merged the fields of the version and comparison rows together\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    }\n  }\n\n  return { fields, versionFields }\n}\n"],"mappings":"AAQA,SAASA,eAAe,QAAQ;AAEhC;;;;;;AAMA,OAAO,SAASC,0BAA0B;EACxCC,gBAAgB;EAChBC,aAAa;EACbC,KAAK;EACLC,GAAG;EACHC;AAAU,CAOX;EACC,IAAIC,MAAA,GAAwB,EAAE;EAC9B,IAAIC,aAAA,GAAgC,EAAE;EAEtC,IAAIJ,KAAA,CAAMK,IAAI,KAAK,WAAW,YAAYL,KAAA,EAAO;IAC/CG,MAAA,GAASH,KAAA,CAAMG,MAAM;IACrBC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;EAC7B,OAAO,IAAIH,KAAA,CAAMK,IAAI,KAAK,UAAU;IAClC,IAAIH,UAAA,EAAYM,SAAA,KAAcT,aAAA,EAAeS,SAAA,EAAW;MACtD,MAAMC,YAAA,GAAe,QAAC,IAAYT,KAAA,IAChCA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKX,UAAA,EAAYM,SAAA,KAAe;QACxEL,MAAA,EAAQ;MACV;MAEAA,MAAA,GAASM,YAAA,CAAaN,MAAM;MAC5BC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;IAC7B,OAAO;MACL,MAAMW,mBAAA,GAAsB,QAAC,IAAYd,KAAA,IACvCA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKX,UAAA,EAAYM,SAAA,KAAe;QACxEL,MAAA,EAAQ;MACV;MACA,MAAMY,sBAAA,GAAyB,QAAC,IAAYf,KAAA,IAC1CA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKd,aAAA,EAAeS,SAAA,KAAe;QAC3EL,MAAA,EAAQ;MACV;MAEAA,MAAA,GAASP,eAAA,CACP,C,GAAIkB,mBAAA,CAAoBX,MAAM,E,GAAKY,sBAAA,CAAuBZ,MAAM,CAAC,EACjE;MAGF;MACAC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;IAC7B;EACF;EAEA,OAAO;IAAEA,MAAA;IAAQC;EAAc;AACjC","ignoreList":[]}
+{"version":3,"file":"getFieldsForRowComparison.js","names":["getUniqueListBy","getFieldsForRowComparison","baseVersionField","comparisonRow","config","field","row","versionRow","fields","versionFields","type","rows","length","blockType","matchedBlock","blocksMap","blockReferences","blocks","find","block","slug","matchedVersionBlock","matchedComparisonBlock"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"sourcesContent":["import type {\n  ArrayFieldClient,\n  BaseVersionField,\n  BlocksFieldClient,\n  ClientBlock,\n  ClientConfig,\n  ClientField,\n  VersionField,\n} from 'payload'\n\nimport { getUniqueListBy } from 'payload/shared'\n\n/**\n * Get the fields for a row in an iterable field for comparison.\n * - Array fields: the fields of the array field, because the fields are the same for each row.\n * - Blocks fields: the union of fields from the comparison and version row,\n *   because the fields from the version and comparison rows may differ.\n */\nexport function getFieldsForRowComparison({\n  baseVersionField,\n  comparisonRow,\n  config,\n  field,\n  row,\n  versionRow,\n}: {\n  baseVersionField: BaseVersionField\n  comparisonRow: any\n  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  row: number\n  versionRow: any\n}): { fields: ClientField[]; versionFields: VersionField[] } {\n  let fields: ClientField[] = []\n  let versionFields: VersionField[] = []\n\n  if (field.type === 'array' && 'fields' in field) {\n    fields = field.fields\n    versionFields = baseVersionField.rows?.length\n      ? baseVersionField.rows[row]\n      : baseVersionField.fields\n  } else if (field.type === 'blocks') {\n    if (versionRow?.blockType === comparisonRow?.blockType) {\n      const matchedBlock: ClientBlock =\n        config?.blocksMap?.[versionRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === versionRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      fields = matchedBlock.fields\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    } else {\n      const matchedVersionBlock =\n        config?.blocksMap?.[versionRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === versionRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      const matchedComparisonBlock =\n        config?.blocksMap?.[comparisonRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === comparisonRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      fields = getUniqueListBy<ClientField>(\n        [...matchedVersionBlock.fields, ...matchedComparisonBlock.fields],\n        'name',\n      )\n\n      // buildVersionFields already merged the fields of the version and comparison rows together\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    }\n  }\n\n  return { fields, versionFields }\n}\n"],"mappings":"AAUA,SAASA,eAAe,QAAQ;AAEhC;;;;;;AAMA,OAAO,SAASC,0BAA0B;EACxCC,gBAAgB;EAChBC,aAAa;EACbC,MAAM;EACNC,KAAK;EACLC,GAAG;EACHC;AAAU,CAQX;EACC,IAAIC,MAAA,GAAwB,EAAE;EAC9B,IAAIC,aAAA,GAAgC,EAAE;EAEtC,IAAIJ,KAAA,CAAMK,IAAI,KAAK,WAAW,YAAYL,KAAA,EAAO;IAC/CG,MAAA,GAASH,KAAA,CAAMG,MAAM;IACrBC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;EAC7B,OAAO,IAAIH,KAAA,CAAMK,IAAI,KAAK,UAAU;IAClC,IAAIH,UAAA,EAAYM,SAAA,KAAcV,aAAA,EAAeU,SAAA,EAAW;MACtD,MAAMC,YAAA,GACJV,MAAA,EAAQW,SAAA,GAAYR,UAAA,EAAYM,SAAA,CAAU,KACxC,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKb,UAAA,EAAYM,SAAA,KAC/D;QACNL,MAAA,EAAQ;MACV;MAEFA,MAAA,GAASM,YAAA,CAAaN,MAAM;MAC5BC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;IAC7B,OAAO;MACL,MAAMa,mBAAA,GACJjB,MAAA,EAAQW,SAAA,GAAYR,UAAA,EAAYM,SAAA,CAAU,KACxC,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKb,UAAA,EAAYM,SAAA,KAC/D;QACNL,MAAA,EAAQ;MACV;MAEF,MAAMc,sBAAA,GACJlB,MAAA,EAAQW,SAAA,GAAYZ,aAAA,EAAeU,SAAA,CAAU,KAC3C,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKjB,aAAA,EAAeU,SAAA,KAClE;QACNL,MAAA,EAAQ;MACV;MAEFA,MAAA,GAASR,eAAA,CACP,C,GAAIqB,mBAAA,CAAoBb,MAAM,E,GAAKc,sBAAA,CAAuBd,MAAM,CAAC,EACjE;MAGF;MACAC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;IAC7B;EACF;EAEA,OAAO;IAAEA,MAAA;IAAQC;EAAc;AACjC","ignoreList":[]}

package/dist/views/Version/Restore/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/index.tsx"],"names":[],"mappings":"AAeA,OAAO,KAA0C,MAAM,OAAO,CAAA;AAG9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,cAAc,CAAA;AAKrB,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAmH5B,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/index.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAA0C,MAAM,OAAO,CAAA;AAG9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,cAAc,CAAA;AAKrB,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAqH5B,CAAA;AAED,eAAe,OAAO,CAAA"}

package/dist/views/Version/Restore/index.js

@@ -2,7 +2,7 @@
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
-import { Button, Modal, PopupList, useConfig, useModal, useTranslation } from '@payloadcms/ui';
+import { Button, Modal, PopupList, useConfig, useModal, useRouteTransition, useTranslation } from '@payloadcms/ui';
 import { formatAdminURL, requests } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React, { Fragment, useCallback, useState } from 'react';
@@ -42,6 +42,9 @@ const Restore = ({
     t
   } = useTranslation();
   const [draft, setDraft] = useState(false);
+  const {
+    startRouteTransition
+  } = useRouteTransition();
   const restoreMessage = t('version:aboutToRestoreGlobal', {
     label: getTranslation(label, i18n),
     versionDate
@@ -73,11 +76,11 @@ const Restore = ({
     if (res.status === 200) {
       const json = await res.json();
       toast.success(json.message);
-      router.push(redirectURL);
+      startRouteTransition(() => router.push(redirectURL));
     } else {
       toast.error(t('version:problemRestoringVersion'));
     }
-  }, [fetchURL, redirectURL, t, i18n, router]);
+  }, [fetchURL, redirectURL, t, i18n, router, startRouteTransition]);
   return /*#__PURE__*/_jsxs(Fragment, {
     children: [/*#__PURE__*/_jsx("div", {
       className: [baseClass, className].filter(Boolean).join(' '),

package/dist/views/Version/Restore/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getTranslation","Button","Modal","PopupList","useConfig","useModal","useTranslation","formatAdminURL","requests","useRouter","React","Fragment","useCallback","useState","toast","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","status","versionDate","versionID","config","routes","admin","adminRoute","api","apiRoute","serverURL","getEntityConfig","collectionConfig","toggleModal","processing","setProcessing","router","i18n","t","draft","setDraft","restoreMessage","fetchURL","redirectURL","canRestoreAsDraft","versions","drafts","path","handleRestore","res","post","headers","language","json","success","message","push","error","_jsxs","_jsx","filter","Boolean","join","buttonStyle","onClick","size","SubMenuPopupContent","ButtonGroup","slug","undefined","type"],"sources":["../../../../src/views/Version/Restore/index.tsx"],"sourcesContent":["'use client'\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  Button,\n  ChevronIcon,\n  Modal,\n  Pill,\n  Popup,\n  PopupList,\n  useConfig,\n  useModal,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { formatAdminURL, requests } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport React, { Fragment, useCallback, useState } from 'react'\nimport { toast } from 'sonner'\n\nimport type { Props } from './types.js'\n\nimport './index.scss'\n\nconst baseClass = 'restore-version'\nconst modalSlug = 'restore-version'\n\nconst Restore: React.FC<Props> = ({\n  className,\n  collectionSlug,\n  globalSlug,\n  label,\n  originalDocID,\n  status,\n  versionDate,\n  versionID,\n}) => {\n  const {\n    config: {\n      routes: { admin: adminRoute, api: apiRoute },\n      serverURL,\n    },\n    getEntityConfig,\n  } = useConfig()\n\n  const collectionConfig = getEntityConfig({ collectionSlug })\n\n  const { toggleModal } = useModal()\n  const [processing, setProcessing] = useState(false)\n  const router = useRouter()\n  const { i18n, t } = useTranslation()\n  const [draft, setDraft] = useState(false)\n\n  const restoreMessage = t('version:aboutToRestoreGlobal', {\n    label: getTranslation(label, i18n),\n    versionDate,\n  })\n\n  let fetchURL = `${serverURL}${apiRoute}`\n  let redirectURL: string\n\n  const canRestoreAsDraft = status !== 'draft' && collectionConfig?.versions?.drafts\n\n  if (collectionSlug) {\n    fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/collections/${collectionSlug}/${originalDocID}`,\n    })\n  }\n\n  if (globalSlug) {\n    fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/globals/${globalSlug}`,\n    })\n  }\n\n  const handleRestore = useCallback(async () => {\n    setProcessing(true)\n\n    const res = await requests.post(fetchURL, {\n      headers: {\n        'Accept-Language': i18n.language,\n      },\n    })\n\n    if (res.status === 200) {\n      const json = await res.json()\n      toast.success(json.message)\n      router.push(redirectURL)\n    } else {\n      toast.error(t('version:problemRestoringVersion'))\n    }\n  }, [fetchURL, redirectURL, t, i18n, router])\n  return (\n    <Fragment>\n      <div className={[baseClass, className].filter(Boolean).join(' ')}>\n        <Button\n          buttonStyle=\"pill\"\n          className={[canRestoreAsDraft && `${baseClass}__button`].filter(Boolean).join(' ')}\n          onClick={() => toggleModal(modalSlug)}\n          size=\"small\"\n          SubMenuPopupContent={\n            canRestoreAsDraft\n              ? () => (\n                  <PopupList.ButtonGroup>\n                    <PopupList.Button onClick={() => [setDraft(true), toggleModal(modalSlug)]}>\n                      {t('version:restoreAsDraft')}\n                    </PopupList.Button>\n                  </PopupList.ButtonGroup>\n                )\n              : null\n          }\n        >\n          {t('version:restoreThisVersion')}\n        </Button>\n      </div>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <div className={`${baseClass}__wrapper`}>\n          <div className={`${baseClass}__content`}>\n            <h1>{t('version:confirmVersionRestoration')}</h1>\n            <p>{restoreMessage}</p>\n          </div>\n          <div className={`${baseClass}__controls`}>\n            <Button\n              buttonStyle=\"secondary\"\n              onClick={processing ? undefined : () => toggleModal(modalSlug)}\n              size=\"large\"\n              type=\"button\"\n            >\n              {t('general:cancel')}\n            </Button>\n            <Button onClick={processing ? undefined : () => void handleRestore()}>\n              {processing ? t('version:restoring') : t('general:confirm')}\n            </Button>\n          </div>\n        </div>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"mappings":"AAAA;;;AACA,SAASA,cAAc,QAAQ;AAC/B,SACEC,MAAM,EAENC,KAAK,EAGLC,SAAS,EACTC,SAAS,EACTC,QAAQ,EACRC,cAAc,QACT;AACP,SAASC,cAAc,EAAEC,QAAQ,QAAQ;AACzC,SAASC,SAAS,QAAQ;AAC1B,OAAOC,KAAA,IAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ;AACvD,SAASC,KAAK,QAAQ;AAMtB,MAAMC,SAAA,GAAY;AAClB,MAAMC,SAAA,GAAY;AAElB,MAAMC,OAAA,GAA2BA,CAAC;EAChCC,SAAS;EACTC,cAAc;EACdC,UAAU;EACVC,KAAK;EACLC,aAAa;EACbC,MAAM;EACNC,WAAW;EACXC;AAAS,CACV;EACC,MAAM;IACJC,MAAA,EAAQ;MACNC,MAAA,EAAQ;QAAEC,KAAA,EAAOC,UAAU;QAAEC,GAAA,EAAKC;MAAQ,CAAE;MAC5CC;IAAS,CACV;IACDC;EAAe,CAChB,GAAG7B,SAAA;EAEJ,MAAM8B,gBAAA,GAAmBD,eAAA,CAAgB;IAAEd;EAAe;EAE1D,MAAM;IAAEgB;EAAW,CAAE,GAAG9B,QAAA;EACxB,MAAM,CAAC+B,UAAA,EAAYC,aAAA,CAAc,GAAGxB,QAAA,CAAS;EAC7C,MAAMyB,MAAA,GAAS7B,SAAA;EACf,MAAM;IAAE8B,IAAI;IAAEC;EAAC,CAAE,GAAGlC,cAAA;EACpB,MAAM,CAACmC,KAAA,EAAOC,QAAA,CAAS,GAAG7B,QAAA,CAAS;EAEnC,MAAM8B,cAAA,GAAiBH,CAAA,CAAE,gCAAgC;IACvDnB,KAAA,EAAOrB,cAAA,CAAeqB,KAAA,EAAOkB,IAAA;IAC7Bf;EACF;EAEA,IAAIoB,QAAA,GAAW,GAAGZ,SAAA,GAAYD,QAAA,EAAU;EACxC,IAAIc,WAAA;EAEJ,MAAMC,iBAAA,GAAoBvB,MAAA,KAAW,WAAWW,gBAAA,EAAkBa,QAAA,EAAUC,MAAA;EAE5E,IAAI7B,cAAA,EAAgB;IAClByB,QAAA,GAAW,GAAGA,QAAA,IAAYzB,cAAA,aAA2BM,SAAA,UAAmBgB,KAAA,EAAO;IAC/EI,WAAA,GAActC,cAAA,CAAe;MAC3BsB,UAAA;MACAoB,IAAA,EAAM,gBAAgB9B,cAAA,IAAkBG,aAAA;IAC1C;EACF;EAEA,IAAIF,UAAA,EAAY;IACdwB,QAAA,GAAW,GAAGA,QAAA,YAAoBxB,UAAA,aAAuBK,SAAA,UAAmBgB,KAAA,EAAO;IACnFI,WAAA,GAActC,cAAA,CAAe;MAC3BsB,UAAA;MACAoB,IAAA,EAAM,YAAY7B,UAAA;IACpB;EACF;EAEA,MAAM8B,aAAA,GAAgBtC,WAAA,CAAY;IAChCyB,aAAA,CAAc;IAEd,MAAMc,GAAA,GAAM,MAAM3C,QAAA,CAAS4C,IAAI,CAACR,QAAA,EAAU;MACxCS,OAAA,EAAS;QACP,mBAAmBd,IAAA,CAAKe;MAC1B;IACF;IAEA,IAAIH,GAAA,CAAI5B,MAAM,KAAK,KAAK;MACtB,MAAMgC,IAAA,GAAO,MAAMJ,GAAA,CAAII,IAAI;MAC3BzC,KAAA,CAAM0C,OAAO,CAACD,IAAA,CAAKE,OAAO;MAC1BnB,MAAA,CAAOoB,IAAI,CAACb,WAAA;IACd,OAAO;MACL/B,KAAA,CAAM6C,KAAK,CAACnB,CAAA,CAAE;IAChB;EACF,GAAG,CAACI,QAAA,EAAUC,WAAA,EAAaL,CAAA,EAAGD,IAAA,EAAMD,MAAA,CAAO;EAC3C,oBACEsB,KAAA,CAACjD,QAAA;4BACCkD,IAAA,CAAC;MAAI3C,SAAA,EAAW,CAACH,SAAA,EAAWG,SAAA,CAAU,CAAC4C,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;gBAC1D,aAAAH,IAAA,CAAC5D,MAAA;QACCgE,WAAA,EAAY;QACZ/C,SAAA,EAAW,CAAC4B,iBAAA,IAAqB,GAAG/B,SAAA,UAAmB,CAAC,CAAC+C,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;QAC9EE,OAAA,EAASA,CAAA,KAAM/B,WAAA,CAAYnB,SAAA;QAC3BmD,IAAA,EAAK;QACLC,mBAAA,EACEtB,iBAAA,GACI,mBACEe,IAAA,CAAC1D,SAAA,CAAUkE,WAAW;oBACpB,aAAAR,IAAA,CAAC1D,SAAA,CAAUF,MAAM;YAACiE,OAAA,EAASA,CAAA,KAAM,CAACxB,QAAA,CAAS,OAAOP,WAAA,CAAYnB,SAAA,EAAW;sBACtEwB,CAAA,CAAE;;aAIT;kBAGLA,CAAA,CAAE;;qBAGPqB,IAAA,CAAC3D,KAAA;MAAMgB,SAAA,EAAW,GAAGH,SAAA,SAAkB;MAAEuD,IAAA,EAAMtD,SAAA;gBAC7C,aAAA4C,KAAA,CAAC;QAAI1C,SAAA,EAAW,GAAGH,SAAA,WAAoB;gCACrC6C,KAAA,CAAC;UAAI1C,SAAA,EAAW,GAAGH,SAAA,WAAoB;kCACrC8C,IAAA,CAAC;sBAAIrB,CAAA,CAAE;2BACPqB,IAAA,CAAC;sBAAGlB;;yBAENiB,KAAA,CAAC;UAAI1C,SAAA,EAAW,GAAGH,SAAA,YAAqB;kCACtC8C,IAAA,CAAC5D,MAAA;YACCgE,WAAA,EAAY;YACZC,OAAA,EAAS9B,UAAA,GAAamC,SAAA,GAAY,MAAMpC,WAAA,CAAYnB,SAAA;YACpDmD,IAAA,EAAK;YACLK,IAAA,EAAK;sBAEJhC,CAAA,CAAE;2BAELqB,IAAA,CAAC5D,MAAA;YAAOiE,OAAA,EAAS9B,UAAA,GAAamC,SAAA,GAAY,MAAM,KAAKrB,aAAA;sBAClDd,UAAA,GAAaI,CAAA,CAAE,uBAAuBA,CAAA,CAAE;;;;;;AAOvD;AAEA,eAAevB,OAAA","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getTranslation","Button","Modal","PopupList","useConfig","useModal","useRouteTransition","useTranslation","formatAdminURL","requests","useRouter","React","Fragment","useCallback","useState","toast","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","status","versionDate","versionID","config","routes","admin","adminRoute","api","apiRoute","serverURL","getEntityConfig","collectionConfig","toggleModal","processing","setProcessing","router","i18n","t","draft","setDraft","startRouteTransition","restoreMessage","fetchURL","redirectURL","canRestoreAsDraft","versions","drafts","path","handleRestore","res","post","headers","language","json","success","message","push","error","_jsxs","_jsx","filter","Boolean","join","buttonStyle","onClick","size","SubMenuPopupContent","ButtonGroup","slug","undefined","type"],"sources":["../../../../src/views/Version/Restore/index.tsx"],"sourcesContent":["'use client'\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  Button,\n  ChevronIcon,\n  Modal,\n  Pill,\n  Popup,\n  PopupList,\n  useConfig,\n  useModal,\n  useRouteTransition,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { formatAdminURL, requests } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport React, { Fragment, useCallback, useState } from 'react'\nimport { toast } from 'sonner'\n\nimport type { Props } from './types.js'\n\nimport './index.scss'\n\nconst baseClass = 'restore-version'\nconst modalSlug = 'restore-version'\n\nconst Restore: React.FC<Props> = ({\n  className,\n  collectionSlug,\n  globalSlug,\n  label,\n  originalDocID,\n  status,\n  versionDate,\n  versionID,\n}) => {\n  const {\n    config: {\n      routes: { admin: adminRoute, api: apiRoute },\n      serverURL,\n    },\n    getEntityConfig,\n  } = useConfig()\n\n  const collectionConfig = getEntityConfig({ collectionSlug })\n\n  const { toggleModal } = useModal()\n  const [processing, setProcessing] = useState(false)\n  const router = useRouter()\n  const { i18n, t } = useTranslation()\n  const [draft, setDraft] = useState(false)\n  const { startRouteTransition } = useRouteTransition()\n\n  const restoreMessage = t('version:aboutToRestoreGlobal', {\n    label: getTranslation(label, i18n),\n    versionDate,\n  })\n\n  let fetchURL = `${serverURL}${apiRoute}`\n  let redirectURL: string\n\n  const canRestoreAsDraft = status !== 'draft' && collectionConfig?.versions?.drafts\n\n  if (collectionSlug) {\n    fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/collections/${collectionSlug}/${originalDocID}`,\n    })\n  }\n\n  if (globalSlug) {\n    fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/globals/${globalSlug}`,\n    })\n  }\n\n  const handleRestore = useCallback(async () => {\n    setProcessing(true)\n\n    const res = await requests.post(fetchURL, {\n      headers: {\n        'Accept-Language': i18n.language,\n      },\n    })\n\n    if (res.status === 200) {\n      const json = await res.json()\n      toast.success(json.message)\n      startRouteTransition(() => router.push(redirectURL))\n    } else {\n      toast.error(t('version:problemRestoringVersion'))\n    }\n  }, [fetchURL, redirectURL, t, i18n, router, startRouteTransition])\n\n  return (\n    <Fragment>\n      <div className={[baseClass, className].filter(Boolean).join(' ')}>\n        <Button\n          buttonStyle=\"pill\"\n          className={[canRestoreAsDraft && `${baseClass}__button`].filter(Boolean).join(' ')}\n          onClick={() => toggleModal(modalSlug)}\n          size=\"small\"\n          SubMenuPopupContent={\n            canRestoreAsDraft\n              ? () => (\n                  <PopupList.ButtonGroup>\n                    <PopupList.Button onClick={() => [setDraft(true), toggleModal(modalSlug)]}>\n                      {t('version:restoreAsDraft')}\n                    </PopupList.Button>\n                  </PopupList.ButtonGroup>\n                )\n              : null\n          }\n        >\n          {t('version:restoreThisVersion')}\n        </Button>\n      </div>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <div className={`${baseClass}__wrapper`}>\n          <div className={`${baseClass}__content`}>\n            <h1>{t('version:confirmVersionRestoration')}</h1>\n            <p>{restoreMessage}</p>\n          </div>\n          <div className={`${baseClass}__controls`}>\n            <Button\n              buttonStyle=\"secondary\"\n              onClick={processing ? undefined : () => toggleModal(modalSlug)}\n              size=\"large\"\n              type=\"button\"\n            >\n              {t('general:cancel')}\n            </Button>\n            <Button onClick={processing ? undefined : () => void handleRestore()}>\n              {processing ? t('version:restoring') : t('general:confirm')}\n            </Button>\n          </div>\n        </div>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"mappings":"AAAA;;;AACA,SAASA,cAAc,QAAQ;AAC/B,SACEC,MAAM,EAENC,KAAK,EAGLC,SAAS,EACTC,SAAS,EACTC,QAAQ,EACRC,kBAAkB,EAClBC,cAAc,QACT;AACP,SAASC,cAAc,EAAEC,QAAQ,QAAQ;AACzC,SAASC,SAAS,QAAQ;AAC1B,OAAOC,KAAA,IAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ;AACvD,SAASC,KAAK,QAAQ;AAMtB,MAAMC,SAAA,GAAY;AAClB,MAAMC,SAAA,GAAY;AAElB,MAAMC,OAAA,GAA2BA,CAAC;EAChCC,SAAS;EACTC,cAAc;EACdC,UAAU;EACVC,KAAK;EACLC,aAAa;EACbC,MAAM;EACNC,WAAW;EACXC;AAAS,CACV;EACC,MAAM;IACJC,MAAA,EAAQ;MACNC,MAAA,EAAQ;QAAEC,KAAA,EAAOC,UAAU;QAAEC,GAAA,EAAKC;MAAQ,CAAE;MAC5CC;IAAS,CACV;IACDC;EAAe,CAChB,GAAG9B,SAAA;EAEJ,MAAM+B,gBAAA,GAAmBD,eAAA,CAAgB;IAAEd;EAAe;EAE1D,MAAM;IAAEgB;EAAW,CAAE,GAAG/B,QAAA;EACxB,MAAM,CAACgC,UAAA,EAAYC,aAAA,CAAc,GAAGxB,QAAA,CAAS;EAC7C,MAAMyB,MAAA,GAAS7B,SAAA;EACf,MAAM;IAAE8B,IAAI;IAAEC;EAAC,CAAE,GAAGlC,cAAA;EACpB,MAAM,CAACmC,KAAA,EAAOC,QAAA,CAAS,GAAG7B,QAAA,CAAS;EACnC,MAAM;IAAE8B;EAAoB,CAAE,GAAGtC,kBAAA;EAEjC,MAAMuC,cAAA,GAAiBJ,CAAA,CAAE,gCAAgC;IACvDnB,KAAA,EAAOtB,cAAA,CAAesB,KAAA,EAAOkB,IAAA;IAC7Bf;EACF;EAEA,IAAIqB,QAAA,GAAW,GAAGb,SAAA,GAAYD,QAAA,EAAU;EACxC,IAAIe,WAAA;EAEJ,MAAMC,iBAAA,GAAoBxB,MAAA,KAAW,WAAWW,gBAAA,EAAkBc,QAAA,EAAUC,MAAA;EAE5E,IAAI9B,cAAA,EAAgB;IAClB0B,QAAA,GAAW,GAAGA,QAAA,IAAY1B,cAAA,aAA2BM,SAAA,UAAmBgB,KAAA,EAAO;IAC/EK,WAAA,GAAcvC,cAAA,CAAe;MAC3BsB,UAAA;MACAqB,IAAA,EAAM,gBAAgB/B,cAAA,IAAkBG,aAAA;IAC1C;EACF;EAEA,IAAIF,UAAA,EAAY;IACdyB,QAAA,GAAW,GAAGA,QAAA,YAAoBzB,UAAA,aAAuBK,SAAA,UAAmBgB,KAAA,EAAO;IACnFK,WAAA,GAAcvC,cAAA,CAAe;MAC3BsB,UAAA;MACAqB,IAAA,EAAM,YAAY9B,UAAA;IACpB;EACF;EAEA,MAAM+B,aAAA,GAAgBvC,WAAA,CAAY;IAChCyB,aAAA,CAAc;IAEd,MAAMe,GAAA,GAAM,MAAM5C,QAAA,CAAS6C,IAAI,CAACR,QAAA,EAAU;MACxCS,OAAA,EAAS;QACP,mBAAmBf,IAAA,CAAKgB;MAC1B;IACF;IAEA,IAAIH,GAAA,CAAI7B,MAAM,KAAK,KAAK;MACtB,MAAMiC,IAAA,GAAO,MAAMJ,GAAA,CAAII,IAAI;MAC3B1C,KAAA,CAAM2C,OAAO,CAACD,IAAA,CAAKE,OAAO;MAC1Bf,oBAAA,CAAqB,MAAML,MAAA,CAAOqB,IAAI,CAACb,WAAA;IACzC,OAAO;MACLhC,KAAA,CAAM8C,KAAK,CAACpB,CAAA,CAAE;IAChB;EACF,GAAG,CAACK,QAAA,EAAUC,WAAA,EAAaN,CAAA,EAAGD,IAAA,EAAMD,MAAA,EAAQK,oBAAA,CAAqB;EAEjE,oBACEkB,KAAA,CAAClD,QAAA;4BACCmD,IAAA,CAAC;MAAI5C,SAAA,EAAW,CAACH,SAAA,EAAWG,SAAA,CAAU,CAAC6C,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;gBAC1D,aAAAH,IAAA,CAAC9D,MAAA;QACCkE,WAAA,EAAY;QACZhD,SAAA,EAAW,CAAC6B,iBAAA,IAAqB,GAAGhC,SAAA,UAAmB,CAAC,CAACgD,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;QAC9EE,OAAA,EAASA,CAAA,KAAMhC,WAAA,CAAYnB,SAAA;QAC3BoD,IAAA,EAAK;QACLC,mBAAA,EACEtB,iBAAA,GACI,mBACEe,IAAA,CAAC5D,SAAA,CAAUoE,WAAW;oBACpB,aAAAR,IAAA,CAAC5D,SAAA,CAAUF,MAAM;YAACmE,OAAA,EAASA,CAAA,KAAM,CAACzB,QAAA,CAAS,OAAOP,WAAA,CAAYnB,SAAA,EAAW;sBACtEwB,CAAA,CAAE;;aAIT;kBAGLA,CAAA,CAAE;;qBAGPsB,IAAA,CAAC7D,KAAA;MAAMiB,SAAA,EAAW,GAAGH,SAAA,SAAkB;MAAEwD,IAAA,EAAMvD,SAAA;gBAC7C,aAAA6C,KAAA,CAAC;QAAI3C,SAAA,EAAW,GAAGH,SAAA,WAAoB;gCACrC8C,KAAA,CAAC;UAAI3C,SAAA,EAAW,GAAGH,SAAA,WAAoB;kCACrC+C,IAAA,CAAC;sBAAItB,CAAA,CAAE;2BACPsB,IAAA,CAAC;sBAAGlB;;yBAENiB,KAAA,CAAC;UAAI3C,SAAA,EAAW,GAAGH,SAAA,YAAqB;kCACtC+C,IAAA,CAAC9D,MAAA;YACCkE,WAAA,EAAY;YACZC,OAAA,EAAS/B,UAAA,GAAaoC,SAAA,GAAY,MAAMrC,WAAA,CAAYnB,SAAA;YACpDoD,IAAA,EAAK;YACLK,IAAA,EAAK;sBAEJjC,CAAA,CAAE;2BAELsB,IAAA,CAAC9D,MAAA;YAAOmE,OAAA,EAAS/B,UAAA,GAAaoC,SAAA,GAAY,MAAM,KAAKrB,aAAA;sBAClDf,UAAA,GAAaI,CAAA,CAAE,uBAAuBA,CAAA,CAAE;;;;;;AAOvD;AAEA,eAAevB,OAAA","ignoreList":[]}

package/dist/views/Version/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Version/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iBAAiB,EAEjB,2BAA2B,EAG5B,MAAM,SAAS,CAAA;AAYhB,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,iBAAiB,CA6OtE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Version/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iBAAiB,EAEjB,2BAA2B,EAG5B,MAAM,SAAS,CAAA;AAYhB,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,iBAAiB,CA8OtE,CAAA"}

package/dist/views/Version/index.js

@@ -211,6 +211,7 @@ export const VersionView = async props => {
     i18n,
     modifiedOnly,
     parentIndexPath: '',
+    parentIsLocalized: false,
     parentPath: '',
     parentSchemaPath: '',
     req,

package/dist/views/Version/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getClientConfig","getClientSchemaMap","getSchemaMap","notFound","React","getLatestVersion","DefaultVersionView","RenderDiff","VersionView","props","i18n","initPageResult","routeSegments","searchParams","collectionConfig","docID","id","globalConfig","permissions","req","payload","config","user","versionID","length","collectionSlug","slug","globalSlug","localeCodesFromParams","localeCodes","JSON","parse","comparisonVersionIDFromParams","compareValue","modifiedOnly","localization","docPermissions","doc","latestPublishedVersion","latestDraftVersion","collections","findVersionByID","collection","depth","locale","overrideAccess","versions","drafts","type","parentID","status","error","globals","findGlobalVersionByID","publishedNewerThanDraft","updatedAt","selectedLocales","code","locales","find","push","label","value","latestVersion","comparisonDoc","schemaMap","clientSchemaMap","importMap","RenderedDiff","comparisonSiblingData","version","customDiffComponents","entitySlug","fieldPermissions","fields","parentIndexPath","parentPath","parentSchemaPath","map","versionSiblingData","createdAt","_jsx","canUpdate","update"],"sources":["../../../src/views/Version/index.tsx"],"sourcesContent":["import type {\n  Document,\n  EditViewComponent,\n  OptionObject,\n  PayloadServerReactComponent,\n  SanitizedCollectionPermission,\n  SanitizedGlobalPermission,\n} from 'payload'\n\nimport { getClientConfig } from '@payloadcms/ui/utilities/getClientConfig'\nimport { getClientSchemaMap } from '@payloadcms/ui/utilities/getClientSchemaMap'\nimport { getSchemaMap } from '@payloadcms/ui/utilities/getSchemaMap'\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { getLatestVersion } from '../Versions/getLatestVersion.js'\nimport { DefaultVersionView } from './Default/index.js'\nimport { RenderDiff } from './RenderFieldsToDiff/index.js'\n\nexport const VersionView: PayloadServerReactComponent<EditViewComponent> = async (props) => {\n  const { i18n, initPageResult, routeSegments, searchParams } = props\n\n  const {\n    collectionConfig,\n    docID: id,\n    globalConfig,\n    permissions,\n    req,\n    req: { payload, payload: { config } = {}, user } = {},\n  } = initPageResult\n\n  const versionID = routeSegments[routeSegments.length - 1]\n\n  const collectionSlug = collectionConfig?.slug\n  const globalSlug = globalConfig?.slug\n\n  const localeCodesFromParams = searchParams.localeCodes\n    ? JSON.parse(searchParams.localeCodes as string)\n    : null\n  const comparisonVersionIDFromParams: string = searchParams.compareValue as string\n\n  const modifiedOnly: boolean = searchParams.modifiedOnly === 'true'\n\n  const { localization } = config\n\n  let docPermissions: SanitizedCollectionPermission | SanitizedGlobalPermission\n  let slug: string\n\n  let doc: Document\n  let latestPublishedVersion = null\n  let latestDraftVersion = null\n\n  if (collectionSlug) {\n    // /collections/:slug/:id/versions/:versionID\n    slug = collectionSlug\n    docPermissions = permissions.collections[collectionSlug]\n\n    try {\n      doc = await payload.findVersionByID({\n        id: versionID,\n        collection: slug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (collectionConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion({\n          slug,\n          type: 'collection',\n          locale: 'all',\n          overrideAccess: false,\n          parentID: id,\n          payload,\n          req,\n          status: 'draft',\n        })\n        latestPublishedVersion = await getLatestVersion({\n          slug,\n          type: 'collection',\n          locale: 'all',\n          overrideAccess: false,\n          parentID: id,\n          payload,\n          req,\n          status: 'published',\n        })\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  if (globalSlug) {\n    // /globals/:slug/versions/:versionID\n    slug = globalSlug\n    docPermissions = permissions.globals[globalSlug]\n\n    try {\n      doc = await payload.findGlobalVersionByID({\n        id: versionID,\n        slug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (globalConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion({\n          slug,\n          type: 'global',\n          locale: 'all',\n          overrideAccess: false,\n          payload,\n          req,\n          status: 'draft',\n        })\n        latestPublishedVersion = await getLatestVersion({\n          slug,\n          type: 'global',\n          locale: 'all',\n          overrideAccess: false,\n          payload,\n          req,\n          status: 'published',\n        })\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  const publishedNewerThanDraft = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n\n  if (publishedNewerThanDraft) {\n    latestDraftVersion = {\n      id: '',\n      updatedAt: '',\n    }\n  }\n\n  const selectedLocales: OptionObject[] = []\n  if (localization) {\n    if (localeCodesFromParams) {\n      for (const code of localeCodesFromParams) {\n        const locale = localization.locales.find((locale) => locale.code === code)\n        if (locale) {\n          selectedLocales.push({\n            label: locale.label,\n            value: locale.code,\n          })\n        }\n      }\n    } else {\n      for (const { code, label } of localization.locales) {\n        selectedLocales.push({\n          label,\n          value: code,\n        })\n      }\n    }\n  }\n\n  const latestVersion =\n    latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n      ? latestPublishedVersion\n      : latestDraftVersion\n\n  if (!doc) {\n    return notFound()\n  }\n\n  /**\n   * The doc to compare this version to is either the latest version, or a specific version if specified in the URL.\n   * This specific version is added to the URL when a user selects a version to compare to.\n   */\n  let comparisonDoc = null\n  if (comparisonVersionIDFromParams) {\n    if (collectionSlug) {\n      comparisonDoc = await payload.findVersionByID({\n        id: comparisonVersionIDFromParams,\n        collection: collectionSlug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n      })\n    } else {\n      comparisonDoc = await payload.findGlobalVersionByID({\n        id: comparisonVersionIDFromParams,\n        slug: globalSlug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n      })\n    }\n  } else {\n    comparisonDoc = latestVersion\n  }\n\n  const schemaMap = getSchemaMap({\n    collectionSlug,\n    config,\n    globalSlug,\n    i18n,\n  })\n\n  const clientSchemaMap = getClientSchemaMap({\n    collectionSlug,\n    config: getClientConfig({ config: payload.config, i18n, importMap: payload.importMap }),\n    globalSlug,\n    i18n,\n    payload,\n    schemaMap,\n  })\n\n  const RenderedDiff = RenderDiff({\n    clientSchemaMap,\n    comparisonSiblingData: comparisonDoc?.version,\n    customDiffComponents: {},\n    entitySlug: collectionSlug || globalSlug,\n    fieldPermissions: docPermissions?.fields,\n    fields: (collectionConfig || globalConfig)?.fields,\n    i18n,\n    modifiedOnly,\n    parentIndexPath: '',\n    parentPath: '',\n    parentSchemaPath: '',\n    req,\n    selectedLocales: selectedLocales && selectedLocales.map((locale) => locale.value),\n    versionSiblingData: globalConfig\n      ? {\n          ...doc?.version,\n          createdAt: doc?.version?.createdAt || doc.createdAt,\n          updatedAt: doc?.version?.updatedAt || doc.updatedAt,\n        }\n      : doc?.version,\n  })\n\n  return (\n    <DefaultVersionView\n      canUpdate={docPermissions?.update}\n      doc={doc}\n      latestDraftVersion={latestDraftVersion?.id}\n      latestPublishedVersion={latestPublishedVersion?.id}\n      modifiedOnly={modifiedOnly}\n      RenderedDiff={RenderedDiff}\n      selectedLocales={selectedLocales}\n      versionID={versionID}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getClientConfig","getClientSchemaMap","getSchemaMap","notFound","React","getLatestVersion","DefaultVersionView","RenderDiff","VersionView","props","i18n","initPageResult","routeSegments","searchParams","collectionConfig","docID","id","globalConfig","permissions","req","payload","config","user","versionID","length","collectionSlug","slug","globalSlug","localeCodesFromParams","localeCodes","JSON","parse","comparisonVersionIDFromParams","compareValue","modifiedOnly","localization","docPermissions","doc","latestPublishedVersion","latestDraftVersion","collections","findVersionByID","collection","depth","locale","overrideAccess","versions","drafts","type","parentID","status","error","globals","findGlobalVersionByID","publishedNewerThanDraft","updatedAt","selectedLocales","code","locales","find","push","label","value","latestVersion","comparisonDoc","schemaMap","clientSchemaMap","importMap","RenderedDiff","comparisonSiblingData","version","customDiffComponents","entitySlug","fieldPermissions","fields","parentIndexPath","parentIsLocalized","parentPath","parentSchemaPath","map","versionSiblingData","createdAt","_jsx","canUpdate","update"],"sources":["../../../src/views/Version/index.tsx"],"sourcesContent":["import type {\n  Document,\n  EditViewComponent,\n  OptionObject,\n  PayloadServerReactComponent,\n  SanitizedCollectionPermission,\n  SanitizedGlobalPermission,\n} from 'payload'\n\nimport { getClientConfig } from '@payloadcms/ui/utilities/getClientConfig'\nimport { getClientSchemaMap } from '@payloadcms/ui/utilities/getClientSchemaMap'\nimport { getSchemaMap } from '@payloadcms/ui/utilities/getSchemaMap'\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { getLatestVersion } from '../Versions/getLatestVersion.js'\nimport { DefaultVersionView } from './Default/index.js'\nimport { RenderDiff } from './RenderFieldsToDiff/index.js'\n\nexport const VersionView: PayloadServerReactComponent<EditViewComponent> = async (props) => {\n  const { i18n, initPageResult, routeSegments, searchParams } = props\n\n  const {\n    collectionConfig,\n    docID: id,\n    globalConfig,\n    permissions,\n    req,\n    req: { payload, payload: { config } = {}, user } = {},\n  } = initPageResult\n\n  const versionID = routeSegments[routeSegments.length - 1]\n\n  const collectionSlug = collectionConfig?.slug\n  const globalSlug = globalConfig?.slug\n\n  const localeCodesFromParams = searchParams.localeCodes\n    ? JSON.parse(searchParams.localeCodes as string)\n    : null\n  const comparisonVersionIDFromParams: string = searchParams.compareValue as string\n\n  const modifiedOnly: boolean = searchParams.modifiedOnly === 'true'\n\n  const { localization } = config\n\n  let docPermissions: SanitizedCollectionPermission | SanitizedGlobalPermission\n  let slug: string\n\n  let doc: Document\n  let latestPublishedVersion = null\n  let latestDraftVersion = null\n\n  if (collectionSlug) {\n    // /collections/:slug/:id/versions/:versionID\n    slug = collectionSlug\n    docPermissions = permissions.collections[collectionSlug]\n\n    try {\n      doc = await payload.findVersionByID({\n        id: versionID,\n        collection: slug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (collectionConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion({\n          slug,\n          type: 'collection',\n          locale: 'all',\n          overrideAccess: false,\n          parentID: id,\n          payload,\n          req,\n          status: 'draft',\n        })\n        latestPublishedVersion = await getLatestVersion({\n          slug,\n          type: 'collection',\n          locale: 'all',\n          overrideAccess: false,\n          parentID: id,\n          payload,\n          req,\n          status: 'published',\n        })\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  if (globalSlug) {\n    // /globals/:slug/versions/:versionID\n    slug = globalSlug\n    docPermissions = permissions.globals[globalSlug]\n\n    try {\n      doc = await payload.findGlobalVersionByID({\n        id: versionID,\n        slug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (globalConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion({\n          slug,\n          type: 'global',\n          locale: 'all',\n          overrideAccess: false,\n          payload,\n          req,\n          status: 'draft',\n        })\n        latestPublishedVersion = await getLatestVersion({\n          slug,\n          type: 'global',\n          locale: 'all',\n          overrideAccess: false,\n          payload,\n          req,\n          status: 'published',\n        })\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  const publishedNewerThanDraft = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n\n  if (publishedNewerThanDraft) {\n    latestDraftVersion = {\n      id: '',\n      updatedAt: '',\n    }\n  }\n\n  const selectedLocales: OptionObject[] = []\n  if (localization) {\n    if (localeCodesFromParams) {\n      for (const code of localeCodesFromParams) {\n        const locale = localization.locales.find((locale) => locale.code === code)\n        if (locale) {\n          selectedLocales.push({\n            label: locale.label,\n            value: locale.code,\n          })\n        }\n      }\n    } else {\n      for (const { code, label } of localization.locales) {\n        selectedLocales.push({\n          label,\n          value: code,\n        })\n      }\n    }\n  }\n\n  const latestVersion =\n    latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n      ? latestPublishedVersion\n      : latestDraftVersion\n\n  if (!doc) {\n    return notFound()\n  }\n\n  /**\n   * The doc to compare this version to is either the latest version, or a specific version if specified in the URL.\n   * This specific version is added to the URL when a user selects a version to compare to.\n   */\n  let comparisonDoc = null\n  if (comparisonVersionIDFromParams) {\n    if (collectionSlug) {\n      comparisonDoc = await payload.findVersionByID({\n        id: comparisonVersionIDFromParams,\n        collection: collectionSlug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n      })\n    } else {\n      comparisonDoc = await payload.findGlobalVersionByID({\n        id: comparisonVersionIDFromParams,\n        slug: globalSlug,\n        depth: 0,\n        locale: 'all',\n        overrideAccess: false,\n        req,\n      })\n    }\n  } else {\n    comparisonDoc = latestVersion\n  }\n\n  const schemaMap = getSchemaMap({\n    collectionSlug,\n    config,\n    globalSlug,\n    i18n,\n  })\n\n  const clientSchemaMap = getClientSchemaMap({\n    collectionSlug,\n    config: getClientConfig({ config: payload.config, i18n, importMap: payload.importMap }),\n    globalSlug,\n    i18n,\n    payload,\n    schemaMap,\n  })\n\n  const RenderedDiff = RenderDiff({\n    clientSchemaMap,\n    comparisonSiblingData: comparisonDoc?.version,\n    customDiffComponents: {},\n    entitySlug: collectionSlug || globalSlug,\n    fieldPermissions: docPermissions?.fields,\n    fields: (collectionConfig || globalConfig)?.fields,\n    i18n,\n    modifiedOnly,\n    parentIndexPath: '',\n    parentIsLocalized: false,\n    parentPath: '',\n    parentSchemaPath: '',\n    req,\n    selectedLocales: selectedLocales && selectedLocales.map((locale) => locale.value),\n    versionSiblingData: globalConfig\n      ? {\n          ...doc?.version,\n          createdAt: doc?.version?.createdAt || doc.createdAt,\n          updatedAt: doc?.version?.updatedAt || doc.updatedAt,\n        }\n      : doc?.version,\n  })\n\n  return (\n    <DefaultVersionView\n      canUpdate={docPermissions?.update}\n      doc={doc}\n      latestDraftVersion={latestDraftVersion?.id}\n      latestPublishedVersion={latestPublishedVersion?.id}\n      modifiedOnly={modifiedOnly}\n      RenderedDiff={RenderedDiff}\n      selectedLocales={selectedLocales}\n      versionID={versionID}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Versions/cells/CreatedAt/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/views/Versions/cells/CreatedAt/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,KAAK,kBAAkB,GAAG;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;QACnB,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;KAClC,CAAA;CACF,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoCtD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/views/Versions/cells/CreatedAt/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,KAAK,kBAAkB,GAAG;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;QACnB,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;KAClC,CAAA;CACF,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoCtD,CAAA"}

package/dist/views/Versions/cells/CreatedAt/index.js

@@ -2,11 +2,9 @@
 
 import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useConfig, useTranslation } from '@payloadcms/ui';
+import { Link, useConfig, useTranslation } from '@payloadcms/ui';
 import { formatAdminURL, formatDate } from '@payloadcms/ui/shared';
-import LinkImport from 'next/link.js';
 import React from 'react';
-const Link = LinkImport.default || LinkImport;
 export const CreatedAtCell = t0 => {
   const $ = _c(11);
   const {

package/dist/views/Versions/cells/CreatedAt/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","useConfig","useTranslation","formatAdminURL","formatDate","LinkImport","React","Link","default","CreatedAtCell","t0","$","collectionSlug","docID","globalSlug","rowData","t1","t2","undefined","id","updatedAt","config","t3","admin","t4","routes","t5","dateFormat","adminRoute","i18n","t6","to","_jsx","href","prefetch","children","date","pattern"],"sources":["../../../../../src/views/Versions/cells/CreatedAt/index.tsx"],"sourcesContent":["'use client'\nimport { useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL, formatDate } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\ntype CreatedAtCellProps = {\n  collectionSlug?: string\n  docID?: number | string\n  globalSlug?: string\n  rowData?: {\n    id: number | string\n    updatedAt: Date | number | string\n  }\n}\n\nexport const CreatedAtCell: React.FC<CreatedAtCellProps> = ({\n  collectionSlug,\n  docID,\n  globalSlug,\n  rowData: { id, updatedAt } = {},\n}) => {\n  const {\n    config: {\n      admin: { dateFormat },\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n\n  const { i18n } = useTranslation()\n\n  let to: string\n\n  if (collectionSlug) {\n    to = formatAdminURL({\n      adminRoute,\n      path: `/collections/${collectionSlug}/${docID}/versions/${id}`,\n    })\n  }\n\n  if (globalSlug) {\n    to = formatAdminURL({\n      adminRoute,\n      path: `/globals/${globalSlug}/versions/${id}`,\n    })\n  }\n\n  return (\n    <Link href={to} prefetch={false}>\n      {formatDate({ date: updatedAt, i18n, pattern: dateFormat })}\n    </Link>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,SAASC,SAAS,EAAEC,cAAc,QAAQ;AAC1C,SAASC,cAAc,EAAEC,UAAU,QAAQ;AAC3C,OAAOC,UAAA,MAAgB;AACvB,OAAOC,KAAA,MAAW;AAElB,MAAMC,IAAA,GAAQF,UAAA,CAAWG,OAAO,IAAIH,UAAA;AAYpC,OAAO,MAAMI,aAAA,GAA8CC,EAAA;EAAA,MAAAC,CAAA,GAAAX,EAAA;EAAC;IAAAY,cAAA;IAAAC,KAAA;IAAAC,UAAA;IAAAC,OAAA,EAAAC;EAAA,IAAAN,EAK3D;EAAA,IAAAO,EAAA;EAAA,IAAAN,CAAA,QAAAK,EAAA;IADUC,EAAA,GAAAD,EAAsB,KAAAE,SAAA,QAAtBF,EAAsB;IAAAL,CAAA,MAAAK,EAAA;IAAAL,CAAA,MAAAM,EAAA;EAAA;IAAAA,EAAA,GAAAN,CAAA;EAAA;EAAtB;IAAAQ,EAAA;IAAAC;EAAA,IAAAH,EAAsB;EAE/B;IAAAI,MAAA,EAAAC;EAAA,IAKIrB,SAAA;EAJM;IAAAsB,KAAA,EAAAC,EAAA;IAAAC,MAAA,EAAAC;EAAA,IAAAJ,EAGP;EAFQ;IAAAK;EAAA,IAAAH,EAAc;EACb;IAAAD,KAAA,EAAAK;EAAA,IAAAF,EAAqB;EAIjC;IAAAG;EAAA,IAAiB3B,cAAA;EAAA,IAAA4B,EAAA;EAAA,IAAAnB,CAAA,QAAAiB,UAAA,IAAAjB,CAAA,QAAAC,cAAA,IAAAD,CAAA,QAAAgB,UAAA,IAAAhB,CAAA,QAAAE,KAAA,IAAAF,CAAA,QAAAG,UAAA,IAAAH,CAAA,QAAAkB,IAAA,IAAAlB,CAAA,QAAAQ,EAAA,IAAAR,CAAA,QAAAS,SAAA;IAEbW,GAAA,CAAAA,EAAA;IAAA,IAEAnB,cAAA;MACFmB,EAAA,CAAAA,CAAA,CAAKA;QAAAA;QAAAA,KAAA,CAEGA,gBAAgBnB,cAAA,IAAkBC,KAAA,aAAkBM,EAAA;MAAI,CAChE;IAHA;IAAA,IAMEL,UAAA;MACFiB,EAAA,CAAAA,CAAA,CAAKA;QAAAA;QAAAA,KAAA,CAEGA,YAAYjB,UAAA,aAAuBK,EAAA;MAAI,CAC/C;IAHA;IAOAW,EAAA,GAAAE,IAAA,CAAAzB,IAAA;MAAA0B,IAAA,EAAYF,EAAA;MAAAG,QAAA;MAAAC,QAAA,EACT/B,UAAA;QAAAgC,IAAA,EAAmBhB,SAAA;QAAAS,IAAA;QAAAQ,OAAA,EAA0BV;MAAA,CAAW;IAAA,C;;;;;;;;;;;;;SAD3DG,E;CAIJ","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","Link","useConfig","useTranslation","formatAdminURL","formatDate","React","CreatedAtCell","t0","$","collectionSlug","docID","globalSlug","rowData","t1","t2","undefined","id","updatedAt","config","t3","admin","t4","routes","t5","dateFormat","adminRoute","i18n","t6","to","_jsx","href","prefetch","children","date","pattern"],"sources":["../../../../../src/views/Versions/cells/CreatedAt/index.tsx"],"sourcesContent":["'use client'\nimport { Link, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL, formatDate } from '@payloadcms/ui/shared'\nimport React from 'react'\n\ntype CreatedAtCellProps = {\n  collectionSlug?: string\n  docID?: number | string\n  globalSlug?: string\n  rowData?: {\n    id: number | string\n    updatedAt: Date | number | string\n  }\n}\n\nexport const CreatedAtCell: React.FC<CreatedAtCellProps> = ({\n  collectionSlug,\n  docID,\n  globalSlug,\n  rowData: { id, updatedAt } = {},\n}) => {\n  const {\n    config: {\n      admin: { dateFormat },\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n\n  const { i18n } = useTranslation()\n\n  let to: string\n\n  if (collectionSlug) {\n    to = formatAdminURL({\n      adminRoute,\n      path: `/collections/${collectionSlug}/${docID}/versions/${id}`,\n    })\n  }\n\n  if (globalSlug) {\n    to = formatAdminURL({\n      adminRoute,\n      path: `/globals/${globalSlug}/versions/${id}`,\n    })\n  }\n\n  return (\n    <Link href={to} prefetch={false}>\n      {formatDate({ date: updatedAt, i18n, pattern: dateFormat })}\n    </Link>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,SAASC,IAAI,EAAEC,SAAS,EAAEC,cAAc,QAAQ;AAChD,SAASC,cAAc,EAAEC,UAAU,QAAQ;AAC3C,OAAOC,KAAA,MAAW;AAYlB,OAAO,MAAMC,aAAA,GAA8CC,EAAA;EAAA,MAAAC,CAAA,GAAAT,EAAA;EAAC;IAAAU,cAAA;IAAAC,KAAA;IAAAC,UAAA;IAAAC,OAAA,EAAAC;EAAA,IAAAN,EAK3D;EAAA,IAAAO,EAAA;EAAA,IAAAN,CAAA,QAAAK,EAAA;IADUC,EAAA,GAAAD,EAAsB,KAAAE,SAAA,QAAtBF,EAAsB;IAAAL,CAAA,MAAAK,EAAA;IAAAL,CAAA,MAAAM,EAAA;EAAA;IAAAA,EAAA,GAAAN,CAAA;EAAA;EAAtB;IAAAQ,EAAA;IAAAC;EAAA,IAAAH,EAAsB;EAE/B;IAAAI,MAAA,EAAAC;EAAA,IAKIlB,SAAA;EAJM;IAAAmB,KAAA,EAAAC,EAAA;IAAAC,MAAA,EAAAC;EAAA,IAAAJ,EAGP;EAFQ;IAAAK;EAAA,IAAAH,EAAc;EACb;IAAAD,KAAA,EAAAK;EAAA,IAAAF,EAAqB;EAIjC;IAAAG;EAAA,IAAiBxB,cAAA;EAAA,IAAAyB,EAAA;EAAA,IAAAnB,CAAA,QAAAiB,UAAA,IAAAjB,CAAA,QAAAC,cAAA,IAAAD,CAAA,QAAAgB,UAAA,IAAAhB,CAAA,QAAAE,KAAA,IAAAF,CAAA,QAAAG,UAAA,IAAAH,CAAA,QAAAkB,IAAA,IAAAlB,CAAA,QAAAQ,EAAA,IAAAR,CAAA,QAAAS,SAAA;IAEbW,GAAA,CAAAA,EAAA;IAAA,IAEAnB,cAAA;MACFmB,EAAA,CAAAA,CAAA,CAAKA;QAAAA;QAAAA,KAAA,CAEGA,gBAAgBnB,cAAA,IAAkBC,KAAA,aAAkBM,EAAA;MAAI,CAChE;IAHA;IAAA,IAMEL,UAAA;MACFiB,EAAA,CAAAA,CAAA,CAAKA;QAAAA;QAAAA,KAAA,CAEGA,YAAYjB,UAAA,aAAuBK,EAAA;MAAI,CAC/C;IAHA;IAOAW,EAAA,GAAAE,IAAA,CAAA7B,IAAA;MAAA8B,IAAA,EAAYF,EAAA;MAAAG,QAAA;MAAAC,QAAA,EACT5B,UAAA;QAAA6B,IAAA,EAAmBhB,SAAA;QAAAS,IAAA;QAAAQ,OAAA,EAA0BV;MAAA,CAAW;IAAA,C;;;;;;;;;;;;;SAD3DG,E;CAIJ","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.24.0-canary.72057b1",
+  "version": "3.24.0-canary.7d9fbaf",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -80,9 +80,9 @@
     "sass": "1.77.4",
     "sonner": "^1.7.0",
     "uuid": "10.0.0",
-    "@payloadcms/graphql": "3.24.0-canary.72057b1",
-    "@payloadcms/translations": "3.24.0-canary.72057b1",
-    "@payloadcms/ui": "3.24.0-canary.72057b1"
+    "@payloadcms/graphql": "3.24.0-canary.7d9fbaf",
+    "@payloadcms/translations": "3.24.0-canary.7d9fbaf",
+    "@payloadcms/ui": "3.24.0-canary.7d9fbaf"
   },
   "devDependencies": {
     "@babel/cli": "7.26.4",
@@ -101,12 +101,12 @@
     "eslint-plugin-react-compiler": "19.0.0-beta-714736e-20250131",
     "swc-plugin-transform-remove-imports": "3.1.0",
     "@payloadcms/eslint-config": "3.9.0",
-    "payload": "3.24.0-canary.72057b1"
+    "payload": "3.24.0-canary.7d9fbaf"
   },
   "peerDependencies": {
     "graphql": "^16.8.1",
     "next": "^15.0.0",
-    "payload": "3.24.0-canary.72057b1"
+    "payload": "3.24.0-canary.7d9fbaf"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"