@payloadcms/next 3.0.0-beta.6 → 3.0.0-beta.60

package/dist/views/NotFound/index.js

@@ -1,8 +1,9 @@
-import { HydrateClientUser } from '@payloadcms/ui/elements/HydrateClientUser';
-import { DefaultTemplate } from '@payloadcms/ui/templates/Default';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { HydrateClientUser } from '@payloadcms/ui';
 import React, { Fragment } from 'react';
+import { DefaultTemplate } from '../../templates/Default/index.js';
 import { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js';
-import { initPage } from '../../utilities/initPage.js';
+import { initPage } from '../../utilities/initPage/index.js';
 import { NotFoundClient } from './index.client.js';
 export const generatePageMetadata = async ({ config: configPromise })=>{
     const config = await configPromise;
@@ -13,23 +14,37 @@ export const generatePageMetadata = async ({ config: configPromise })=>{
         title: i18n.t('general:notFound')
     };
 };
-export const NotFoundPage = async ({ config: configPromise, searchParams })=>{
+export const NotFoundPage = async ({ config: configPromise, params, searchParams })=>{
+    const config = await configPromise;
+    const { routes: { admin: adminRoute } = {} } = config;
     const initPageResult = await initPage({
-        config: configPromise,
+        config,
         redirectUnauthenticatedUser: true,
-        route: '/not-found',
+        route: `${adminRoute}/not-found`,
         searchParams
     });
-    return /*#__PURE__*/ React.createElement(Fragment, null, /*#__PURE__*/ React.createElement(HydrateClientUser, {
-        permissions: initPageResult.permissions,
-        user: initPageResult.req.user
-    }), /*#__PURE__*/ React.createElement(DefaultTemplate, {
-        config: initPageResult.req.payload.config,
-        visibleEntities: initPageResult.visibleEntities
-    }, /*#__PURE__*/ React.createElement(NotFoundClient, null)));
+    return /*#__PURE__*/ _jsxs(Fragment, {
+        children: [
+            /*#__PURE__*/ _jsx(HydrateClientUser, {
+                permissions: initPageResult.permissions,
+                user: initPageResult.req.user
+            }),
+            /*#__PURE__*/ _jsx(DefaultTemplate, {
+                i18n: initPageResult.req.i18n,
+                locale: initPageResult.locale,
+                params: params,
+                payload: initPageResult.req.payload,
+                permissions: initPageResult.permissions,
+                searchParams: searchParams,
+                user: initPageResult.req.user,
+                visibleEntities: initPageResult.visibleEntities,
+                children: /*#__PURE__*/ _jsx(NotFoundClient, {})
+            })
+        ]
+    });
 };
 export const NotFoundView = ()=>{
-    return /*#__PURE__*/ React.createElement(NotFoundClient, {
+    return /*#__PURE__*/ _jsx(NotFoundClient, {
         marginTop: "large"
     });
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { AdminViewComponent, SanitizedConfig } from 'payload/types'\n\nimport { HydrateClientUser } from '@payloadcms/ui/elements/HydrateClientUser'\nimport { DefaultTemplate } from '@payloadcms/ui/templates/Default'\nimport React, { Fragment } from 'react'\n\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n  //eslint-disable-next-line @typescript-eslint/require-await\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const initPageResult = await initPage({\n    config: configPromise,\n    redirectUnauthenticatedUser: true,\n    route: '/not-found',\n    searchParams,\n  })\n\n  return (\n    <Fragment>\n      <HydrateClientUser permissions={initPageResult.permissions} user={initPageResult.req.user} />\n      <DefaultTemplate\n        config={initPageResult.req.payload.config}\n        visibleEntities={initPageResult.visibleEntities}\n      >\n        <NotFoundClient />\n      </DefaultTemplate>\n    </Fragment>\n  )\n}\n\nexport const NotFoundView: AdminViewComponent = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["HydrateClientUser","DefaultTemplate","React","Fragment","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","searchParams","initPageResult","redirectUnauthenticatedUser","route","permissions","user","req","payload","visibleEntities","NotFoundView","marginTop"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,iBAAiB,QAAQ,4CAA2C;AAC7E,SAASC,eAAe,QAAQ,mCAAkC;AAClE,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,8BAA6B;AACtD,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAKtB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,YAAY,EASb;IACC,MAAMC,iBAAiB,MAAMV,SAAS;QACpCG,QAAQC;QACRO,6BAA6B;QAC7BC,OAAO;QACPH;IACF;IAEA,qBACE,oBAACX,8BACC,oBAACH;QAAkBkB,aAAaH,eAAeG,WAAW;QAAEC,MAAMJ,eAAeK,GAAG,CAACD,IAAI;sBACzF,oBAAClB;QACCO,QAAQO,eAAeK,GAAG,CAACC,OAAO,CAACb,MAAM;QACzCc,iBAAiBP,eAAeO,eAAe;qBAE/C,oBAAChB;AAIT,EAAC;AAED,OAAO,MAAMiB,eAAmC;IAC9C,qBAAO,oBAACjB;QAAekB,WAAU;;AACnC,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { HydrateClientUser } from '@payloadcms/ui'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n  //eslint-disable-next-line @typescript-eslint/require-await\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  params,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n  const { routes: { admin: adminRoute } = {} } = config\n\n  const initPageResult = await initPage({\n    config,\n    redirectUnauthenticatedUser: true,\n    route: `${adminRoute}/not-found`,\n    searchParams,\n  })\n\n  return (\n    <Fragment>\n      <HydrateClientUser permissions={initPageResult.permissions} user={initPageResult.req.user} />\n      <DefaultTemplate\n        i18n={initPageResult.req.i18n}\n        locale={initPageResult.locale}\n        params={params}\n        payload={initPageResult.req.payload}\n        permissions={initPageResult.permissions}\n        searchParams={searchParams}\n        user={initPageResult.req.user}\n        visibleEntities={initPageResult.visibleEntities}\n      >\n        <NotFoundClient />\n      </DefaultTemplate>\n    </Fragment>\n  )\n}\n\nexport const NotFoundView: AdminViewComponent = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["HydrateClientUser","React","Fragment","DefaultTemplate","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","params","searchParams","routes","admin","adminRoute","initPageResult","redirectUnauthenticatedUser","route","permissions","user","req","locale","payload","visibleEntities","NotFoundView","marginTop"],"mappings":";AAIA,SAASA,iBAAiB,QAAQ,iBAAgB;AAClD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAKtB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,MAAM,EACNC,YAAY,EASb;IACC,MAAMP,SAAS,MAAMC;IACrB,MAAM,EAAEO,QAAQ,EAAEC,OAAOC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,GAAGV;IAE/C,MAAMW,iBAAiB,MAAMd,SAAS;QACpCG;QACAY,6BAA6B;QAC7BC,OAAO,CAAC,EAAEH,WAAW,UAAU,CAAC;QAChCH;IACF;IAEA,qBACE,MAACb;;0BACC,KAACF;gBAAkBsB,aAAaH,eAAeG,WAAW;gBAAEC,MAAMJ,eAAeK,GAAG,CAACD,IAAI;;0BACzF,KAACpB;gBACCO,MAAMS,eAAeK,GAAG,CAACd,IAAI;gBAC7Be,QAAQN,eAAeM,MAAM;gBAC7BX,QAAQA;gBACRY,SAASP,eAAeK,GAAG,CAACE,OAAO;gBACnCJ,aAAaH,eAAeG,WAAW;gBACvCP,cAAcA;gBACdQ,MAAMJ,eAAeK,GAAG,CAACD,IAAI;gBAC7BI,iBAAiBR,eAAeQ,eAAe;0BAE/C,cAAA,KAACrB;;;;AAIT,EAAC;AAED,OAAO,MAAMsB,eAAmC;IAC9C,qBAAO,KAACtB;QAAeuB,WAAU;;AACnC,EAAC"}

package/dist/views/NotFound/meta.d.ts

@@ -1,6 +1,6 @@
 import type { I18n } from '@payloadcms/translations';
 import type { Metadata } from 'next';
-import type { SanitizedConfig } from 'payload/types';
+import type { SanitizedConfig } from 'payload';
 export declare const generateNotFoundMeta: ({ config, i18n, }: {
     config: SanitizedConfig;
     i18n: I18n;

package/dist/views/NotFound/meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAIpD,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;CACX,KAAG,QAAQ,QAAQ,CAOnB,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;CACX,KAAG,OAAO,CAAC,QAAQ,CAMhB,CAAA"}

package/dist/views/NotFound/meta.js

@@ -1,11 +1,9 @@
 import { meta } from '../../utilities/meta.js';
-export const generateNotFoundMeta = ({ config, i18n })=>{
-    return meta({
-        config,
+export const generateNotFoundMeta = async ({ config, i18n })=>meta({
         description: i18n.t('general:pageNotFound'),
         keywords: `404 ${i18n.t('general:notFound')}`,
+        serverURL: config.serverURL,
         title: i18n.t('general:notFound')
     });
-};
 
 //# sourceMappingURL=meta.js.map

package/dist/views/NotFound/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload/types'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18n\n}): Promise<Metadata> => {\n  return meta({\n    config,\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    title: i18n.t('general:notFound'),\n  })\n}\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","title"],"rangeMappings":";;;;;;;;","mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,IAAI,EAIL;IACC,OAAOH,KAAK;QACVE;QACAE,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,OAAOJ,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = async ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18n\n}): Promise<Metadata> =>\n  meta({\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    serverURL: config.serverURL,\n    title: i18n.t('general:notFound'),\n  })\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","serverURL","title"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,MAAM,EACNC,IAAI,EAIL,GACCH,KAAK;QACHI,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,WAAWL,OAAOK,SAAS;QAC3BC,OAAOL,KAAKE,CAAC,CAAC;IAChB,GAAE"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.client.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAeD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAsC9C,CAAA"}

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

@@ -0,0 +1,81 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ConfirmPasswordField, Form, FormSubmit, HiddenField, PasswordField, useAuth, useConfig, useFormFields, useTranslation } from '@payloadcms/ui';
+import { useRouter } from 'next/navigation.js';
+import React from 'react';
+import { toast } from 'sonner';
+const initialState = {
+    'confirm-password': {
+        initialValue: '',
+        valid: false,
+        value: ''
+    },
+    password: {
+        initialValue: '',
+        valid: false,
+        value: ''
+    }
+};
+export const ResetPasswordClient = ({ token })=>{
+    const i18n = useTranslation();
+    const { admin: { user: userSlug }, routes: { admin, api }, serverURL } = useConfig();
+    const history = useRouter();
+    const { fetchFullUser } = useAuth();
+    const onSuccess = React.useCallback(async (data)=>{
+        if (data.token) {
+            await fetchFullUser();
+            history.push(`${admin}`);
+        } else {
+            history.push(`${admin}/login`);
+            toast.success(i18n.t('general:updatedSuccessfully'));
+        }
+    }, [
+        fetchFullUser,
+        history,
+        admin,
+        i18n
+    ]);
+    return /*#__PURE__*/ _jsxs(Form, {
+        action: `${serverURL}${api}/${userSlug}/reset-password`,
+        initialState: initialState,
+        method: "POST",
+        onSuccess: onSuccess,
+        children: [
+            /*#__PURE__*/ _jsx(PasswordToConfirm, {}),
+            /*#__PURE__*/ _jsx(ConfirmPasswordField, {}),
+            /*#__PURE__*/ _jsx(HiddenField, {
+                forceUsePathFromProps: true,
+                name: "token",
+                value: token
+            }),
+            /*#__PURE__*/ _jsx(FormSubmit, {
+                children: i18n.t('authentication:resetPassword')
+            })
+        ]
+    });
+};
+const PasswordToConfirm = ()=>{
+    const { t } = useTranslation();
+    const { value: confirmValue } = useFormFields(([fields])=>fields && fields?.['confirm-password'] || null);
+    const validate = React.useCallback((value)=>{
+        if (!value) {
+            return t('validation:required');
+        }
+        if (value === confirmValue) {
+            return true;
+        }
+        return t('fields:passwordsDoNotMatch');
+    }, [
+        confirmValue,
+        t
+    ]);
+    return /*#__PURE__*/ _jsx(PasswordField, {
+        autoComplete: "off",
+        label: t('authentication:newPassword'),
+        name: "password",
+        required: true,
+        validate: validate
+    });
+};
+
+//# sourceMappingURL=index.client.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/views/ResetPassword/index.client.tsx"],"sourcesContent":["'use client'\nimport type { FormState } from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  FormSubmit,\n  HiddenField,\n  PasswordField,\n  useAuth,\n  useConfig,\n  useFormFields,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { useRouter } from 'next/navigation.js'\nimport React from 'react'\nimport { toast } from 'sonner'\n\ntype Args = {\n  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 ResetPasswordClient: React.FC<Args> = ({ token }) => {\n  const i18n = useTranslation()\n  const {\n    admin: { user: userSlug },\n    routes: { admin, api },\n    serverURL,\n  } = useConfig()\n\n  const history = useRouter()\n\n  const { fetchFullUser } = useAuth()\n\n  const onSuccess = React.useCallback(\n    async (data) => {\n      if (data.token) {\n        await fetchFullUser()\n        history.push(`${admin}`)\n      } else {\n        history.push(`${admin}/login`)\n        toast.success(i18n.t('general:updatedSuccessfully'))\n      }\n    },\n    [fetchFullUser, history, admin, i18n],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${api}/${userSlug}/reset-password`}\n      initialState={initialState}\n      method=\"POST\"\n      onSuccess={onSuccess}\n    >\n      <PasswordToConfirm />\n      <ConfirmPasswordField />\n      <HiddenField forceUsePathFromProps name=\"token\" value={token} />\n      <FormSubmit>{i18n.t('authentication:resetPassword')}</FormSubmit>\n    </Form>\n  )\n}\n\nconst PasswordToConfirm = () => {\n  const { t } = useTranslation()\n  const { value: confirmValue } = useFormFields(\n    ([fields]) => (fields && fields?.['confirm-password']) || null,\n  )\n\n  const validate = React.useCallback(\n    (value: string) => {\n      if (!value) {\n        return t('validation:required')\n      }\n\n      if (value === confirmValue) {\n        return true\n      }\n\n      return t('fields:passwordsDoNotMatch')\n    },\n    [confirmValue, t],\n  )\n\n  return (\n    <PasswordField\n      autoComplete=\"off\"\n      label={t('authentication:newPassword')}\n      name=\"password\"\n      required\n      validate={validate}\n    />\n  )\n}\n"],"names":["ConfirmPasswordField","Form","FormSubmit","HiddenField","PasswordField","useAuth","useConfig","useFormFields","useTranslation","useRouter","React","toast","initialState","initialValue","valid","value","password","ResetPasswordClient","token","i18n","admin","user","userSlug","routes","api","serverURL","history","fetchFullUser","onSuccess","useCallback","data","push","success","t","action","method","PasswordToConfirm","forceUsePathFromProps","name","confirmValue","fields","validate","autoComplete","label","required"],"mappings":"AAAA;;AAGA,SACEA,oBAAoB,EACpBC,IAAI,EACJC,UAAU,EACVC,WAAW,EACXC,aAAa,EACbC,OAAO,EACPC,SAAS,EACTC,aAAa,EACbC,cAAc,QACT,iBAAgB;AACvB,SAASC,SAAS,QAAQ,qBAAoB;AAC9C,OAAOC,WAAW,QAAO;AACzB,SAASC,KAAK,QAAQ,SAAQ;AAM9B,MAAMC,eAA0B;IAC9B,oBAAoB;QAClBC,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;IACAC,UAAU;QACRH,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;AACF;AAEA,OAAO,MAAME,sBAAsC,CAAC,EAAEC,KAAK,EAAE;IAC3D,MAAMC,OAAOX;IACb,MAAM,EACJY,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EACzBC,QAAQ,EAAEH,KAAK,EAAEI,GAAG,EAAE,EACtBC,SAAS,EACV,GAAGnB;IAEJ,MAAMoB,UAAUjB;IAEhB,MAAM,EAAEkB,aAAa,EAAE,GAAGtB;IAE1B,MAAMuB,YAAYlB,MAAMmB,WAAW,CACjC,OAAOC;QACL,IAAIA,KAAKZ,KAAK,EAAE;YACd,MAAMS;YACND,QAAQK,IAAI,CAAC,CAAC,EAAEX,MAAM,CAAC;QACzB,OAAO;YACLM,QAAQK,IAAI,CAAC,CAAC,EAAEX,MAAM,MAAM,CAAC;YAC7BT,MAAMqB,OAAO,CAACb,KAAKc,CAAC,CAAC;QACvB;IACF,GACA;QAACN;QAAeD;QAASN;QAAOD;KAAK;IAGvC,qBACE,MAAClB;QACCiC,QAAQ,CAAC,EAAET,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,eAAe,CAAC;QACvDV,cAAcA;QACduB,QAAO;QACPP,WAAWA;;0BAEX,KAACQ;0BACD,KAACpC;0BACD,KAACG;gBAAYkC,qBAAqB;gBAACC,MAAK;gBAAQvB,OAAOG;;0BACvD,KAAChB;0BAAYiB,KAAKc,CAAC,CAAC;;;;AAG1B,EAAC;AAED,MAAMG,oBAAoB;IACxB,MAAM,EAAEH,CAAC,EAAE,GAAGzB;IACd,MAAM,EAAEO,OAAOwB,YAAY,EAAE,GAAGhC,cAC9B,CAAC,CAACiC,OAAO,GAAK,AAACA,UAAUA,QAAQ,CAAC,mBAAmB,IAAK;IAG5D,MAAMC,WAAW/B,MAAMmB,WAAW,CAChC,CAACd;QACC,IAAI,CAACA,OAAO;YACV,OAAOkB,EAAE;QACX;QAEA,IAAIlB,UAAUwB,cAAc;YAC1B,OAAO;QACT;QAEA,OAAON,EAAE;IACX,GACA;QAACM;QAAcN;KAAE;IAGnB,qBACE,KAAC7B;QACCsC,cAAa;QACbC,OAAOV,EAAE;QACTK,MAAK;QACLM,QAAQ;QACRH,UAAUA;;AAGhB"}

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

@@ -1,4 +1,4 @@
-import type { AdminViewProps } from 'payload/types';
+import type { AdminViewProps } from 'payload';
 import React from 'react';
 import './index.scss';
 export declare const resetPasswordBaseClass = "reset-password";

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,eAAe,CAAA;AAWnD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,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,CAyElD,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;AAI7C,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,CAmDlD,CAAA"}

package/dist/views/ResetPassword/index.js

@@ -1,69 +1,64 @@
-import { Button } from '@payloadcms/ui/elements/Button';
-import { Translation } from '@payloadcms/ui/elements/Translation';
-import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword';
-import { HiddenInput } from '@payloadcms/ui/fields/HiddenInput';
-import { Password } from '@payloadcms/ui/fields/Password';
-import { Form } from '@payloadcms/ui/forms/Form';
-import { FormSubmit } from '@payloadcms/ui/forms/Submit';
-import { MinimalTemplate } from '@payloadcms/ui/templates/Minimal';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button, Translation } from '@payloadcms/ui';
 import LinkImport from 'next/link.js';
 import React from 'react';
+import { MinimalTemplate } from '../../templates/Minimal/index.js';
+import { ResetPasswordClient } from './index.client.js';
 export const resetPasswordBaseClass = 'reset-password';
 const Link = LinkImport.default || LinkImport;
 export { generateResetPasswordMetadata } from './meta.js';
 export const ResetPassword = ({ initPageResult, params })=>{
     const { req } = initPageResult;
-    const { token } = params;
+    const { segments: [_, token] } = params;
     const { i18n, payload: { config }, user } = req;
-    const { admin: { user: userSlug }, routes: { admin, api }, serverURL } = config;
-    // const onSuccess = async (data) => {
-    //   if (data.token) {
-    //     await fetchFullUser()
-    //     history.push(`${admin}`)
-    //   } else {
-    //     history.push(`${admin}/login`)
-    //     toast.success(i18n.t('general:updatedSuccessfully'), { autoClose: 3000 })
-    //   }
-    // }
+    const { admin: { routes: { account: accountRoute } }, routes: { admin } } = config;
     if (user) {
-        return /*#__PURE__*/ React.createElement(MinimalTemplate, {
-            className: resetPasswordBaseClass
-        }, /*#__PURE__*/ React.createElement("div", {
-            className: `${resetPasswordBaseClass}__wrap`
-        }, /*#__PURE__*/ React.createElement("h1", null, i18n.t('authentication:alreadyLoggedIn')), /*#__PURE__*/ React.createElement("p", null, /*#__PURE__*/ React.createElement(Translation, {
-            elements: {
-                '0': ({ children })=>/*#__PURE__*/ React.createElement(Link, {
-                        href: `${admin}/account`
-                    }, children)
-            },
-            i18nKey: "authentication:loggedInChangePassword",
-            t: i18n.t
-        })), /*#__PURE__*/ React.createElement("br", null), /*#__PURE__*/ React.createElement(Button, {
-            Link: Link,
-            buttonStyle: "secondary",
-            el: "link",
-            to: admin
-        }, i18n.t('general:backToDashboard'))));
+        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: `${admin}${accountRoute}`,
+                                        children: children
+                                    })
+                            },
+                            i18nKey: "authentication:loggedInChangePassword",
+                            t: i18n.t
+                        })
+                    }),
+                    /*#__PURE__*/ _jsx("br", {}),
+                    /*#__PURE__*/ _jsx(Button, {
+                        Link: Link,
+                        buttonStyle: "secondary",
+                        el: "link",
+                        to: admin,
+                        children: i18n.t('general:backToDashboard')
+                    })
+                ]
+            })
+        });
     }
