@payloadcms/next 3.0.0-canary.ca3dd1c → 3.0.0-canary.cb7fa00

package/dist/views/Version/RenderFieldsToDiff/fields/types.d.ts

@@ -1,21 +1,20 @@
 import type { I18nClient } from '@payloadcms/translations';
-import type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap';
-import type { FieldPermissions } from 'payload';
+import type { ClientField, FieldPermissions } from 'payload';
 import type React from 'react';
 import type { DiffMethod } from 'react-diff-viewer-continued';
-export type DiffComponents = Record<string, React.FC<Props>>;
-export type Props = {
-    comparison: any;
-    diffComponents: DiffComponents;
-    diffMethod?: DiffMethod;
-    disableGutter?: boolean;
-    field: MappedField;
-    fieldMap: FieldMap;
-    i18n: I18nClient;
-    isRichText?: boolean;
-    locale?: string;
-    locales?: string[];
-    permissions?: Record<string, FieldPermissions>;
-    version: any;
+export type DiffComponents = Record<string, React.FC<DiffComponentProps>>;
+export type DiffComponentProps<TField extends ClientField = ClientField> = {
+    readonly comparison: any;
+    readonly diffComponents: DiffComponents;
+    readonly diffMethod?: DiffMethod;
+    readonly disableGutter?: boolean;
+    readonly field: TField;
+    readonly fields: ClientField[];
+    readonly i18n: I18nClient;
+    readonly isRichText?: boolean;
+    readonly locale?: string;
+    readonly locales?: string[];
+    readonly permissions?: Record<string, FieldPermissions>;
+    readonly version: any;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/views/Version/RenderFieldsToDiff/fields/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/fields/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE7D,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;AAE5D,MAAM,MAAM,KAAK,GAAG;IAClB,UAAU,EAAE,GAAG,CAAA;IACf,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;IAClB,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC9C,OAAO,EAAE,GAAG,CAAA;CACb,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/fields/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC5D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE7D,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;AAEzE,MAAM,MAAM,kBAAkB,CAAC,MAAM,SAAS,WAAW,GAAG,WAAW,IAAI;IACzE,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAA;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAA;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAA;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IACvD,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAA;CACtB,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/fields/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/views/Version/RenderFieldsToDiff/fields/types.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap'\nimport type { FieldPermissions } from 'payload'\nimport type React from 'react'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nexport type DiffComponents = Record<string, React.FC<Props>>\n\nexport type Props = {\n  comparison: any\n  diffComponents: DiffComponents\n  diffMethod?: DiffMethod\n  disableGutter?: boolean\n  field: MappedField\n  fieldMap: FieldMap\n  i18n: I18nClient\n  isRichText?: boolean\n  locale?: string\n  locales?: string[]\n  permissions?: Record<string, FieldPermissions>\n  version: any\n}\n"],"names":[],"mappings":"AAQA,WAaC"}
+{"version":3,"sources":["../../../../../src/views/Version/RenderFieldsToDiff/fields/types.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { ClientField, FieldPermissions } from 'payload'\nimport type React from 'react'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nexport type DiffComponents = Record<string, React.FC<DiffComponentProps>>\n\nexport type DiffComponentProps<TField extends ClientField = ClientField> = {\n  readonly comparison: any\n  readonly diffComponents: DiffComponents\n  readonly diffMethod?: DiffMethod\n  readonly disableGutter?: boolean\n  readonly field: TField\n  readonly fields: ClientField[]\n  readonly i18n: I18nClient\n  readonly isRichText?: boolean\n  readonly locale?: string\n  readonly locales?: string[]\n  readonly permissions?: Record<string, FieldPermissions>\n  readonly version: any\n}\n"],"names":[],"mappings":"AAOA,WAaC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAIvD,OAAO,cAAc,CAAA;AAIrB,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8HvC,CAAA;AAED,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAIvD,OAAO,cAAc,CAAA;AAIrB,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8HvC,CAAA;AAED,eAAe,kBAAkB,CAAA"}

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

@@ -1,19 +1,23 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { fieldAffectsData } from 'payload/shared';
 import React from 'react';
 import Nested from './fields/Nested/index.js';
 import { diffMethods } from './fields/diffMethods.js';
 const baseClass = 'render-field-diffs';
-const RenderFieldsToDiff = ({ comparison, diffComponents, fieldMap, fieldPermissions, i18n, locales, version })=>{
+const RenderFieldsToDiff = ({ comparison, diffComponents: __diffComponents, fieldPermissions, fields, i18n, locales, version })=>{
+    // typing it as `as typeof _diffComponents` here ensures the TField generics of DiffComponentProps are respected.
+    // Without it, you could pass a UI field to the Tabs component, without it erroring
+    const diffComponents = __diffComponents;
     return /*#__PURE__*/ _jsx("div", {
         className: baseClass,
-        children: fieldMap?.map((field, i)=>{
+        children: fields?.map((field, i)=>{
             if ('name' in field && field.name === 'id') return null;
             const Component = diffComponents[field.type];
             const isRichText = field.type === 'richText';
             const diffMethod = diffMethods[field.type] || 'CHARS';
             if (Component) {
-                if (field.isFieldAffectingData && 'name' in field) {
+                if (fieldAffectsData(field)) {
                     const fieldName = field.name;
                     const valueIsObject = field.type === 'code' || field.type === 'json';
                     const versionValue = valueIsObject ? JSON.stringify(version?.[fieldName]) : version?.[fieldName];
@@ -26,8 +30,8 @@ const RenderFieldsToDiff = ({ comparison, diffComponents, fieldMap, fieldPermiss
                         diffComponents,
                         diffMethod,
                         field,
-                        fieldMap: 'fieldMap' in field.fieldComponentProps ? field.fieldComponentProps?.fieldMap : fieldMap,
                         fieldPermissions: subFieldPermissions,
+                        fields: 'fields' in field ? field?.fields : fields,
                         i18n,
                         isRichText,
                         locales,
@@ -67,26 +71,26 @@ const RenderFieldsToDiff = ({ comparison, diffComponents, fieldMap, fieldPermiss
                         })
                     }, i);
                 }
-                if (field.type === 'tabs' && 'fieldMap' in field.fieldComponentProps) {
+                if (field.type === 'tabs' && 'fields' in field) {
                     const Tabs = diffComponents.tabs;
                     return /*#__PURE__*/ _jsx(Tabs, {
                         comparison: comparison,
                         diffComponents: diffComponents,
                         field: field,
-                        fieldMap: field.fieldComponentProps.fieldMap,
+                        fields: [],
                         i18n: i18n,
                         locales: locales,
                         version: version
                     }, i);
                 }
                 // At this point, we are dealing with a `row`, etc
-                if ('fieldMap' in field.fieldComponentProps) {
+                if ('fields' in field) {
                     return /*#__PURE__*/ _jsx(Nested, {
                         comparison: comparison,
                         diffComponents: diffComponents,
                         disableGutter: true,
                         field: field,
-                        fieldMap: field.fieldComponentProps.fieldMap,
+                        fields: field.fields,
                         i18n: i18n,
                         locales: locales,
                         permissions: fieldPermissions,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/RenderFieldsToDiff/index.tsx"],"sourcesContent":["'use client'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nimport React from 'react'\n\nimport type { FieldDiffProps, Props } from './types.js'\n\nimport Nested from './fields/Nested/index.js'\nimport { diffMethods } from './fields/diffMethods.js'\nimport './index.scss'\n\nconst baseClass = 'render-field-diffs'\n\nconst RenderFieldsToDiff: React.FC<Props> = ({\n  comparison,\n  diffComponents,\n  fieldMap,\n  fieldPermissions,\n  i18n,\n  locales,\n  version,\n}) => {\n  return (\n    <div className={baseClass}>\n      {fieldMap?.map((field, i) => {\n        if ('name' in field && field.name === 'id') return null\n\n        const Component = diffComponents[field.type]\n\n        const isRichText = field.type === 'richText'\n        const diffMethod: DiffMethod = diffMethods[field.type] || 'CHARS'\n\n        if (Component) {\n          if (field.isFieldAffectingData && 'name' in field) {\n            const fieldName = field.name\n            const valueIsObject = field.type === 'code' || field.type === 'json'\n\n            const versionValue = valueIsObject\n              ? JSON.stringify(version?.[fieldName])\n              : version?.[fieldName]\n\n            const comparisonValue = valueIsObject\n              ? JSON.stringify(comparison?.[fieldName])\n              : comparison?.[fieldName]\n\n            const hasPermission = fieldPermissions?.[fieldName]?.read?.permission\n\n            const subFieldPermissions = fieldPermissions?.[fieldName]?.fields\n\n            if (hasPermission === false) return null\n\n            const baseCellProps: FieldDiffProps = {\n              comparison: comparisonValue,\n              diffComponents,\n              diffMethod,\n              field,\n              fieldMap:\n                'fieldMap' in field.fieldComponentProps\n                  ? field.fieldComponentProps?.fieldMap\n                  : fieldMap,\n              fieldPermissions: subFieldPermissions,\n              i18n,\n              isRichText,\n              locales,\n              version: versionValue,\n            }\n\n            if (field.localized) {\n              return (\n                <div className={`${baseClass}__field`} key={i}>\n                  {locales.map((locale, index) => {\n                    const versionLocaleValue = versionValue?.[locale]\n                    const comparisonLocaleValue = comparisonValue?.[locale]\n\n                    const cellProps = {\n                      ...baseCellProps,\n                      comparison: comparisonLocaleValue,\n                      version: versionLocaleValue,\n                    }\n\n                    return (\n                      <div className={`${baseClass}__locale`} key={[locale, index].join('-')}>\n                        <div className={`${baseClass}__locale-value`}>\n                          <Component {...cellProps} locale={locale} />\n                        </div>\n                      </div>\n                    )\n                  })}\n                </div>\n              )\n            }\n\n            return (\n              <div className={`${baseClass}__field`} key={i}>\n                <Component {...baseCellProps} />\n              </div>\n            )\n          }\n\n          if (field.type === 'tabs' && 'fieldMap' in field.fieldComponentProps) {\n            const Tabs = diffComponents.tabs\n\n            return (\n              <Tabs\n                comparison={comparison}\n                diffComponents={diffComponents}\n                field={field}\n                fieldMap={field.fieldComponentProps.fieldMap}\n                i18n={i18n}\n                key={i}\n                locales={locales}\n                version={version}\n              />\n            )\n          }\n\n          // At this point, we are dealing with a `row`, etc\n          if ('fieldMap' in field.fieldComponentProps) {\n            return (\n              <Nested\n                comparison={comparison}\n                diffComponents={diffComponents}\n                disableGutter\n                field={field}\n                fieldMap={field.fieldComponentProps.fieldMap}\n                i18n={i18n}\n                key={i}\n                locales={locales}\n                permissions={fieldPermissions}\n                version={version}\n              />\n            )\n          }\n        }\n\n        return null\n      })}\n    </div>\n  )\n}\n\nexport default RenderFieldsToDiff\n"],"names":["React","Nested","diffMethods","baseClass","RenderFieldsToDiff","comparison","diffComponents","fieldMap","fieldPermissions","i18n","locales","version","div","className","map","field","i","name","Component","type","isRichText","diffMethod","isFieldAffectingData","fieldName","valueIsObject","versionValue","JSON","stringify","comparisonValue","hasPermission","read","permission","subFieldPermissions","fields","baseCellProps","fieldComponentProps","localized","locale","index","versionLocaleValue","comparisonLocaleValue","cellProps","join","Tabs","tabs","disableGutter","permissions"],"mappings":"AAAA;;AAGA,OAAOA,WAAW,QAAO;AAIzB,OAAOC,YAAY,2BAA0B;AAC7C,SAASC,WAAW,QAAQ,0BAAyB;AAGrD,MAAMC,YAAY;AAElB,MAAMC,qBAAsC,CAAC,EAC3CC,UAAU,EACVC,cAAc,EACdC,QAAQ,EACRC,gBAAgB,EAChBC,IAAI,EACJC,OAAO,EACPC,OAAO,EACR;IACC,qBACE,KAACC;QAAIC,WAAWV;kBACbI,UAAUO,IAAI,CAACC,OAAOC;YACrB,IAAI,UAAUD,SAASA,MAAME,IAAI,KAAK,MAAM,OAAO;YAEnD,MAAMC,YAAYZ,cAAc,CAACS,MAAMI,IAAI,CAAC;YAE5C,MAAMC,aAAaL,MAAMI,IAAI,KAAK;YAClC,MAAME,aAAyBnB,WAAW,CAACa,MAAMI,IAAI,CAAC,IAAI;YAE1D,IAAID,WAAW;gBACb,IAAIH,MAAMO,oBAAoB,IAAI,UAAUP,OAAO;oBACjD,MAAMQ,YAAYR,MAAME,IAAI;oBAC5B,MAAMO,gBAAgBT,MAAMI,IAAI,KAAK,UAAUJ,MAAMI,IAAI,KAAK;oBAE9D,MAAMM,eAAeD,gBACjBE,KAAKC,SAAS,CAAChB,SAAS,CAACY,UAAU,IACnCZ,SAAS,CAACY,UAAU;oBAExB,MAAMK,kBAAkBJ,gBACpBE,KAAKC,SAAS,CAACtB,YAAY,CAACkB,UAAU,IACtClB,YAAY,CAACkB,UAAU;oBAE3B,MAAMM,gBAAgBrB,kBAAkB,CAACe,UAAU,EAAEO,MAAMC;oBAE3D,MAAMC,sBAAsBxB,kBAAkB,CAACe,UAAU,EAAEU;oBAE3D,IAAIJ,kBAAkB,OAAO,OAAO;oBAEpC,MAAMK,gBAAgC;wBACpC7B,YAAYuB;wBACZtB;wBACAe;wBACAN;wBACAR,UACE,cAAcQ,MAAMoB,mBAAmB,GACnCpB,MAAMoB,mBAAmB,EAAE5B,WAC3BA;wBACNC,kBAAkBwB;wBAClBvB;wBACAW;wBACAV;wBACAC,SAASc;oBACX;oBAEA,IAAIV,MAAMqB,SAAS,EAAE;wBACnB,qBACE,KAACxB;4BAAIC,WAAW,CAAC,EAAEV,UAAU,OAAO,CAAC;sCAClCO,QAAQI,GAAG,CAAC,CAACuB,QAAQC;gCACpB,MAAMC,qBAAqBd,cAAc,CAACY,OAAO;gCACjD,MAAMG,wBAAwBZ,iBAAiB,CAACS,OAAO;gCAEvD,MAAMI,YAAY;oCAChB,GAAGP,aAAa;oCAChB7B,YAAYmC;oCACZ7B,SAAS4B;gCACX;gCAEA,qBACE,KAAC3B;oCAAIC,WAAW,CAAC,EAAEV,UAAU,QAAQ,CAAC;8CACpC,cAAA,KAACS;wCAAIC,WAAW,CAAC,EAAEV,UAAU,cAAc,CAAC;kDAC1C,cAAA,KAACe;4CAAW,GAAGuB,SAAS;4CAAEJ,QAAQA;;;mCAFO;oCAACA;oCAAQC;iCAAM,CAACI,IAAI,CAAC;4BAMtE;2BAlB0C1B;oBAqBhD;oBAEA,qBACE,KAACJ;wBAAIC,WAAW,CAAC,EAAEV,UAAU,OAAO,CAAC;kCACnC,cAAA,KAACe;4BAAW,GAAGgB,aAAa;;uBADclB;gBAIhD;gBAEA,IAAID,MAAMI,IAAI,KAAK,UAAU,cAAcJ,MAAMoB,mBAAmB,EAAE;oBACpE,MAAMQ,OAAOrC,eAAesC,IAAI;oBAEhC,qBACE,KAACD;wBACCtC,YAAYA;wBACZC,gBAAgBA;wBAChBS,OAAOA;wBACPR,UAAUQ,MAAMoB,mBAAmB,CAAC5B,QAAQ;wBAC5CE,MAAMA;wBAENC,SAASA;wBACTC,SAASA;uBAFJK;gBAKX;gBAEA,kDAAkD;gBAClD,IAAI,cAAcD,MAAMoB,mBAAmB,EAAE;oBAC3C,qBACE,KAAClC;wBACCI,YAAYA;wBACZC,gBAAgBA;wBAChBuC,aAAa;wBACb9B,OAAOA;wBACPR,UAAUQ,MAAMoB,mBAAmB,CAAC5B,QAAQ;wBAC5CE,MAAMA;wBAENC,SAASA;wBACToC,aAAatC;wBACbG,SAASA;uBAHJK;gBAMX;YACF;YAEA,OAAO;QACT;;AAGN;AAEA,eAAeZ,mBAAkB"}
+{"version":3,"sources":["../../../../src/views/Version/RenderFieldsToDiff/index.tsx"],"sourcesContent":["'use client'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nimport { UIFieldClient } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\nimport React from 'react'\n\nimport type { diffComponents as _diffComponents } from './fields/index.js'\nimport type { FieldDiffProps, Props } from './types.js'\n\nimport Nested from './fields/Nested/index.js'\nimport { diffMethods } from './fields/diffMethods.js'\nimport './index.scss'\n\nconst baseClass = 'render-field-diffs'\n\nconst RenderFieldsToDiff: React.FC<Props> = ({\n  comparison,\n  diffComponents: __diffComponents,\n  fieldPermissions,\n  fields,\n  i18n,\n  locales,\n  version,\n}) => {\n  // typing it as `as typeof _diffComponents` here ensures the TField generics of DiffComponentProps are respected.\n  // Without it, you could pass a UI field to the Tabs component, without it erroring\n  const diffComponents: typeof _diffComponents = __diffComponents as typeof _diffComponents\n  return (\n    <div className={baseClass}>\n      {fields?.map((field, i) => {\n        if ('name' in field && field.name === 'id') return null\n\n        const Component = diffComponents[field.type]\n\n        const isRichText = field.type === 'richText'\n        const diffMethod: DiffMethod = diffMethods[field.type] || 'CHARS'\n\n        if (Component) {\n          if (fieldAffectsData(field)) {\n            const fieldName = field.name\n            const valueIsObject = field.type === 'code' || field.type === 'json'\n\n            const versionValue = valueIsObject\n              ? JSON.stringify(version?.[fieldName])\n              : version?.[fieldName]\n\n            const comparisonValue = valueIsObject\n              ? JSON.stringify(comparison?.[fieldName])\n              : comparison?.[fieldName]\n\n            const hasPermission = fieldPermissions?.[fieldName]?.read?.permission\n\n            const subFieldPermissions = fieldPermissions?.[fieldName]?.fields\n\n            if (hasPermission === false) return null\n\n            const baseCellProps: FieldDiffProps = {\n              comparison: comparisonValue,\n              diffComponents,\n              diffMethod,\n              field,\n              fieldPermissions: subFieldPermissions,\n              fields: 'fields' in field ? field?.fields : fields,\n              i18n,\n              isRichText,\n              locales,\n              version: versionValue,\n            }\n\n            if (field.localized) {\n              return (\n                <div className={`${baseClass}__field`} key={i}>\n                  {locales.map((locale, index) => {\n                    const versionLocaleValue = versionValue?.[locale]\n                    const comparisonLocaleValue = comparisonValue?.[locale]\n\n                    const cellProps = {\n                      ...baseCellProps,\n                      comparison: comparisonLocaleValue,\n                      version: versionLocaleValue,\n                    }\n\n                    return (\n                      <div className={`${baseClass}__locale`} key={[locale, index].join('-')}>\n                        <div className={`${baseClass}__locale-value`}>\n                          <Component {...cellProps} locale={locale} />\n                        </div>\n                      </div>\n                    )\n                  })}\n                </div>\n              )\n            }\n\n            return (\n              <div className={`${baseClass}__field`} key={i}>\n                <Component {...baseCellProps} />\n              </div>\n            )\n          }\n\n          if (field.type === 'tabs' && 'fields' in field) {\n            const Tabs = diffComponents.tabs\n\n            return (\n              <Tabs\n                comparison={comparison}\n                diffComponents={diffComponents}\n                field={field}\n                fields={[]}\n                i18n={i18n}\n                key={i}\n                locales={locales}\n                version={version}\n              />\n            )\n          }\n\n          // At this point, we are dealing with a `row`, etc\n          if ('fields' in field) {\n            return (\n              <Nested\n                comparison={comparison}\n                diffComponents={diffComponents}\n                disableGutter\n                field={field}\n                fields={field.fields}\n                i18n={i18n}\n                key={i}\n                locales={locales}\n                permissions={fieldPermissions}\n                version={version}\n              />\n            )\n          }\n        }\n\n        return null\n      })}\n    </div>\n  )\n}\n\nexport default RenderFieldsToDiff\n"],"names":["fieldAffectsData","React","Nested","diffMethods","baseClass","RenderFieldsToDiff","comparison","diffComponents","__diffComponents","fieldPermissions","fields","i18n","locales","version","div","className","map","field","i","name","Component","type","isRichText","diffMethod","fieldName","valueIsObject","versionValue","JSON","stringify","comparisonValue","hasPermission","read","permission","subFieldPermissions","baseCellProps","localized","locale","index","versionLocaleValue","comparisonLocaleValue","cellProps","join","Tabs","tabs","disableGutter","permissions"],"mappings":"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"}

package/dist/views/Version/RenderFieldsToDiff/types.d.ts

@@ -1,20 +1,19 @@
 import type { I18nClient } from '@payloadcms/translations';
-import type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap';
-import type { FieldPermissions } from 'payload';
+import type { ClientField, FieldPermissions } from 'payload';
 import type { DiffMethod } from 'react-diff-viewer-continued';
 import type { DiffComponents } from './fields/types.js';
 export type Props = {
-    comparison: Record<string, any>;
-    diffComponents: DiffComponents;
-    fieldMap: FieldMap;
-    fieldPermissions: Record<string, FieldPermissions>;
-    i18n: I18nClient;
-    locales: string[];
-    version: Record<string, any>;
+    readonly comparison: Record<string, any>;
+    readonly diffComponents: DiffComponents;
+    readonly fieldPermissions: Record<string, FieldPermissions>;
+    readonly fields: ClientField[];
+    readonly i18n: I18nClient;
+    readonly locales: string[];
+    readonly version: Record<string, any>;
 };
 export type FieldDiffProps = {
     diffMethod: DiffMethod;
-    field: MappedField;
+    field: ClientField;
     isRichText: boolean;
 } & Props;
 //# sourceMappingURL=types.d.ts.map

package/dist/views/Version/RenderFieldsToDiff/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,MAAM,MAAM,KAAK,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,EAAE,QAAQ,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAClD,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,WAAW,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB,GAAG,KAAK,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACxC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC3D,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAA;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,WAAW,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB,GAAG,KAAK,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/RenderFieldsToDiff/types.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap'\nimport type { FieldPermissions } from 'payload'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nimport type { DiffComponents } from './fields/types.js'\n\nexport type Props = {\n  comparison: Record<string, any>\n  diffComponents: DiffComponents\n  fieldMap: FieldMap\n  fieldPermissions: Record<string, FieldPermissions>\n  i18n: I18nClient\n  locales: string[]\n  version: Record<string, any>\n}\n\nexport type FieldDiffProps = {\n  diffMethod: DiffMethod\n  field: MappedField\n  isRichText: boolean\n} & Props\n"],"names":[],"mappings":"AAiBA,WAIS"}
+{"version":3,"sources":["../../../../src/views/Version/RenderFieldsToDiff/types.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { ClientField, FieldPermissions } from 'payload'\nimport type { DiffMethod } from 'react-diff-viewer-continued'\n\nimport type { DiffComponents } from './fields/types.js'\n\nexport type Props = {\n  readonly comparison: Record<string, any>\n  readonly diffComponents: DiffComponents\n  readonly fieldPermissions: Record<string, FieldPermissions>\n  readonly fields: ClientField[]\n  readonly i18n: I18nClient\n  readonly locales: string[]\n  readonly version: Record<string, any>\n}\n\nexport type FieldDiffProps = {\n  diffMethod: DiffMethod\n  field: ClientField\n  isRichText: boolean\n} & Props\n"],"names":[],"mappings":"AAgBA,WAIS"}

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":"AAKA,OAAO,KAA0C,MAAM,OAAO,CAAA;AAG9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,cAAc,CAAA;AAKrB,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAgF5B,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"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;AAGvC,OAAO,cAAc,CAAA;AAKrB,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAgH5B,CAAA;AAED,eAAe,OAAO,CAAA"}

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

@@ -1,33 +1,41 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
-import { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui';
-import { requests } from '@payloadcms/ui/shared';
+import { Button, ChevronIcon, Modal, Pill, Popup, PopupList, useConfig, useModal, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL, requests } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React, { Fragment, useCallback, useState } from 'react';
 import { toast } from 'sonner';
 import { MinimalTemplate } from '../../../templates/Minimal/index.js';
 const baseClass = 'restore-version';
 const modalSlug = 'restore-version';
-const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID, versionDate, versionID })=>{
-    const { routes: { admin, api }, serverURL } = useConfig();
+const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID, status, versionDate, versionID })=>{
+    const { config: { routes: { admin: adminRoute, api: apiRoute }, serverURL } } = useConfig();
     const { toggleModal } = useModal();
     const [processing, setProcessing] = useState(false);
     const router = useRouter();
     const { i18n, t } = useTranslation();
+    const [draft, setDraft] = useState(false);
     const restoreMessage = t('version:aboutToRestoreGlobal', {
         label: getTranslation(label, i18n),
         versionDate
     });
-    let fetchURL = `${serverURL}${api}`;
+    let fetchURL = `${serverURL}${apiRoute}`;
     let redirectURL;
+    const canRestoreAsDraft = status !== 'draft';
     if (collectionSlug) {
-        fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}`;
-        redirectURL = `${admin}/collections/${collectionSlug}/${originalDocID}`;
+        fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}?draft=${draft}`;
+        redirectURL = formatAdminURL({
+            adminRoute,
+            path: `/collections/${collectionSlug}/${originalDocID}`
+        });
     }
     if (globalSlug) {
-        fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}`;
-        redirectURL = `${admin}/globals/${globalSlug}`;
+        fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}?draft=${draft}`;
+        redirectURL = formatAdminURL({
+            adminRoute,
+            path: `/globals/${globalSlug}`
+        });
     }
     const handleRestore = useCallback(async ()=>{
         setProcessing(true);
@@ -52,13 +60,38 @@ const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID,
     ]);
     return /*#__PURE__*/ _jsxs(Fragment, {
         children: [
-            /*#__PURE__*/ _jsx(Pill, {
+            /*#__PURE__*/ _jsxs("div", {
                 className: [
                     baseClass,
                     className
                 ].filter(Boolean).join(' '),
-                onClick: ()=>toggleModal(modalSlug),
-                children: t('version:restoreThisVersion')
+                children: [
+                    /*#__PURE__*/ _jsx(Pill, {
+                        className: [
+                            canRestoreAsDraft && `${baseClass}__button`
+                        ].filter(Boolean).join(' '),
+                        onClick: ()=>toggleModal(modalSlug),
+                        children: t('version:restoreThisVersion')
+                    }),
+                    canRestoreAsDraft && /*#__PURE__*/ _jsx(Popup, {
+                        button: /*#__PURE__*/ _jsx(Pill, {
+                            className: `${baseClass}__chevron`,
+                            children: /*#__PURE__*/ _jsx(ChevronIcon, {})
+                        }),
+                        caret: false,
+                        render: ()=>/*#__PURE__*/ _jsx(PopupList.ButtonGroup, {
+                                children: /*#__PURE__*/ _jsx(PopupList.Button, {
+                                    onClick: ()=>[
+                                            setDraft(true),
+                                            toggleModal(modalSlug)
+                                        ],
+                                    children: t('version:restoreAsDraft')
+                                })
+                            }),
+                        size: "large",
+                        verticalAlign: "bottom"
+                    })
+                ]
             }),
             /*#__PURE__*/ _jsx(Modal, {
                 className: `${baseClass}__modal`,
@@ -79,7 +112,7 @@ const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID,
                             children: t('general:cancel')
                         }),
                         /*#__PURE__*/ _jsx(Button, {
-                            onClick: processing ? undefined : handleRestore,
+                            onClick: processing ? undefined : ()=>void handleRestore(),
                             children: processing ? t('version:restoring') : t('general:confirm')
                         })
                     ]

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/Restore/index.tsx"],"sourcesContent":["'use client'\nimport { getTranslation } from '@payloadcms/translations'\nimport { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui'\nimport { 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 { MinimalTemplate } from '../../../templates/Minimal/index.js'\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  versionDate,\n  versionID,\n}) => {\n  const {\n    routes: { admin, api },\n    serverURL,\n  } = useConfig()\n  const { toggleModal } = useModal()\n  const [processing, setProcessing] = useState(false)\n  const router = useRouter()\n  const { i18n, t } = useTranslation()\n\n  const restoreMessage = t('version:aboutToRestoreGlobal', {\n    label: getTranslation(label, i18n),\n    versionDate,\n  })\n\n  let fetchURL = `${serverURL}${api}`\n  let redirectURL: string\n\n  if (collectionSlug) {\n    fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}`\n    redirectURL = `${admin}/collections/${collectionSlug}/${originalDocID}`\n  }\n\n  if (globalSlug) {\n    fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}`\n    redirectURL = `${admin}/globals/${globalSlug}`\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\n  return (\n    <Fragment>\n      <Pill\n        className={[baseClass, className].filter(Boolean).join(' ')}\n        onClick={() => toggleModal(modalSlug)}\n      >\n        {t('version:restoreThisVersion')}\n      </Pill>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <MinimalTemplate className={`${baseClass}__modal-template`}>\n          <h1>{t('version:confirmVersionRestoration')}</h1>\n          <p>{restoreMessage}</p>\n          <Button\n            buttonStyle=\"secondary\"\n            onClick={processing ? undefined : () => toggleModal(modalSlug)}\n            type=\"button\"\n          >\n            {t('general:cancel')}\n          </Button>\n          <Button onClick={processing ? undefined : handleRestore}>\n            {processing ? t('version:restoring') : t('general:confirm')}\n          </Button>\n        </MinimalTemplate>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"names":["getTranslation","Button","Modal","Pill","useConfig","useModal","useTranslation","requests","useRouter","React","Fragment","useCallback","useState","toast","MinimalTemplate","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","versionDate","versionID","routes","admin","api","serverURL","toggleModal","processing","setProcessing","router","i18n","t","restoreMessage","fetchURL","redirectURL","handleRestore","res","post","headers","language","status","json","success","message","push","error","filter","Boolean","join","onClick","slug","h1","p","buttonStyle","undefined","type"],"mappings":"AAAA;;AACA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,SAASC,MAAM,EAAEC,KAAK,EAAEC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,cAAc,QAAQ,iBAAgB;AACzF,SAASC,QAAQ,QAAQ,wBAAuB;AAChD,SAASC,SAAS,QAAQ,qBAAoB;AAC9C,OAAOC,SAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ,QAAO;AAC9D,SAASC,KAAK,QAAQ,SAAQ;AAI9B,SAASC,eAAe,QAAQ,sCAAqC;AAGrE,MAAMC,YAAY;AAClB,MAAMC,YAAY;AAElB,MAAMC,UAA2B,CAAC,EAChCC,SAAS,EACTC,cAAc,EACdC,UAAU,EACVC,KAAK,EACLC,aAAa,EACbC,WAAW,EACXC,SAAS,EACV;IACC,MAAM,EACJC,QAAQ,EAAEC,KAAK,EAAEC,GAAG,EAAE,EACtBC,SAAS,EACV,GAAGxB;IACJ,MAAM,EAAEyB,WAAW,EAAE,GAAGxB;IACxB,MAAM,CAACyB,YAAYC,cAAc,GAAGnB,SAAS;IAC7C,MAAMoB,SAASxB;IACf,MAAM,EAAEyB,IAAI,EAAEC,CAAC,EAAE,GAAG5B;IAEpB,MAAM6B,iBAAiBD,EAAE,gCAAgC;QACvDb,OAAOrB,eAAeqB,OAAOY;QAC7BV;IACF;IAEA,IAAIa,WAAW,CAAC,EAAER,UAAU,EAAED,IAAI,CAAC;IACnC,IAAIU;IAEJ,IAAIlB,gBAAgB;QAClBiB,WAAW,CAAC,EAAEA,SAAS,CAAC,EAAEjB,eAAe,UAAU,EAAEK,UAAU,CAAC;QAChEa,cAAc,CAAC,EAAEX,MAAM,aAAa,EAAEP,eAAe,CAAC,EAAEG,cAAc,CAAC;IACzE;IAEA,IAAIF,YAAY;QACdgB,WAAW,CAAC,EAAEA,SAAS,SAAS,EAAEhB,WAAW,UAAU,EAAEI,UAAU,CAAC;QACpEa,cAAc,CAAC,EAAEX,MAAM,SAAS,EAAEN,WAAW,CAAC;IAChD;IAEA,MAAMkB,gBAAgB3B,YAAY;QAChCoB,cAAc;QAEd,MAAMQ,MAAM,MAAMhC,SAASiC,IAAI,CAACJ,UAAU;YACxCK,SAAS;gBACP,mBAAmBR,KAAKS,QAAQ;YAClC;QACF;QAEA,IAAIH,IAAII,MAAM,KAAK,KAAK;YACtB,MAAMC,OAAO,MAAML,IAAIK,IAAI;YAC3B/B,MAAMgC,OAAO,CAACD,KAAKE,OAAO;YAC1Bd,OAAOe,IAAI,CAACV;QACd,OAAO;YACLxB,MAAMmC,KAAK,CAACd,EAAE;QAChB;IACF,GAAG;QAACE;QAAUC;QAAaH;QAAGD;QAAMD;KAAO;IAE3C,qBACE,MAACtB;;0BACC,KAACP;gBACCe,WAAW;oBAACH;oBAAWG;iBAAU,CAAC+B,MAAM,CAACC,SAASC,IAAI,CAAC;gBACvDC,SAAS,IAAMvB,YAAYb;0BAE1BkB,EAAE;;0BAEL,KAAChC;gBAAMgB,WAAW,CAAC,EAAEH,UAAU,OAAO,CAAC;gBAAEsC,MAAMrC;0BAC7C,cAAA,MAACF;oBAAgBI,WAAW,CAAC,EAAEH,UAAU,gBAAgB,CAAC;;sCACxD,KAACuC;sCAAIpB,EAAE;;sCACP,KAACqB;sCAAGpB;;sCACJ,KAAClC;4BACCuD,aAAY;4BACZJ,SAAStB,aAAa2B,YAAY,IAAM5B,YAAYb;4BACpD0C,MAAK;sCAEJxB,EAAE;;sCAEL,KAACjC;4BAAOmD,SAAStB,aAAa2B,YAAYnB;sCACvCR,aAAaI,EAAE,uBAAuBA,EAAE;;;;;;;AAMrD;AAEA,eAAejB,QAAO"}
+{"version":3,"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 { MinimalTemplate } from '../../../templates/Minimal/index.js'\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  } = useConfig()\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  const canRestoreAsDraft = status !== 'draft'\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        <Pill\n          className={[canRestoreAsDraft && `${baseClass}__button`].filter(Boolean).join(' ')}\n          onClick={() => toggleModal(modalSlug)}\n        >\n          {t('version:restoreThisVersion')}\n        </Pill>\n        {canRestoreAsDraft && (\n          <Popup\n            button={\n              <Pill className={`${baseClass}__chevron`}>\n                <ChevronIcon />\n              </Pill>\n            }\n            caret={false}\n            render={() => (\n              <PopupList.ButtonGroup>\n                <PopupList.Button onClick={() => [setDraft(true), toggleModal(modalSlug)]}>\n                  {t('version:restoreAsDraft')}\n                </PopupList.Button>\n              </PopupList.ButtonGroup>\n            )}\n            size=\"large\"\n            verticalAlign=\"bottom\"\n          />\n        )}\n      </div>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <MinimalTemplate className={`${baseClass}__modal-template`}>\n          <h1>{t('version:confirmVersionRestoration')}</h1>\n          <p>{restoreMessage}</p>\n          <Button\n            buttonStyle=\"secondary\"\n            onClick={processing ? undefined : () => toggleModal(modalSlug)}\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        </MinimalTemplate>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"names":["getTranslation","Button","ChevronIcon","Modal","Pill","Popup","PopupList","useConfig","useModal","useTranslation","formatAdminURL","requests","useRouter","React","Fragment","useCallback","useState","toast","MinimalTemplate","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","status","versionDate","versionID","config","routes","admin","adminRoute","api","apiRoute","serverURL","toggleModal","processing","setProcessing","router","i18n","t","draft","setDraft","restoreMessage","fetchURL","redirectURL","canRestoreAsDraft","path","handleRestore","res","post","headers","language","json","success","message","push","error","div","filter","Boolean","join","onClick","button","caret","render","ButtonGroup","size","verticalAlign","slug","h1","p","buttonStyle","undefined","type"],"mappings":"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"}

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

@@ -2,6 +2,37 @@
 
 .restore-version {
   cursor: pointer;
+  display: flex;
+
+  .popup-button {
+    display: flex;
+  }
+
+  &__chevron {
+    background-color: var(--theme-elevation-150);
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    cursor: pointer;
+
+    .stroke {
+      stroke-width: 1px;
+    }
+
+    &:hover {
+      background: var(--theme-elevation-100);
+    }
+  }
+
+  &__button {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    margin-right: 2px;
+
+    &:focus {
+      border-radius: 0;
+      outline-offset: 0;
+    }
+  }
 
   &__modal {
     @include blur-bg;

package/dist/views/Version/Restore/types.d.ts

@@ -5,6 +5,7 @@ export type Props = {
     globalSlug?: SanitizedGlobalConfig['slug'];
     label: SanitizedCollectionConfig['labels']['singular'];
     originalDocID: number | string;
+    status?: string;
     versionDate: string;
     versionID: string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/E,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAClD,UAAU,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAC1C,KAAK,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAA;IACtD,aAAa,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/E,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAClD,UAAU,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAC1C,KAAK,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAA;IACtD,aAAa,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/Restore/types.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nexport type Props = {\n  className?: string\n  collectionSlug?: SanitizedCollectionConfig['slug']\n  globalSlug?: SanitizedGlobalConfig['slug']\n  label: SanitizedCollectionConfig['labels']['singular']\n  originalDocID: number | string\n  versionDate: string\n  versionID: string\n}\n"],"names":[],"mappings":"AAEA,WAQC"}
+{"version":3,"sources":["../../../../src/views/Version/Restore/types.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nexport type Props = {\n  className?: string\n  collectionSlug?: SanitizedCollectionConfig['slug']\n  globalSlug?: SanitizedGlobalConfig['slug']\n  label: SanitizedCollectionConfig['labels']['singular']\n  originalDocID: number | string\n  status?: string\n  versionDate: string\n  versionID: string\n}\n"],"names":[],"mappings":"AAEA,WASC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAE/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,cAAc,CAAA;AAQrB,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAuJ5C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAE/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,cAAc,CAAA;AAQrB,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAyJ5C,CAAA"}

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

@@ -10,7 +10,7 @@ const maxResultsPerRequest = 10;
 const baseOptions = [];
 export const SelectComparison = (props)=>{
     const { baseURL, latestDraftVersion, latestPublishedVersion, onChange, parentID, value, versionID } = props;
-    const { admin: { dateFormat } } = useConfig();
+    const { config: { admin: { dateFormat } } } = useConfig();
     const [options, setOptions] = useState(baseOptions);
     const [lastLoadedPage, setLastLoadedPage] = useState(1);
     const [errorLoading, setErrorLoading] = useState('');

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"sourcesContent":["'use client'\n\nimport type { PaginatedDocs, Where } from 'payload'\n\nimport { ReactSelect, fieldBaseClass, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatDate } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useState } from 'react'\n\nimport type { Props } from './types.js'\n\nimport { renderPill } from '../../Versions/cells/AutosaveCell/index.js'\nimport './index.scss'\n\nconst baseClass = 'compare-version'\n\nconst maxResultsPerRequest = 10\n\nconst baseOptions = []\n\nexport const SelectComparison: React.FC<Props> = (props) => {\n  const {\n    baseURL,\n    latestDraftVersion,\n    latestPublishedVersion,\n    onChange,\n    parentID,\n    value,\n    versionID,\n  } = props\n\n  const {\n    admin: { dateFormat },\n  } = useConfig()\n\n  const [options, setOptions] = useState<\n    {\n      label: React.ReactNode | string\n      value: string\n    }[]\n  >(baseOptions)\n  const [lastLoadedPage, setLastLoadedPage] = useState(1)\n  const [errorLoading, setErrorLoading] = useState('')\n  const { i18n, t } = useTranslation()\n  const loadedAllOptionsRef = React.useRef(false)\n\n  const getResults = useCallback(\n    async ({ lastLoadedPage: lastLoadedPageArg }) => {\n      if (loadedAllOptionsRef.current) return\n      const query: {\n        [key: string]: unknown\n        where: Where\n      } = {\n        depth: 0,\n        limit: maxResultsPerRequest,\n        page: lastLoadedPageArg,\n        where: {\n          and: [\n            {\n              id: {\n                not_equals: versionID,\n              },\n            },\n          ],\n        },\n      }\n\n      if (parentID) {\n        query.where.and.push({\n          parent: {\n            equals: parentID,\n          },\n        })\n      }\n\n      const search = qs.stringify(query)\n\n      const response = await fetch(`${baseURL}?${search}`, {\n        credentials: 'include',\n        headers: {\n          'Accept-Language': i18n.language,\n        },\n      })\n\n      if (response.ok) {\n        const data: PaginatedDocs = await response.json()\n\n        if (data.docs.length > 0) {\n          const versionInfo = {\n            draft: {\n              currentLabel: t('version:currentDraft'),\n              latestVersion: latestDraftVersion,\n              pillStyle: undefined,\n              previousLabel: t('version:draft'),\n            },\n            published: {\n              currentLabel: t('version:currentPublishedVersion'),\n              latestVersion: latestPublishedVersion,\n              pillStyle: 'success',\n              previousLabel: t('version:previouslyPublished'),\n            },\n          }\n\n          const additionalOptions = data.docs.map((doc) => {\n            const status = doc.version._status\n            const { currentLabel, latestVersion, pillStyle, previousLabel } =\n              versionInfo[status] || {}\n\n            return {\n              label: (\n                <div>\n                  {formatDate({ date: doc.updatedAt, i18n, pattern: dateFormat })}\n                  &nbsp;&nbsp;\n                  {renderPill(doc, latestVersion, currentLabel, previousLabel, pillStyle)}\n                </div>\n              ),\n              value: doc.id,\n            }\n          })\n\n          setOptions((existingOptions) => [...existingOptions, ...additionalOptions])\n\n          if (!data.hasNextPage) {\n            loadedAllOptionsRef.current = true\n          }\n          setLastLoadedPage(data.page)\n        }\n      } else {\n        setErrorLoading(t('error:unspecific'))\n      }\n    },\n    [dateFormat, baseURL, parentID, versionID, t, i18n, latestDraftVersion, latestPublishedVersion],\n  )\n\n  useEffect(() => {\n    void getResults({ lastLoadedPage: 1 })\n  }, [getResults])\n\n  const filteredOptions = options.filter(\n    (option, index, self) => self.findIndex((t) => t.value === option.value) === index,\n  )\n\n  useEffect(() => {\n    if (filteredOptions.length > 0 && !value) {\n      onChange(filteredOptions[0])\n    }\n  }, [filteredOptions, value, onChange])\n\n  return (\n    <div\n      className={[fieldBaseClass, baseClass, errorLoading && 'error-loading']\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <div className={`${baseClass}__label`}>{t('version:compareVersion')}</div>\n      {!errorLoading && (\n        <ReactSelect\n          isClearable={false}\n          isSearchable={false}\n          onChange={onChange}\n          onMenuScrollToBottom={() => {\n            void getResults({ lastLoadedPage: lastLoadedPage + 1 })\n          }}\n          options={filteredOptions}\n          placeholder={t('version:selectVersionToCompare')}\n          value={value}\n        />\n      )}\n      {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}\n    </div>\n  )\n}\n"],"names":["ReactSelect","fieldBaseClass","useConfig","useTranslation","formatDate","qs","React","useCallback","useEffect","useState","renderPill","baseClass","maxResultsPerRequest","baseOptions","SelectComparison","props","baseURL","latestDraftVersion","latestPublishedVersion","onChange","parentID","value","versionID","admin","dateFormat","options","setOptions","lastLoadedPage","setLastLoadedPage","errorLoading","setErrorLoading","i18n","t","loadedAllOptionsRef","useRef","getResults","lastLoadedPageArg","current","query","depth","limit","page","where","and","id","not_equals","push","parent","equals","search","stringify","response","fetch","credentials","headers","language","ok","data","json","docs","length","versionInfo","draft","currentLabel","latestVersion","pillStyle","undefined","previousLabel","published","additionalOptions","map","doc","status","version","_status","label","div","date","updatedAt","pattern","existingOptions","hasNextPage","filteredOptions","filter","option","index","self","findIndex","className","Boolean","join","isClearable","isSearchable","onMenuScrollToBottom","placeholder"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"sourcesContent":["'use client'\n\nimport type { PaginatedDocs, Where } from 'payload'\n\nimport { ReactSelect, fieldBaseClass, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatDate } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useState } from 'react'\n\nimport type { Props } from './types.js'\n\nimport { renderPill } from '../../Versions/cells/AutosaveCell/index.js'\nimport './index.scss'\n\nconst baseClass = 'compare-version'\n\nconst maxResultsPerRequest = 10\n\nconst baseOptions = []\n\nexport const SelectComparison: React.FC<Props> = (props) => {\n  const {\n    baseURL,\n    latestDraftVersion,\n    latestPublishedVersion,\n    onChange,\n    parentID,\n    value,\n    versionID,\n  } = props\n\n  const {\n    config: {\n      admin: { dateFormat },\n    },\n  } = useConfig()\n\n  const [options, setOptions] = useState<\n    {\n      label: React.ReactNode | string\n      value: string\n    }[]\n  >(baseOptions)\n  const [lastLoadedPage, setLastLoadedPage] = useState(1)\n  const [errorLoading, setErrorLoading] = useState('')\n  const { i18n, t } = useTranslation()\n  const loadedAllOptionsRef = React.useRef(false)\n\n  const getResults = useCallback(\n    async ({ lastLoadedPage: lastLoadedPageArg }) => {\n      if (loadedAllOptionsRef.current) return\n      const query: {\n        [key: string]: unknown\n        where: Where\n      } = {\n        depth: 0,\n        limit: maxResultsPerRequest,\n        page: lastLoadedPageArg,\n        where: {\n          and: [\n            {\n              id: {\n                not_equals: versionID,\n              },\n            },\n          ],\n        },\n      }\n\n      if (parentID) {\n        query.where.and.push({\n          parent: {\n            equals: parentID,\n          },\n        })\n      }\n\n      const search = qs.stringify(query)\n\n      const response = await fetch(`${baseURL}?${search}`, {\n        credentials: 'include',\n        headers: {\n          'Accept-Language': i18n.language,\n        },\n      })\n\n      if (response.ok) {\n        const data: PaginatedDocs = await response.json()\n\n        if (data.docs.length > 0) {\n          const versionInfo = {\n            draft: {\n              currentLabel: t('version:currentDraft'),\n              latestVersion: latestDraftVersion,\n              pillStyle: undefined,\n              previousLabel: t('version:draft'),\n            },\n            published: {\n              currentLabel: t('version:currentPublishedVersion'),\n              latestVersion: latestPublishedVersion,\n              pillStyle: 'success',\n              previousLabel: t('version:previouslyPublished'),\n            },\n          }\n\n          const additionalOptions = data.docs.map((doc) => {\n            const status = doc.version._status\n            const { currentLabel, latestVersion, pillStyle, previousLabel } =\n              versionInfo[status] || {}\n\n            return {\n              label: (\n                <div>\n                  {formatDate({ date: doc.updatedAt, i18n, pattern: dateFormat })}\n                  &nbsp;&nbsp;\n                  {renderPill(doc, latestVersion, currentLabel, previousLabel, pillStyle)}\n                </div>\n              ),\n              value: doc.id,\n            }\n          })\n\n          setOptions((existingOptions) => [...existingOptions, ...additionalOptions])\n\n          if (!data.hasNextPage) {\n            loadedAllOptionsRef.current = true\n          }\n          setLastLoadedPage(data.page)\n        }\n      } else {\n        setErrorLoading(t('error:unspecific'))\n      }\n    },\n    [dateFormat, baseURL, parentID, versionID, t, i18n, latestDraftVersion, latestPublishedVersion],\n  )\n\n  useEffect(() => {\n    void getResults({ lastLoadedPage: 1 })\n  }, [getResults])\n\n  const filteredOptions = options.filter(\n    (option, index, self) => self.findIndex((t) => t.value === option.value) === index,\n  )\n\n  useEffect(() => {\n    if (filteredOptions.length > 0 && !value) {\n      onChange(filteredOptions[0])\n    }\n  }, [filteredOptions, value, onChange])\n\n  return (\n    <div\n      className={[fieldBaseClass, baseClass, errorLoading && 'error-loading']\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <div className={`${baseClass}__label`}>{t('version:compareVersion')}</div>\n      {!errorLoading && (\n        <ReactSelect\n          isClearable={false}\n          isSearchable={false}\n          onChange={onChange}\n          onMenuScrollToBottom={() => {\n            void getResults({ lastLoadedPage: lastLoadedPage + 1 })\n          }}\n          options={filteredOptions}\n          placeholder={t('version:selectVersionToCompare')}\n          value={value}\n        />\n      )}\n      {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}\n    </div>\n  )\n}\n"],"names":["ReactSelect","fieldBaseClass","useConfig","useTranslation","formatDate","qs","React","useCallback","useEffect","useState","renderPill","baseClass","maxResultsPerRequest","baseOptions","SelectComparison","props","baseURL","latestDraftVersion","latestPublishedVersion","onChange","parentID","value","versionID","config","admin","dateFormat","options","setOptions","lastLoadedPage","setLastLoadedPage","errorLoading","setErrorLoading","i18n","t","loadedAllOptionsRef","useRef","getResults","lastLoadedPageArg","current","query","depth","limit","page","where","and","id","not_equals","push","parent","equals","search","stringify","response","fetch","credentials","headers","language","ok","data","json","docs","length","versionInfo","draft","currentLabel","latestVersion","pillStyle","undefined","previousLabel","published","additionalOptions","map","doc","status","version","_status","label","div","date","updatedAt","pattern","existingOptions","hasNextPage","filteredOptions","filter","option","index","self","findIndex","className","Boolean","join","isClearable","isSearchable","onMenuScrollToBottom","placeholder"],"mappings":"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"}

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

@@ -1,3 +1,3 @@
-import type { EditViewComponent } from 'payload';
-export declare const VersionView: EditViewComponent;
+import type { EditViewComponent, PayloadServerReactComponent } from 'payload';
+export declare const VersionView: PayloadServerReactComponent<EditViewComponent>;
 //# sourceMappingURL=index.d.ts.map

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,EAGV,iBAAiB,EAGlB,MAAM,SAAS,CAAA;AAQhB,eAAO,MAAM,WAAW,EAAE,iBAiHzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Version/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAGjB,2BAA2B,EAC5B,MAAM,SAAS,CAAA;AAShB,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,iBAAiB,CA2ItE,CAAA"}

package/dist/views/Version/index.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { notFound } from 'next/navigation.js';
+import { deepCopyObjectSimple } from 'payload';
 import React from 'react';
 import { getLatestVersion } from '../Versions/getLatestVersion.js';
 import { DefaultVersionView } from './Default/index.js';
@@ -30,8 +31,18 @@ export const VersionView = async (props)=>{
                 user
             });
             if (collectionConfig?.versions?.drafts) {
-                latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'collection');
-                latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'collection');
+                latestDraftVersion = await getLatestVersion({
+                    slug,
+                    type: 'collection',
+                    payload,
+                    status: 'draft'
+                });
+                latestPublishedVersion = await getLatestVersion({
+                    slug,
+                    type: 'collection',
+                    payload,
+                    status: 'published'
+                });
             }
         } catch (error) {
             return notFound();
@@ -52,8 +63,18 @@ export const VersionView = async (props)=>{
                 user
             });
             if (globalConfig?.versions?.drafts) {
-                latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'global');
-                latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'global');
+                latestDraftVersion = await getLatestVersion({
+                    slug,
+                    type: 'global',
+                    payload,
+                    status: 'draft'
+                });
+                latestPublishedVersion = await getLatestVersion({
+                    slug,
+                    type: 'global',
+                    payload,
+                    status: 'published'
+                });
             }
         } catch (error) {
             return notFound();
@@ -66,8 +87,8 @@ export const VersionView = async (props)=>{
             updatedAt: ''
         };
     }
-    const localeOptions = localization && localization?.locales && localization.locales.map(({ code, label })=>({
-            label: typeof label === 'string' ? label : '',
+    const localeOptions = localization && localization.locales.map(({ code, label })=>({
+            label,
             value: code
         }));
     const latestVersion = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt ? latestPublishedVersion : latestDraftVersion;
@@ -76,10 +97,16 @@ export const VersionView = async (props)=>{
     }
     return /*#__PURE__*/ _jsx(DefaultVersionView, {
         doc: doc,
-        docPermissions: docPermissions,
+        /**
+       * After bumping the Next.js canary to 104, and React to 19.0.0-rc-06d0b89e-20240801" we have to deepCopy the permissions object (https://github.com/payloadcms/payload/pull/7541).
+       * If both HydrateClientUser and RenderCustomComponent receive the same permissions object (same object reference), we get a
+       * "TypeError: Cannot read properties of undefined (reading '$$typeof')" error
+       *
+       * // TODO: Revisit this in the future and figure out why this is happening. Might be a React/Next.js bug. We don't know why it happens, and a future React/Next version might unbreak this (keep an eye on this and remove deepCopyObjectSimple if that's the case)
+       */ docPermissions: deepCopyObjectSimple(docPermissions),
         initialComparisonDoc: latestVersion,
-        latestDraftVersion: latestDraftVersion.id,
-        latestPublishedVersion: latestPublishedVersion.id,
+        latestDraftVersion: latestDraftVersion?.id,
+        latestPublishedVersion: latestPublishedVersion?.id,
         localeOptions: localeOptions,
         versionID: versionID
     });