@payloadcms/next 3.0.0-canary.294ea5c → 3.0.0-canary.3926e86

package/dist/views/NotFound/index.scss

@@ -1,37 +1,57 @@
 @import '../../scss/styles.scss';
 
-.not-found {
-  margin-top: var(--base);
-  display: flex;
+@layer payload-default {
+  .not-found {
+    margin-top: var(--base);
+    display: flex;
 
-  & > * {
-    &:first-child {
-      margin-top: 0;
+    & > * {
+      &:first-child {
+        margin-top: 0;
+      }
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
-    &:last-child {
-      margin-bottom: 0;
+
+    &__wrap {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      gap: base(0.8);
+      max-width: base(36);
     }
-  }
 
-  &__button {
-    margin: 0;
-  }
+    &__content {
+      display: flex;
+      flex-direction: column;
+      gap: base(0.4);
 
-  &--margin-top-large {
-    margin-top: calc(var(--base) * 2);
-  }
+      > * {
+        margin: 0;
+      }
+    }
+
+    &__button {
+      margin: 0;
+    }
 
-  @include large-break {
     &--margin-top-large {
-      margin-top: var(--base);
+      margin-top: calc(var(--base) * 2);
     }
-  }
 
-  @include small-break {
-    margin-top: calc(var(--base) / 2);
+    @include large-break {
+      &--margin-top-large {
+        margin-top: var(--base);
+      }
+    }
 
-    &--margin-top-large {
+    @include small-break {
       margin-top: calc(var(--base) / 2);
+
+      &--margin-top-large {
+        margin-top: calc(var(--base) / 2);
+      }
     }
   }
 }

package/dist/views/ResetPassword/ResetPasswordForm/index.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+type Args = {
+    readonly token: string;
+};
+export declare const ResetPasswordForm: React.FC<Args>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/views/ResetPassword/ResetPasswordForm/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/ResetPassword/ResetPasswordForm/index.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB,CAAA;AAeD,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAgE5C,CAAA"}

package/dist/views/ResetPassword/{index.client.js → ResetPasswordForm/index.js}

@@ -6,7 +6,6 @@ import { ConfirmPasswordField, Form, FormSubmit, HiddenField, PasswordField, use
 import { formatAdminURL } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React from 'react';
-import { toast } from 'sonner';
 const initialState = {
   'confirm-password': {
     initialValue: '',
@@ -19,7 +18,7 @@ const initialState = {
     value: ''
   }
 };
-export const ResetPasswordClient = t0 => {
+export const ResetPasswordForm = t0 => {
   const $ = _c(11);
   const {
     token
@@ -49,55 +48,64 @@ export const ResetPasswordClient = t0 => {
     fetchFullUser
   } = useAuth();
   let t5;
-  if ($[0] !== fetchFullUser || $[1] !== history || $[2] !== adminRoute || $[3] !== loginRoute || $[4] !== i18n) {
-    t5 = async data => {
-      if (data.token) {
-        await fetchFullUser();
+  if ($[0] !== fetchFullUser || $[1] !== history || $[2] !== adminRoute || $[3] !== loginRoute) {
+    t5 = async () => {
+      const user = await fetchFullUser();
+      if (user) {
         history.push(adminRoute);
       } else {
         history.push(formatAdminURL({
           adminRoute,
           path: loginRoute
         }));
-        toast.success(i18n.t("general:updatedSuccessfully"));
       }
     };
     $[0] = fetchFullUser;
     $[1] = history;
     $[2] = adminRoute;
     $[3] = loginRoute;
-    $[4] = i18n;
-    $[5] = t5;
+    $[4] = t5;
   } else {
-    t5 = $[5];
+    t5 = $[4];
   }
   const onSuccess = t5;
   const t6 = `${serverURL}${apiRoute}/${userSlug}/reset-password`;
   let t7;
-  if ($[6] !== i18n || $[7] !== token || $[8] !== t6 || $[9] !== onSuccess) {
+  if ($[5] !== i18n || $[6] !== userSlug || $[7] !== token || $[8] !== t6 || $[9] !== onSuccess) {
     t7 = _jsxs(Form, {
       action: t6,
       initialState,
       method: "POST",
       onSuccess,
-      children: [_jsx(PasswordField, {
-        field: {
-          name: "password",
-          label: i18n.t("authentication:newPassword"),
-          required: true
-        }
-      }), _jsx(ConfirmPasswordField, {}), _jsx(HiddenField, {
-        field: {
-          name: "token"
-        },
-        forceUsePathFromProps: true,
-        value: token
+      children: [_jsxs("div", {
+        className: "inputWrap",
+        children: [_jsx(PasswordField, {
+          field: {
+            name: "password",
+            label: i18n.t("authentication:newPassword"),
+            required: true
+          },
+          path: "password",
+          schemaPath: `${userSlug}.password`
+        }), _jsx(ConfirmPasswordField, {}), _jsx(HiddenField, {
+          field: {
+            name: "token",
+            type: "text",
+            admin: {
+              hidden: true
+            }
+          },
+          path: "token",
+          schemaPath: `${userSlug}.token`,
+          value: token
+        })]
       }), _jsx(FormSubmit, {
         size: "large",
         children: i18n.t("authentication:resetPassword")
       })]
     });
-    $[6] = i18n;
+    $[5] = i18n;
+    $[6] = userSlug;
     $[7] = token;
     $[8] = t6;
     $[9] = onSuccess;
@@ -107,4 +115,4 @@ export const ResetPasswordClient = t0 => {
   }
   return t7;
 };
-//# sourceMappingURL=index.client.js.map
+//# sourceMappingURL=index.js.map

package/dist/views/ResetPassword/ResetPasswordForm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["c","_c","ConfirmPasswordField","Form","FormSubmit","HiddenField","PasswordField","useAuth","useConfig","useTranslation","formatAdminURL","useRouter","React","initialState","initialValue","valid","value","password","ResetPasswordForm","t0","$","token","i18n","config","t1","admin","t2","routes","t3","serverURL","t4","user","userSlug","login","loginRoute","adminRoute","api","apiRoute","history","fetchFullUser","t5","push","path","onSuccess","t6","t7","_jsxs","action","method","children","className","_jsx","field","name","label","t","required","schemaPath","type","hidden","size"],"sources":["../../../../src/views/ResetPassword/ResetPasswordForm/index.tsx"],"sourcesContent":["'use client'\nimport {\n  ConfirmPasswordField,\n  Form,\n  FormSubmit,\n  HiddenField,\n  PasswordField,\n  useAuth,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport { type FormState } from 'payload'\nimport React from 'react'\n\ntype Args = {\n  readonly token: string\n}\n\nconst initialState: FormState = {\n  'confirm-password': {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n  password: {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n}\n\nexport const ResetPasswordForm: React.FC<Args> = ({ token }) => {\n  const i18n = useTranslation()\n  const {\n    config: {\n      admin: {\n        routes: { login: loginRoute },\n        user: userSlug,\n      },\n      routes: { admin: adminRoute, api: apiRoute },\n      serverURL,\n    },\n  } = useConfig()\n\n  const history = useRouter()\n  const { fetchFullUser } = useAuth()\n\n  const onSuccess = React.useCallback(async () => {\n    const user = await fetchFullUser()\n    if (user) {\n      history.push(adminRoute)\n    } else {\n      history.push(\n        formatAdminURL({\n          adminRoute,\n          path: loginRoute,\n        }),\n      )\n    }\n  }, [adminRoute, fetchFullUser, history, loginRoute])\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/reset-password`}\n      initialState={initialState}\n      method=\"POST\"\n      onSuccess={onSuccess}\n    >\n      <div className=\"inputWrap\">\n        <PasswordField\n          field={{\n            name: 'password',\n            label: i18n.t('authentication:newPassword'),\n            required: true,\n          }}\n          path=\"password\"\n          schemaPath={`${userSlug}.password`}\n        />\n        <ConfirmPasswordField />\n        <HiddenField\n          field={{\n            name: 'token',\n            type: 'text',\n            admin: {\n              hidden: true,\n            },\n          }}\n          path=\"token\"\n          schemaPath={`${userSlug}.token`}\n          value={token}\n        />\n      </div>\n      <FormSubmit size=\"large\">{i18n.t('authentication:resetPassword')}</FormSubmit>\n    </Form>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,SACEC,oBAAoB,EACpBC,IAAI,EACJC,UAAU,EACVC,WAAW,EACXC,aAAa,EACbC,OAAO,EACPC,SAAS,EACTC,cAAc,QACT;AACP,SAASC,cAAc,QAAQ;AAC/B,SAASC,SAAS,QAAQ;AAE1B,OAAOC,KAAA,MAAW;AAMlB,MAAMC,YAAA,GAA0B;EAC9B,oBAAoB;IAClBC,YAAA,EAAc;IACdC,KAAA,EAAO;IACPC,KAAA,EAAO;EACT;EACAC,QAAA,EAAU;IACRH,YAAA,EAAc;IACdC,KAAA,EAAO;IACPC,KAAA,EAAO;EACT;AACF;AAEA,OAAO,MAAME,iBAAA,GAAoCC,EAAA;EAAA,MAAAC,CAAA,GAAAnB,EAAA;EAAC;IAAAoB;EAAA,IAAAF,EAAS;EACzD,MAAAG,IAAA,GAAab,cAAA;EACb;IAAAc,MAAA,EAAAC;EAAA,IASIhB,SAAA;EARM;IAAAiB,KAAA,EAAAC,EAAA;IAAAC,MAAA,EAAAC,EAAA;IAAAC;EAAA,IAAAL,EAOP;EANQ;IAAAG,MAAA,EAAAG,EAAA;IAAAC,IAAA,EAAAC;EAAA,IAAAN,EAGN;EAFS;IAAAO,KAAA,EAAAC;EAAA,IAAAJ,EAAqB;EAGvB;IAAAL,KAAA,EAAAU,UAAA;IAAAC,GAAA,EAAAC;EAAA,IAAAT,EAAoC;EAKhD,MAAAU,OAAA,GAAgB3B,SAAA;EAChB;IAAA4B;EAAA,IAA0BhC,OAAA;EAAA,IAAAiC,EAAA;EAAA,IAAApB,CAAA,QAAAmB,aAAA,IAAAnB,CAAA,QAAAkB,OAAA,IAAAlB,CAAA,QAAAe,UAAA,IAAAf,CAAA,QAAAc,UAAA;IAEUM,EAAA,SAAAA,CAAA;MAClC,MAAAT,IAAA,SAAmBQ,aAAA;MAAA,IACfR,IAAA;QACFO,OAAA,CAAAG,IAAA,CAAaN,UAAA;MAAA;QAEbG,OAAA,CAAAG,IAAA,CACE/B,cAAA;UAAAyB,UAAA;UAAAO,IAAA,EAEQR;QAAA,CACR;MAAA;IAAA;IAGNd,CAAA,MAAAmB,aAAA;IAAAnB,CAAA,MAAAkB,OAAA;IAAAlB,CAAA,MAAAe,UAAA;IAAAf,CAAA,MAAAc,UAAA;IAAAd,CAAA,MAAAoB,EAAA;EAAA;IAAAA,EAAA,GAAApB,CAAA;EAAA;EAZA,MAAAuB,SAAA,GAAkBH,EAYiC;EAIvC,MAAAI,EAAA,MAAGf,SAAA,GAAYQ,QAAA,IAAYL,QAAA,iBAAyB;EAAA,IAAAa,EAAA;EAAA,IAAAzB,CAAA,QAAAE,IAAA,IAAAF,CAAA,QAAAY,QAAA,IAAAZ,CAAA,QAAAC,KAAA,IAAAD,CAAA,QAAAwB,EAAA,IAAAxB,CAAA,QAAAuB,SAAA;IAD9DE,EAAA,GAAAC,KAAA,CAAA3C,IAAA;MAAA4C,MAAA,EACUH,EAAoD;MAAA/B,YAAA;MAAAmC,MAAA,EAErD;MAAAL,SAAA;MAAAM,QAAA,GAGPH,KAAA,CAAC;QAAAI,SAAA,EAAc;QAAAD,QAAA,GACbE,IAAA,CAAA7C,aAAA;UAAA8C,KAAA;YAAAC,IAAA,EAEU;YAAAC,KAAA,EACChC,IAAA,CAAAiC,CAAA,CAAO;YAAAC,QAAA;UAAA;UAAAd,IAAA,EAGX;UAAAe,UAAA,EACO,GAAGzB,QAAA;QAAmB,C,GAEpCmB,IAAA,CAAAjD,oBAAA,IAAC,GACDiD,IAAA,CAAA9C,WAAA;UAAA+C,KAAA;YAAAC,IAAA,EAEU;YAAAK,IAAA,EACA;YAAAjC,KAAA;cAAAkC,MAAA;YAAA;UAAA;UAAAjB,IAAA,EAKH;UAAAe,UAAA,EACO,GAAGzB,QAAA,QAAgB;UAAAhB,KAAA,EACxBK;QAAA,C;UAGX8B,IAAA,CAAA/C,UAAA;QAAAwD,IAAA,EAAiB;QAAAX,QAAA,EAAS3B,IAAA,CAAAiC,CAAA,CAAO;MAAA,C;;;;;;;;;;;SA9BnCV,E;CAiCJ","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,cAAc,CAAA;AAErB,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAItD,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA4DlD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAGrB,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAItD,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAmElD,CAAA"}

package/dist/views/ResetPassword/index.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, Translation } from '@payloadcms/ui';
-import { formatAdminURL } from '@payloadcms/ui/shared';
+import { Button } from '@payloadcms/ui';
+import { formatAdminURL, Translation } from '@payloadcms/ui/shared';
 import LinkImport from 'next/link.js';
 import React from 'react';
-import { MinimalTemplate } from '../../templates/Minimal/index.js';
-import { ResetPasswordClient } from './index.client.js';
+import { FormHeader } from '../../elements/FormHeader/index.js';
+import { ResetPasswordForm } from './ResetPasswordForm/index.js';
 export const resetPasswordBaseClass = 'reset-password';
 const Link = LinkImport.default || LinkImport;
 export { generateResetPasswordMetadata } from './meta.js';
@@ -28,7 +28,8 @@ export const ResetPassword = ({
   const {
     admin: {
       routes: {
-        account: accountRoute
+        account: accountRoute,
+        login: loginRoute
       }
     },
     routes: {
@@ -36,48 +37,50 @@ export const ResetPassword = ({
     }
   } = config;
   if (user) {
-    return /*#__PURE__*/_jsx(MinimalTemplate, {
-      className: resetPasswordBaseClass,
-      children: /*#__PURE__*/_jsxs("div", {
-        className: `${resetPasswordBaseClass}__wrap`,
-        children: [/*#__PURE__*/_jsx("h1", {
-          children: i18n.t('authentication:alreadyLoggedIn')
-        }), /*#__PURE__*/_jsx("p", {
-          children: /*#__PURE__*/_jsx(Translation, {
-            elements: {
-              '0': ({
-                children
-              }) => /*#__PURE__*/_jsx(Link, {
-                href: formatAdminURL({
-                  adminRoute,
-                  path: accountRoute
-                }),
-                children: children
-              })
-            },
-            i18nKey: "authentication:loggedInChangePassword",
-            t: i18n.t
-          })
-        }), /*#__PURE__*/_jsx("br", {}), /*#__PURE__*/_jsx(Button, {
-          Link: Link,
-          buttonStyle: "secondary",
-          el: "link",
-          to: adminRoute,
-          children: i18n.t('general:backToDashboard')
-        })]
-      })
-    });
-  }
-  return /*#__PURE__*/_jsx(MinimalTemplate, {
-    className: resetPasswordBaseClass,
-    children: /*#__PURE__*/_jsxs("div", {
+    return /*#__PURE__*/_jsxs("div", {
       className: `${resetPasswordBaseClass}__wrap`,
-      children: [/*#__PURE__*/_jsx("h1", {
-        children: i18n.t('authentication:resetPassword')
-      }), /*#__PURE__*/_jsx(ResetPasswordClient, {
-        token: token
+      children: [/*#__PURE__*/_jsx(FormHeader, {
+        description: /*#__PURE__*/_jsx(Translation, {
+          elements: {
+            '0': ({
+              children
+            }) => /*#__PURE__*/_jsx(Link, {
+              href: formatAdminURL({
+                adminRoute,
+                path: accountRoute
+              }),
+              prefetch: false,
+              children: children
+            })
+          },
+          i18nKey: "authentication:loggedInChangePassword",
+          t: i18n.t
+        }),
+        heading: i18n.t('authentication:alreadyLoggedIn')
+      }), /*#__PURE__*/_jsx(Button, {
+        buttonStyle: "secondary",
+        el: "link",
+        Link: Link,
+        size: "large",
+        to: adminRoute,
+        children: i18n.t('general:backToDashboard')
       })]
-    })
+    });
+  }
+  return /*#__PURE__*/_jsxs("div", {
+    className: `${resetPasswordBaseClass}__wrap`,
+    children: [/*#__PURE__*/_jsx(FormHeader, {
+      heading: i18n.t('authentication:resetPassword')
+    }), /*#__PURE__*/_jsx(ResetPasswordForm, {
+      token: token
+    }), /*#__PURE__*/_jsx(Link, {
+      href: formatAdminURL({
+        adminRoute,
+        path: loginRoute
+      }),
+      prefetch: false,
+      children: i18n.t('authentication:backToLogin')
+    })]
   });
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Button","Translation","formatAdminURL","LinkImport","React","MinimalTemplate","ResetPasswordClient","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","segments","_","token","i18n","payload","config","user","admin","routes","account","accountRoute","adminRoute","_jsx","className","_jsxs","t","elements","0","children","href","path","i18nKey","buttonStyle","el","to"],"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { Button, Translation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nimport { MinimalTemplate } from '../../templates/Minimal/index.js'\nimport { ResetPasswordClient } from './index.client.js'\nimport './index.scss'\n\nexport const resetPasswordBaseClass = 'reset-password'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport { generateResetPasswordMetadata } from './meta.js'\n\nexport const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params }) => {\n  const { req } = initPageResult\n\n  const {\n    segments: [_, token],\n  } = params\n\n  const {\n    i18n,\n    payload: { config },\n    user,\n  } = req\n\n  const {\n    admin: {\n      routes: { account: accountRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (user) {\n    return (\n      <MinimalTemplate className={resetPasswordBaseClass}>\n        <div className={`${resetPasswordBaseClass}__wrap`}>\n          <h1>{i18n.t('authentication:alreadyLoggedIn')}</h1>\n          <p>\n            <Translation\n              elements={{\n                '0': ({ children }) => (\n                  <Link\n                    href={formatAdminURL({\n                      adminRoute,\n                      path: accountRoute,\n                    })}\n                  >\n                    {children}\n                  </Link>\n                ),\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          </p>\n          <br />\n          <Button Link={Link} buttonStyle=\"secondary\" el=\"link\" to={adminRoute}>\n            {i18n.t('general:backToDashboard')}\n          </Button>\n        </div>\n      </MinimalTemplate>\n    )\n  }\n\n  return (\n    <MinimalTemplate className={resetPasswordBaseClass}>\n      <div className={`${resetPasswordBaseClass}__wrap`}>\n        <h1>{i18n.t('authentication:resetPassword')}</h1>\n        <ResetPasswordClient token={token} />\n      </div>\n    </MinimalTemplate>\n  )\n}\n"],"mappings":";AAEA,SAASA,MAAM,EAAEC,WAAW,QAAQ;AACpC,SAASC,cAAc,QAAQ;AAC/B,OAAOC,UAAA,MAAgB;AACvB,OAAOC,KAAA,MAAW;AAElB,SAASC,eAAe,QAAQ;AAChC,SAASC,mBAAmB,QAAQ;AAGpC,OAAO,MAAMC,sBAAA,GAAyB;AAEtC,MAAMC,IAAA,GAAQL,UAAA,CAAWM,OAAO,IAAIN,UAAA;AAEpC,SAASO,6BAA6B,QAAQ;AAE9C,OAAO,MAAMC,aAAA,GAA0CA,CAAC;EAAEC,cAAc;EAAEC;AAAM,CAAE;EAChF,MAAM;IAAEC;EAAG,CAAE,GAAGF,cAAA;EAEhB,MAAM;IACJG,QAAA,EAAU,CAACC,CAAA,EAAGC,KAAA;EAAM,CACrB,GAAGJ,MAAA;EAEJ,MAAM;IACJK,IAAI;IACJC,OAAA,EAAS;MAAEC;IAAM,CAAE;IACnBC;EAAI,CACL,GAAGP,GAAA;EAEJ,MAAM;IACJQ,KAAA,EAAO;MACLC,MAAA,EAAQ;QAAEC,OAAA,EAASC;MAAY;IAAE,CAClC;IACDF,MAAA,EAAQ;MAAED,KAAA,EAAOI;IAAU;EAAE,CAC9B,GAAGN,MAAA;EAEJ,IAAIC,IAAA,EAAM;IACR,oBACEM,IAAA,CAACtB,eAAA;MAAgBuB,SAAA,EAAWrB,sBAAA;gBAC1B,aAAAsB,KAAA,CAAC;QAAID,SAAA,EAAW,GAAGrB,sBAAA,QAA8B;gCAC/CoB,IAAA,CAAC;oBAAIT,IAAA,CAAKY,CAAC,CAAC;yBACZH,IAAA,CAAC;oBACC,aAAAA,IAAA,CAAC1B,WAAA;YACC8B,QAAA,EAAU;cACR,KAAKC,CAAC;gBAAEC;cAAQ,CAAE,kBAChBN,IAAA,CAACnB,IAAA;gBACC0B,IAAA,EAAMhC,cAAA,CAAe;kBACnBwB,UAAA;kBACAS,IAAA,EAAMV;gBACR;0BAECQ;;YAGP;YACAG,OAAA,EAAQ;YACRN,CAAA,EAAGZ,IAAA,CAAKY;;yBAGZH,IAAA,CAAC,W,aACDA,IAAA,CAAC3B,MAAA;UAAOQ,IAAA,EAAMA,IAAA;UAAM6B,WAAA,EAAY;UAAYC,EAAA,EAAG;UAAOC,EAAA,EAAIb,UAAA;oBACvDR,IAAA,CAAKY,CAAC,CAAC;;;;EAKlB;EAEA,oBACEH,IAAA,CAACtB,eAAA;IAAgBuB,SAAA,EAAWrB,sBAAA;cAC1B,aAAAsB,KAAA,CAAC;MAAID,SAAA,EAAW,GAAGrB,sBAAA,QAA8B;8BAC/CoB,IAAA,CAAC;kBAAIT,IAAA,CAAKY,CAAC,CAAC;uBACZH,IAAA,CAACrB,mBAAA;QAAoBW,KAAA,EAAOA;;;;AAIpC","ignoreList":[]}
+{"version":3,"file":"index.js","names":["Button","formatAdminURL","Translation","LinkImport","React","FormHeader","ResetPasswordForm","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","segments","_","token","i18n","payload","config","user","admin","routes","account","accountRoute","login","loginRoute","adminRoute","_jsxs","className","_jsx","description","elements","0","children","href","path","prefetch","i18nKey","t","heading","buttonStyle","el","size","to"],"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { Button } from '@payloadcms/ui'\nimport { formatAdminURL, Translation } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nimport { FormHeader } from '../../elements/FormHeader/index.js'\nimport './index.scss'\nimport { ResetPasswordForm } from './ResetPasswordForm/index.js'\n\nexport const resetPasswordBaseClass = 'reset-password'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport { generateResetPasswordMetadata } from './meta.js'\n\nexport const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params }) => {\n  const { req } = initPageResult\n\n  const {\n    segments: [_, token],\n  } = params\n\n  const {\n    i18n,\n    payload: { config },\n    user,\n  } = req\n\n  const {\n    admin: {\n      routes: { account: accountRoute, login: loginRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (user) {\n    return (\n      <div className={`${resetPasswordBaseClass}__wrap`}>\n        <FormHeader\n          description={\n            <Translation\n              elements={{\n                '0': ({ children }) => (\n                  <Link\n                    href={formatAdminURL({\n                      adminRoute,\n                      path: accountRoute,\n                    })}\n                    prefetch={false}\n                  >\n                    {children}\n                  </Link>\n                ),\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          }\n          heading={i18n.t('authentication:alreadyLoggedIn')}\n        />\n        <Button buttonStyle=\"secondary\" el=\"link\" Link={Link} size=\"large\" to={adminRoute}>\n          {i18n.t('general:backToDashboard')}\n        </Button>\n      </div>\n    )\n  }\n\n  return (\n    <div className={`${resetPasswordBaseClass}__wrap`}>\n      <FormHeader heading={i18n.t('authentication:resetPassword')} />\n      <ResetPasswordForm token={token} />\n      <Link\n        href={formatAdminURL({\n          adminRoute,\n          path: loginRoute,\n        })}\n        prefetch={false}\n      >\n        {i18n.t('authentication:backToLogin')}\n      </Link>\n    </div>\n  )\n}\n"],"mappings":";AAEA,SAASA,MAAM,QAAQ;AACvB,SAASC,cAAc,EAAEC,WAAW,QAAQ;AAC5C,OAAOC,UAAA,MAAgB;AACvB,OAAOC,KAAA,MAAW;AAElB,SAASC,UAAU,QAAQ;AAE3B,SAASC,iBAAiB,QAAQ;AAElC,OAAO,MAAMC,sBAAA,GAAyB;AAEtC,MAAMC,IAAA,GAAQL,UAAA,CAAWM,OAAO,IAAIN,UAAA;AAEpC,SAASO,6BAA6B,QAAQ;AAE9C,OAAO,MAAMC,aAAA,GAA0CA,CAAC;EAAEC,cAAc;EAAEC;AAAM,CAAE;EAChF,MAAM;IAAEC;EAAG,CAAE,GAAGF,cAAA;EAEhB,MAAM;IACJG,QAAA,EAAU,CAACC,CAAA,EAAGC,KAAA;EAAM,CACrB,GAAGJ,MAAA;EAEJ,MAAM;IACJK,IAAI;IACJC,OAAA,EAAS;MAAEC;IAAM,CAAE;IACnBC;EAAI,CACL,GAAGP,GAAA;EAEJ,MAAM;IACJQ,KAAA,EAAO;MACLC,MAAA,EAAQ;QAAEC,OAAA,EAASC,YAAY;QAAEC,KAAA,EAAOC;MAAU;IAAE,CACrD;IACDJ,MAAA,EAAQ;MAAED,KAAA,EAAOM;IAAU;EAAE,CAC9B,GAAGR,MAAA;EAEJ,IAAIC,IAAA,EAAM;IACR,oBACEQ,KAAA,CAAC;MAAIC,SAAA,EAAW,GAAGvB,sBAAA,QAA8B;8BAC/CwB,IAAA,CAAC1B,UAAA;QACC2B,WAAA,eACED,IAAA,CAAC7B,WAAA;UACC+B,QAAA,EAAU;YACR,KAAKC,CAAC;cAAEC;YAAQ,CAAE,kBAChBJ,IAAA,CAACvB,IAAA;cACC4B,IAAA,EAAMnC,cAAA,CAAe;gBACnB2B,UAAA;gBACAS,IAAA,EAAMZ;cACR;cACAa,QAAA,EAAU;wBAETH;;UAGP;UACAI,OAAA,EAAQ;UACRC,CAAA,EAAGtB,IAAA,CAAKsB;;QAGZC,OAAA,EAASvB,IAAA,CAAKsB,CAAC,CAAC;uBAElBT,IAAA,CAAC/B,MAAA;QAAO0C,WAAA,EAAY;QAAYC,EAAA,EAAG;QAAOnC,IAAA,EAAMA,IAAA;QAAMoC,IAAA,EAAK;QAAQC,EAAA,EAAIjB,UAAA;kBACpEV,IAAA,CAAKsB,CAAC,CAAC;;;EAIhB;EAEA,oBACEX,KAAA,CAAC;IAAIC,SAAA,EAAW,GAAGvB,sBAAA,QAA8B;4BAC/CwB,IAAA,CAAC1B,UAAA;MAAWoC,OAAA,EAASvB,IAAA,CAAKsB,CAAC,CAAC;qBAC5BT,IAAA,CAACzB,iBAAA;MAAkBW,KAAA,EAAOA;qBAC1Bc,IAAA,CAACvB,IAAA;MACC4B,IAAA,EAAMnC,cAAA,CAAe;QACnB2B,UAAA;QACAS,IAAA,EAAMV;MACR;MACAW,QAAA,EAAU;gBAETpB,IAAA,CAAKsB,CAAC,CAAC;;;AAIhB","ignoreList":[]}

package/dist/views/ResetPassword/index.scss

@@ -1,5 +1,11 @@
-.reset-password {
-  form > .field-type {
-    margin-bottom: var(--base);
+@import '../../scss/styles.scss';
+
+@layer payload-default {
+  .reset-password__wrap {
+    .inputWrap {
+      display: flex;
+      flex-direction: column;
+      gap: base(0.8);
+    }
   }
 }

package/dist/views/Root/getViewFromConfig.d.ts

@@ -1,4 +1,4 @@
-import type { AdminViewComponent, AdminViewProps, ImportMap, SanitizedConfig } from 'payload';
+import type { AdminViewComponent, AdminViewProps, CustomComponent, ImportMap, SanitizedConfig } from 'payload';
 import type React from 'react';
 import type { initPage } from '../../utilities/initPage/index.js';
 export type ViewFromConfig = {
@@ -17,7 +17,9 @@ export declare const getViewFromConfig: ({ adminRoute, config, currentRoute, imp
 }) => {
     DefaultView: ViewFromConfig;
     initPageOptions: Parameters<typeof initPage>[0];
+    serverProps: Record<string, unknown>;
     templateClassName: string;
     templateType: "default" | "minimal";
+    viewActions?: CustomComponent[];
 };
 //# sourceMappingURL=getViewFromConfig.d.ts.map

package/dist/views/Root/getViewFromConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getViewFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getViewFromConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAC7F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AA4BjE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,kBAAkB,CAAA;CACtC,CAAA;AAYD,eAAO,MAAM,iBAAiB,6EAO3B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,KAAG;IACF,WAAW,EAAE,cAAc,CAAA;IAC3B,eAAe,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;CA6JpC,CAAA"}
+{"version":3,"file":"getViewFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getViewFromConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACd,eAAe,EAEf,SAAS,EACT,eAAe,EAChB,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AA4BjE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,kBAAkB,CAAA;CACtC,CAAA;AA0BD,eAAO,MAAM,iBAAiB,6EAO3B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,KAAG;IACF,WAAW,EAAE,cAAc,CAAA;IAC3B,eAAe,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;IACnC,WAAW,CAAC,EAAE,eAAe,EAAE,CAAA;CAkShC,CAAA"}

package/dist/views/Root/getViewFromConfig.js

@@ -3,9 +3,9 @@ import { Account } from '../Account/index.js';
 import { CreateFirstUserView } from '../CreateFirstUser/index.js';
 import { Dashboard } from '../Dashboard/index.js';
 import { Document as DocumentView } from '../Document/index.js';
-import { ForgotPasswordView, forgotPasswordBaseClass } from '../ForgotPassword/index.js';
+import { forgotPasswordBaseClass, ForgotPasswordView } from '../ForgotPassword/index.js';
 import { ListView } from '../List/index.js';
-import { LoginView, loginBaseClass } from '../Login/index.js';
+import { loginBaseClass, LoginView } from '../Login/index.js';
 import { LogoutInactivity, LogoutView } from '../Logout/index.js';
 import { ResetPassword, resetPasswordBaseClass } from '../ResetPassword/index.js';
 import { UnauthorizedView } from '../Unauthorized/index.js';
@@ -28,6 +28,15 @@ const oneSegmentViews = {
   logout: LogoutView,
   unauthorized: UnauthorizedView
 };
+function getViewActions({
+  editConfig,
+  viewKey
+}) {
+  if (editConfig && viewKey in editConfig && 'actions' in editConfig[viewKey]) {
+    return editConfig[viewKey].actions;
+  }
+  return undefined;
+}
 export const getViewFromConfig = ({
   adminRoute,
   config,
@@ -45,9 +54,29 @@ export const getViewFromConfig = ({
     route: currentRoute,
     searchParams
   };
-  const [segmentOne, segmentTwo] = segments;
+  let viewActions = config?.admin?.components?.actions || [];
+  const [segmentOne, segmentTwo, segmentThree, segmentFour, segmentFive] = segments;
   const isGlobal = segmentOne === 'globals';
   const isCollection = segmentOne === 'collections';
+  let matchedCollection = undefined;
+  let matchedGlobal = undefined;
+  let serverProps = {};
+  if (isCollection) {
+    matchedCollection = config.collections.find(({
+      slug
+    }) => slug === segmentTwo);
+    serverProps = {
+      collectionConfig: matchedCollection
+    };
+  }
+  if (isGlobal) {
+    matchedGlobal = config.globals.find(({
+      slug
+    }) => slug === segmentTwo);
+    serverProps = {
+      globalConfig: matchedGlobal
+    };
+  }
   switch (segments.length) {
     case 0:
       {
@@ -57,7 +86,6 @@ export const getViewFromConfig = ({
           };
           templateClassName = 'dashboard';
           templateType = 'default';
-          initPageOptions.redirectUnauthenticatedUser = true;
         }
         break;
       }
@@ -95,7 +123,6 @@ export const getViewFromConfig = ({
           templateClassName = baseClasses[viewKey];
           templateType = 'minimal';
           if (viewKey === 'account') {
-            initPageOptions.redirectUnauthenticatedUser = true;
             templateType = 'default';
           }
         }
@@ -103,7 +130,7 @@ export const getViewFromConfig = ({
       }
     case 2:
       {
-        if (segmentOne === 'reset') {
+        if (`/${segmentOne}` === config.admin.routes.reset) {
           // --> /reset/:token
           ViewToRender = {
             Component: ResetPassword
@@ -111,22 +138,26 @@ export const getViewFromConfig = ({
           templateClassName = baseClasses[segmentTwo];
           templateType = 'minimal';
         }
-        if (isCollection) {
+        if (isCollection && matchedCollection) {
           // --> /collections/:collectionSlug
-          initPageOptions.redirectUnauthenticatedUser = true;
           ViewToRender = {
             Component: ListView
           };
           templateClassName = `${segmentTwo}-list`;
           templateType = 'default';
-        } else if (isGlobal) {
+          viewActions = viewActions.concat(matchedCollection.admin.components?.views?.list?.actions);
+        } else if (isGlobal && matchedGlobal) {
           // --> /globals/:globalSlug
-          initPageOptions.redirectUnauthenticatedUser = true;
           ViewToRender = {
             Component: DocumentView
           };
           templateClassName = 'global-edit';
           templateType = 'default';
+          // add default view actions
+          viewActions = viewActions.concat(getViewActions({
+            editConfig: matchedGlobal.admin?.components?.views?.edit,
+            viewKey: 'default'
+          }));
         }
         break;
       }
@@ -138,31 +169,113 @@ export const getViewFromConfig = ({
         };
         templateClassName = 'verify';
         templateType = 'minimal';
-      } else if (isCollection) {
+      } else if (isCollection && matchedCollection) {
         // Custom Views
         // --> /collections/:collectionSlug/:id
+        // --> /collections/:collectionSlug/:id/api
         // --> /collections/:collectionSlug/:id/preview
         // --> /collections/:collectionSlug/:id/versions
         // --> /collections/:collectionSlug/:id/versions/:versionId
-        // --> /collections/:collectionSlug/:id/api
-        initPageOptions.redirectUnauthenticatedUser = true;
         ViewToRender = {
           Component: DocumentView
         };
         templateClassName = `collection-default-edit`;
         templateType = 'default';
-      } else if (isGlobal) {
+        // Adds view actions to the current collection view
+        if (matchedCollection.admin?.components?.views?.edit) {
+          if ('root' in matchedCollection.admin.components.views.edit) {
+            viewActions = viewActions.concat(getViewActions({
+              editConfig: matchedCollection.admin?.components?.views?.edit,
+              viewKey: 'root'
+            }));
+          } else {
+            if (segmentFive) {
+              if (segmentFour === 'versions') {
+                // add version view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedCollection.admin?.components?.views?.edit,
+                  viewKey: 'version'
+                }));
+              }
+            } else if (segmentFour) {
+              if (segmentFour === 'versions') {
+                // add versions view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedCollection.admin?.components?.views.edit,
+                  viewKey: 'versions'
+                }));
+              } else if (segmentFour === 'preview') {
+                // add livePreview view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedCollection.admin?.components?.views.edit,
+                  viewKey: 'livePreview'
+                }));
+              } else if (segmentFour === 'api') {
+                // add api view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedCollection.admin?.components?.views.edit,
+                  viewKey: 'api'
+                }));
+              }
+            } else if (segmentThree) {
+              // add default view actions
+              viewActions = viewActions.concat(getViewActions({
+                editConfig: matchedCollection.admin?.components?.views.edit,
+                viewKey: 'default'
+              }));
+            }
+          }
+        }
+      } else if (isGlobal && matchedGlobal) {
         // Custom Views
         // --> /globals/:globalSlug/versions
         // --> /globals/:globalSlug/preview
         // --> /globals/:globalSlug/versions/:versionId
         // --> /globals/:globalSlug/api
-        initPageOptions.redirectUnauthenticatedUser = true;
         ViewToRender = {
           Component: DocumentView
         };
         templateClassName = `global-edit`;
         templateType = 'default';
+        // Adds view actions to the current global view
+        if (matchedGlobal.admin?.components?.views?.edit) {
+          if ('root' in matchedGlobal.admin.components.views.edit) {
+            viewActions = viewActions.concat(getViewActions({
+              editConfig: matchedGlobal.admin.components?.views?.edit,
+              viewKey: 'root'
+            }));
+          } else {
+            if (segmentFour) {
+              if (segmentThree === 'versions') {
+                // add version view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedGlobal.admin?.components?.views?.edit,
+                  viewKey: 'version'
+                }));
+              }
+            } else if (segmentThree) {
+              if (segmentThree === 'versions') {
+                // add versions view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedGlobal.admin?.components?.views?.edit,
+                  viewKey: 'versions'
+                }));
+              } else if (segmentThree === 'preview') {
+                // add livePreview view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedGlobal.admin?.components?.views?.edit,
+                  viewKey: 'livePreview'
+                }));
+              } else if (segmentThree === 'api') {
+                // add api view actions
+                viewActions = viewActions.concat(getViewActions({
+                  editConfig: matchedGlobal.admin?.components?.views?.edit,
+                  viewKey: 'api'
+                }));
+              }
+            }
+          }
+        }
       }
       break;
   }
@@ -175,8 +288,10 @@ export const getViewFromConfig = ({
   return {
     DefaultView: ViewToRender,
     initPageOptions,
+    serverProps,
     templateClassName,
-    templateType
+    templateType,
+    viewActions: viewActions.reverse()
   };
 };
 //# sourceMappingURL=getViewFromConfig.js.map