-    return /*#__PURE__*/ React.createElement(MinimalTemplate, {
-        className: resetPasswordBaseClass
-    }, /*#__PURE__*/ React.createElement("div", {
-        className: `${resetPasswordBaseClass}__wrap`
-    }, /*#__PURE__*/ React.createElement("h1", null, i18n.t('authentication:resetPassword')), /*#__PURE__*/ React.createElement(Form, {
-        action: `${serverURL}${api}/${userSlug}/reset-password`,
-        method: "POST",
-        // onSuccess={onSuccess}
-        redirect: admin
-    }, /*#__PURE__*/ React.createElement(Password, {
-        autoComplete: "off",
-        label: i18n.t('authentication:newPassword'),
-        name: "password",
-        required: true
-    }), /*#__PURE__*/ React.createElement(ConfirmPassword, null), /*#__PURE__*/ React.createElement(HiddenInput, {
-        forceUsePathFromProps: true,
-        name: "token",
-        value: token
-    }), /*#__PURE__*/ React.createElement(FormSubmit, null, i18n.t('authentication:resetPassword')))));
+    return /*#__PURE__*/ _jsx(MinimalTemplate, {
+        className: resetPasswordBaseClass,
+        children: /*#__PURE__*/ _jsxs("div", {
+            className: `${resetPasswordBaseClass}__wrap`,
+            children: [
+                /*#__PURE__*/ _jsx("h1", {
+                    children: i18n.t('authentication:resetPassword')
+                }),
+                /*#__PURE__*/ _jsx(ResetPasswordClient, {
+                    token: token
+                })
+            ]
+        })
+    });
 };
 
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload/types'\n\nimport { Button } from '@payloadcms/ui/elements/Button'\nimport { Translation } from '@payloadcms/ui/elements/Translation'\nimport { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'\nimport { HiddenInput } from '@payloadcms/ui/fields/HiddenInput'\nimport { Password } from '@payloadcms/ui/fields/Password'\nimport { Form } from '@payloadcms/ui/forms/Form'\nimport { FormSubmit } from '@payloadcms/ui/forms/Submit'\nimport { MinimalTemplate } from '@payloadcms/ui/templates/Minimal'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\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 { token } = params\n\n  const {\n    i18n,\n    payload: { config },\n    user,\n  } = req\n\n  const {\n    admin: { user: userSlug },\n    routes: { admin, api },\n    serverURL,\n  } = config\n\n  // const onSuccess = async (data) => {\n  //   if (data.token) {\n  //     await fetchFullUser()\n  //     history.push(`${admin}`)\n  //   } else {\n  //     history.push(`${admin}/login`)\n  //     toast.success(i18n.t('general:updatedSuccessfully'), { autoClose: 3000 })\n  //   }\n  // }\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 }) => <Link href={`${admin}/account`}>{children}</Link>,\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          </p>\n          <br />\n          <Button Link={Link} buttonStyle=\"secondary\" el=\"link\" to={admin}>\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        <Form\n          action={`${serverURL}${api}/${userSlug}/reset-password`}\n          method=\"POST\"\n          // onSuccess={onSuccess}\n          redirect={admin}\n        >\n          <Password\n            autoComplete=\"off\"\n            label={i18n.t('authentication:newPassword')}\n            name=\"password\"\n            required\n          />\n          <ConfirmPassword />\n          <HiddenInput forceUsePathFromProps name=\"token\" value={token} />\n          <FormSubmit>{i18n.t('authentication:resetPassword')}</FormSubmit>\n        </Form>\n      </div>\n    </MinimalTemplate>\n  )\n}\n"],"names":["Button","Translation","ConfirmPassword","HiddenInput","Password","Form","FormSubmit","MinimalTemplate","LinkImport","React","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","token","i18n","payload","config","user","admin","userSlug","routes","api","serverURL","className","div","h1","t","p","elements","children","href","i18nKey","br","buttonStyle","el","to","action","method","redirect","autoComplete","label","name","required","forceUsePathFromProps","value"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,MAAM,QAAQ,iCAAgC;AACvD,SAASC,WAAW,QAAQ,sCAAqC;AACjE,SAASC,eAAe,QAAQ,wCAAuC;AACvE,SAASC,WAAW,QAAQ,oCAAmC;AAC/D,SAASC,QAAQ,QAAQ,iCAAgC;AACzD,SAASC,IAAI,QAAQ,4BAA2B;AAChD,SAASC,UAAU,QAAQ,8BAA6B;AACxD,SAASC,eAAe,QAAQ,mCAAkC;AAClE,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAIzB,OAAO,MAAMC,yBAAyB,iBAAgB;AAEtD,MAAMC,OAAQH,WAAWI,OAAO,IAAIJ;AAEpC,SAASK,6BAA6B,QAAQ,YAAW;AAEzD,OAAO,MAAMC,gBAA0C,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAE;IAChF,MAAM,EAAEC,GAAG,EAAE,GAAGF;IAEhB,MAAM,EAAEG,KAAK,EAAE,GAAGF;IAElB,MAAM,EACJG,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,GAAGL;IAEJ,MAAM,EACJM,OAAO,EAAED,MAAME,QAAQ,EAAE,EACzBC,QAAQ,EAAEF,KAAK,EAAEG,GAAG,EAAE,EACtBC,SAAS,EACV,GAAGN;IAEJ,sCAAsC;IACtC,sBAAsB;IACtB,4BAA4B;IAC5B,+BAA+B;IAC/B,aAAa;IACb,qCAAqC;IACrC,gFAAgF;IAChF,MAAM;IACN,IAAI;IAEJ,IAAIC,MAAM;QACR,qBACE,oBAACf;YAAgBqB,WAAWlB;yBAC1B,oBAACmB;YAAID,WAAW,CAAC,EAAElB,uBAAuB,MAAM,CAAC;yBAC/C,oBAACoB,YAAIX,KAAKY,CAAC,CAAC,kDACZ,oBAACC,yBACC,oBAAC/B;YACCgC,UAAU;gBACR,KAAK,CAAC,EAAEC,QAAQ,EAAE,iBAAK,oBAACvB;wBAAKwB,MAAM,CAAC,EAAEZ,MAAM,QAAQ,CAAC;uBAAGW;YAC1D;YACAE,SAAQ;YACRL,GAAGZ,KAAKY,CAAC;2BAGb,oBAACM,2BACD,oBAACrC;YAAOW,MAAMA;YAAM2B,aAAY;YAAYC,IAAG;YAAOC,IAAIjB;WACvDJ,KAAKY,CAAC,CAAC;IAKlB;IAEA,qBACE,oBAACxB;QAAgBqB,WAAWlB;qBAC1B,oBAACmB;QAAID,WAAW,CAAC,EAAElB,uBAAuB,MAAM,CAAC;qBAC/C,oBAACoB,YAAIX,KAAKY,CAAC,CAAC,gDACZ,oBAAC1B;QACCoC,QAAQ,CAAC,EAAEd,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,eAAe,CAAC;QACvDkB,QAAO;QACP,wBAAwB;QACxBC,UAAUpB;qBAEV,oBAACnB;QACCwC,cAAa;QACbC,OAAO1B,KAAKY,CAAC,CAAC;QACde,MAAK;QACLC,UAAAA;sBAEF,oBAAC7C,sCACD,oBAACC;QAAY6C,uBAAAA;QAAsBF,MAAK;QAAQG,OAAO/B;sBACvD,oBAACZ,kBAAYa,KAAKY,CAAC,CAAC;AAK9B,EAAC"}
+{"version":3,"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { Button, Translation } from '@payloadcms/ui'\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 },\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 }) => <Link href={`${admin}${accountRoute}`}>{children}</Link>,\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          </p>\n          <br />\n          <Button Link={Link} buttonStyle=\"secondary\" el=\"link\" to={admin}>\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"],"names":["Button","Translation","LinkImport","React","MinimalTemplate","ResetPasswordClient","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","segments","_","token","i18n","payload","config","user","admin","routes","account","accountRoute","className","div","h1","t","p","elements","children","href","i18nKey","br","buttonStyle","el","to"],"mappings":";AAEA,SAASA,MAAM,EAAEC,WAAW,QAAQ,iBAAgB;AACpD,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,mBAAmB,QAAQ,oBAAmB;AAGvD,OAAO,MAAMC,yBAAyB,iBAAgB;AAEtD,MAAMC,OAAQL,WAAWM,OAAO,IAAIN;AAEpC,SAASO,6BAA6B,QAAQ,YAAW;AAEzD,OAAO,MAAMC,gBAA0C,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAE;IAChF,MAAM,EAAEC,GAAG,EAAE,GAAGF;IAEhB,MAAM,EACJG,UAAU,CAACC,GAAGC,MAAM,EACrB,GAAGJ;IAEJ,MAAM,EACJK,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,GAAGP;IAEJ,MAAM,EACJQ,OAAO,EACLC,QAAQ,EAAEC,SAASC,YAAY,EAAE,EAClC,EACDF,QAAQ,EAAED,KAAK,EAAE,EAClB,GAAGF;IAEJ,IAAIC,MAAM;QACR,qBACE,KAAChB;YAAgBqB,WAAWnB;sBAC1B,cAAA,MAACoB;gBAAID,WAAW,CAAC,EAAEnB,uBAAuB,MAAM,CAAC;;kCAC/C,KAACqB;kCAAIV,KAAKW,CAAC,CAAC;;kCACZ,KAACC;kCACC,cAAA,KAAC5B;4BACC6B,UAAU;gCACR,KAAK,CAAC,EAAEC,QAAQ,EAAE,iBAAK,KAACxB;wCAAKyB,MAAM,CAAC,EAAEX,MAAM,EAAEG,aAAa,CAAC;kDAAGO;;4BACjE;4BACAE,SAAQ;4BACRL,GAAGX,KAAKW,CAAC;;;kCAGb,KAACM;kCACD,KAAClC;wBAAOO,MAAMA;wBAAM4B,aAAY;wBAAYC,IAAG;wBAAOC,IAAIhB;kCACvDJ,KAAKW,CAAC,CAAC;;;;;IAKlB;IAEA,qBACE,KAACxB;QAAgBqB,WAAWnB;kBAC1B,cAAA,MAACoB;YAAID,WAAW,CAAC,EAAEnB,uBAAuB,MAAM,CAAC;;8BAC/C,KAACqB;8BAAIV,KAAKW,CAAC,CAAC;;8BACZ,KAACvB;oBAAoBW,OAAOA;;;;;AAIpC,EAAC"}

package/dist/views/ResetPassword/index.scss

@@ -1,15 +1,5 @@
 .reset-password {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  min-height: 100vh;
-
-  &__wrap {
-    margin: 0 auto var(--base);
-    width: 100%;
-
-    svg {
-      width: 100%;
-    }
+  form > .field-type {
+    margin-bottom: var(--base);
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/meta.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAI5D,eAAO,MAAM,6BAA6B,EAAE,oBAU3C,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/meta.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAI5D,eAAO,MAAM,6BAA6B,EAAE,oBAUxC,CAAA"}

package/dist/views/ResetPassword/meta.js

@@ -1,11 +1,10 @@
 import { meta } from '../../utilities/meta.js';
-export const generateResetPasswordMetadata = async ({ config, i18n: { t } })=>{
-    return meta({
-        config,
+export const generateResetPasswordMetadata = async ({ config, i18n: { t } })=>meta({
         description: t('authentication:resetPassword'),
         keywords: t('authentication:resetPassword'),
-        title: t('authentication:resetPassword')
+        serverURL: config.serverURL,
+        title: t('authentication:resetPassword'),
+        ...config.admin.meta || {}
     });
-};
 
 //# sourceMappingURL=meta.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/ResetPassword/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\n\nimport type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateResetPasswordMetadata: GenerateViewMetadata = async ({\n  config,\n  i18n: { t },\n}): Promise<Metadata> => {\n  return meta({\n    config,\n    description: t('authentication:resetPassword'),\n    keywords: t('authentication:resetPassword'),\n    title: t('authentication:resetPassword'),\n  })\n}\n"],"names":["meta","generateResetPasswordMetadata","config","i18n","t","description","keywords","title"],"rangeMappings":";;;;;;;;","mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,gCAAsD,OAAO,EACxEC,MAAM,EACNC,MAAM,EAAEC,CAAC,EAAE,EACZ;IACC,OAAOJ,KAAK;QACVE;QACAG,aAAaD,EAAE;QACfE,UAAUF,EAAE;QACZG,OAAOH,EAAE;IACX;AACF,EAAC"}
+{"version":3,"sources":["../../../src/views/ResetPassword/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\n\nimport type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateResetPasswordMetadata: GenerateViewMetadata = async ({\n  config,\n  i18n: { t },\n}): Promise<Metadata> =>\n  meta({\n    description: t('authentication:resetPassword'),\n    keywords: t('authentication:resetPassword'),\n    serverURL: config.serverURL,\n    title: t('authentication:resetPassword'),\n    ...(config.admin.meta || {}),\n  })\n"],"names":["meta","generateResetPasswordMetadata","config","i18n","t","description","keywords","serverURL","title","admin"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,gCAAsD,OAAO,EACxEC,MAAM,EACNC,MAAM,EAAEC,CAAC,EAAE,EACZ,GACCJ,KAAK;QACHK,aAAaD,EAAE;QACfE,UAAUF,EAAE;QACZG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;QACT,GAAIF,OAAOO,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;IAC7B,GAAE"}

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

@@ -1,4 +1,4 @@
-import type { AdminViewComponent, SanitizedConfig } from 'payload/types';
+import type { AdminViewComponent, SanitizedConfig } from 'payload';
 export declare const getCustomViewByRoute: ({ config, currentRoute: currentRouteWithAdmin, }: {
     config: SanitizedConfig;
     currentRoute: string;

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

@@ -1 +1 @@
-{"version":3,"file":"getCustomViewByRoute.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAIxE,eAAO,MAAM,oBAAoB,qDAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;CACrB,KAAG,kBA0BH,CAAA"}
+{"version":3,"file":"getCustomViewByRoute.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAIlE,eAAO,MAAM,oBAAoB,qDAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;CACrB,KAAG,kBA0BH,CAAA"}

package/dist/views/Root/getCustomViewByRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"sourcesContent":["import type { AdminViewComponent, SanitizedConfig } from 'payload/types'\n\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  config,\n  currentRoute: currentRouteWithAdmin,\n}: {\n  config: SanitizedConfig\n  currentRoute: string\n}): AdminViewComponent => {\n  const {\n    admin: {\n      components: { views },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')\n\n  const foundViewConfig =\n    views &&\n    typeof views === 'object' &&\n    Object.entries(views).find(([, view]) => {\n      if (typeof view === 'object') {\n        return isPathMatchingRoute({\n          currentRoute,\n          exact: view.exact,\n          path: view.path,\n          sensitive: view.sensitive,\n          strict: view.strict,\n        })\n      }\n    })?.[1]\n\n  return typeof foundViewConfig === 'object' ? foundViewConfig.Component : null\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","config","currentRoute","currentRouteWithAdmin","admin","components","views","routes","adminRoute","replace","foundViewConfig","Object","entries","find","view","exact","path","sensitive","strict","Component"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,mBAAmB,QAAQ,2BAA0B;AAE9D,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,cAAcC,qBAAqB,EAIpC;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAK,EAAE,EACtB,EACDC,QAAQ,EAAEH,OAAOI,UAAU,EAAE,EAC9B,GAAGP;IAEJ,MAAMC,eAAeC,sBAAsBM,OAAO,CAACD,YAAY;IAE/D,MAAME,kBACJJ,SACA,OAAOA,UAAU,YACjBK,OAAOC,OAAO,CAACN,OAAOO,IAAI,CAAC,CAAC,GAAGC,KAAK;QAClC,IAAI,OAAOA,SAAS,UAAU;YAC5B,OAAOf,oBAAoB;gBACzBG;gBACAa,OAAOD,KAAKC,KAAK;gBACjBC,MAAMF,KAAKE,IAAI;gBACfC,WAAWH,KAAKG,SAAS;gBACzBC,QAAQJ,KAAKI,MAAM;YACrB;QACF;IACF,IAAI,CAAC,EAAE;IAET,OAAO,OAAOR,oBAAoB,WAAWA,gBAAgBS,SAAS,GAAG;AAC3E,EAAC"}
+{"version":3,"sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"sourcesContent":["import type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  config,\n  currentRoute: currentRouteWithAdmin,\n}: {\n  config: SanitizedConfig\n  currentRoute: string\n}): AdminViewComponent => {\n  const {\n    admin: {\n      components: { views },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')\n\n  const foundViewConfig =\n    views &&\n    typeof views === 'object' &&\n    Object.entries(views).find(([, view]) => {\n      if (typeof view === 'object') {\n        return isPathMatchingRoute({\n          currentRoute,\n          exact: view.exact,\n          path: view.path,\n          sensitive: view.sensitive,\n          strict: view.strict,\n        })\n      }\n    })?.[1]\n\n  return typeof foundViewConfig === 'object' ? foundViewConfig.Component : null\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","config","currentRoute","currentRouteWithAdmin","admin","components","views","routes","adminRoute","replace","foundViewConfig","Object","entries","find","view","exact","path","sensitive","strict","Component"],"mappings":"AAEA,SAASA,mBAAmB,QAAQ,2BAA0B;AAE9D,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,cAAcC,qBAAqB,EAIpC;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAK,EAAE,EACtB,EACDC,QAAQ,EAAEH,OAAOI,UAAU,EAAE,EAC9B,GAAGP;IAEJ,MAAMC,eAAeC,sBAAsBM,OAAO,CAACD,YAAY;IAE/D,MAAME,kBACJJ,SACA,OAAOA,UAAU,YACjBK,OAAOC,OAAO,CAACN,OAAOO,IAAI,CAAC,CAAC,GAAGC,KAAK;QAClC,IAAI,OAAOA,SAAS,UAAU;YAC5B,OAAOf,oBAAoB;gBACzBG;gBACAa,OAAOD,KAAKC,KAAK;gBACjBC,MAAMF,KAAKE,IAAI;gBACfC,WAAWH,KAAKG,SAAS;gBACzBC,QAAQJ,KAAKI,MAAM;YACrB;QACF;IACF,IAAI,CAAC,EAAE;IAET,OAAO,OAAOR,oBAAoB,WAAWA,gBAAgBS,SAAS,GAAG;AAC3E,EAAC"}

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

@@ -1,8 +1,7 @@
-import type { SanitizedConfig } from 'payload/config';
-import type { AdminViewComponent } from 'payload/types';
-import type { initPage } from '../../utilities/initPage.js';
+import type { AdminViewComponent, SanitizedConfig } from 'payload';
+import type { initPage } from '../../utilities/initPage/index.js';
 export declare const getViewFromConfig: ({ adminRoute, config, currentRoute, searchParams, segments, }: {
-    adminRoute;
+    adminRoute: any;
     config: SanitizedConfig;
     currentRoute: string;
     searchParams: {
@@ -13,6 +12,6 @@ export declare const getViewFromConfig: ({ adminRoute, config, currentRoute, sea
     DefaultView: AdminViewComponent;
     initPageOptions: Parameters<typeof initPage>[0];
     templateClassName: string;
-    templateType: 'default' | 'minimal';
+    templateType: "default" | "minimal";
 };
 //# 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.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AA+B3D,eAAO,MAAM,iBAAiB,kEAM3B;IACD,UAAU,CAAA;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,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,kBAAkB,CAAA;IAC/B,eAAe,EAAE,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;CA+GpC,CAAA"}
+{"version":3,"file":"getViewFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getViewFromConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAsCjE,eAAO,MAAM,iBAAiB,kEAM3B;IACD,UAAU,MAAA;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,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,kBAAkB,CAAA;IAC/B,eAAe,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;CAkIpC,CAAA"}

package/dist/views/Root/getViewFromConfig.js

@@ -10,24 +10,27 @@ import { ResetPassword, resetPasswordBaseClass } from '../ResetPassword/index.js
 import { UnauthorizedView } from '../Unauthorized/index.js';
 import { Verify, verifyBaseClass } from '../Verify/index.js';
 import { getCustomViewByRoute } from './getCustomViewByRoute.js';
+import { isPathMatchingRoute } from './isPathMatchingRoute.js';
 const baseClasses = {
+    account: 'account',
     forgot: forgotPasswordBaseClass,
     login: loginBaseClass,
     reset: resetPasswordBaseClass,
     verify: verifyBaseClass
 };
 const oneSegmentViews = {
-    'create-first-user': CreateFirstUserView,
+    account: Account,
+    createFirstUser: CreateFirstUserView,
     forgot: ForgotPasswordView,
+    inactivity: LogoutInactivity,
     login: LoginView,
     logout: LogoutView,
-    'logout-inactivity': LogoutInactivity,
     unauthorized: UnauthorizedView
 };
 export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchParams, segments })=>{
     let ViewToRender = null;
     let templateClassName;
-    let templateType = 'minimal';
+    let templateType;
     const initPageOptions = {
         config,
         route: currentRoute,
@@ -49,22 +52,36 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
             }
         case 1:
             {
-                if (oneSegmentViews[segmentOne] && segmentOne !== 'account') {
+                // users can override the default routes via `admin.routes` config
+                // i.e.{ admin: { routes: { logout: '/sign-out', inactivity: '/idle' }}}
+                let viewToRender;
+                if (config.admin.routes) {
+                    const matchedRoute = Object.entries(config.admin.routes).find(([, route])=>{
+                        return isPathMatchingRoute({
+                            currentRoute,
+                            exact: true,
+                            path: `${adminRoute}${route}`
+                        });
+                    });
+                    if (matchedRoute) {
+                        viewToRender = matchedRoute[0];
+                    }
+                }
+                if (oneSegmentViews[viewToRender]) {
+                    // --> /account
                     // --> /create-first-user
                     // --> /forgot
                     // --> /login
                     // --> /logout
                     // --> /logout-inactivity
                     // --> /unauthorized
-                    ViewToRender = oneSegmentViews[segmentOne];
-                    templateClassName = baseClasses[segmentOne];
+                    ViewToRender = oneSegmentViews[viewToRender];
+                    templateClassName = baseClasses[viewToRender];
                     templateType = 'minimal';
-                } else if (segmentOne === 'account') {
-                    // --> /account
-                    initPageOptions.redirectUnauthenticatedUser = true;
-                    ViewToRender = Account;
-                    templateClassName = 'account';
-                    templateType = 'default';
+                    if (viewToRender === 'account') {
+                        initPageOptions.redirectUnauthenticatedUser = true;
+                        templateType = 'default';
+                    }
                 }
                 break;
             }