-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Currently, Payload renders all custom components on initial compile of the admin panel. This is problematic for two key reasons: 1. Custom components do not receive contextual data, i.e. fields do not receive their field data, edit views do not receive their document data, etc. 2. Components are unnecessarily rendered before they are used This was initially required to support React Server Components within the Payload Admin Panel for two key reasons: 1. Fields can be dynamically rendered within arrays, blocks, etc. 2. Documents can be recursively rendered within a "drawer" UI, i.e. relationship fields 3. Payload supports server/client component composition In order to achieve this, components need to be rendered on the server and passed as "slots" to the client. Currently, the pattern for this is to render custom server components in the "client config". Then when a view or field is needed to be rendered, we first check the client config for a "pre-rendered" component, otherwise render our client-side fallback component. But for the reasons listed above, this pattern doesn't exactly make custom server components very useful within the Payload Admin Panel, which is where this PR comes in. Now, instead of pre-rendering all components on initial compile, we're able to render custom components _on demand_, only as they are needed. To achieve this, we've established [this pattern](#8481) of React Server Functions in the Payload Admin Panel. With Server Functions, we can iterate the Payload Config and return JSX through React's `text/x-component` content-type. This means we're able to pass contextual props to custom components, such as data for fields and views. ## Breaking Changes 1. Add the following to your root layout file, typically located at `(app)/(payload)/layout.tsx`: ```diff /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */ /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */ + import type { ServerFunctionClient } from 'payload' import config from '@payload-config' import { RootLayout } from '@payloadcms/next/layouts' import { handleServerFunctions } from '@payloadcms/next/utilities' import React from 'react' import { importMap } from './admin/importMap.js' import './custom.scss' type Args = { children: React.ReactNode } + const serverFunctions: ServerFunctionClient = async function (args) { + 'use server' + return handleServerFunctions({ + ...args, + config, + importMap, + }) + } const Layout = ({ children }: Args) => ( <RootLayout config={config} importMap={importMap} + serverFunctions={serverFunctions} > {children} </RootLayout> ) export default Layout ``` 2. If you were previously posting to the `/api/form-state` endpoint, it no longer exists. Instead, you'll need to invoke the `form-state` Server Function, which can be done through the _new_ `getFormState` utility: ```diff - import { getFormState } from '@payloadcms/ui' - const { state } = await getFormState({ - apiRoute: '', - body: { - // ... - }, - serverURL: '' - }) + const { getFormState } = useServerFunctions() + + const { state } = await getFormState({ + // ... + }) ``` ## Breaking Changes ```diff - useFieldProps() - useCellProps() ``` More details coming soon. --------- Co-authored-by: Alessio Gravili <[email protected]> Co-authored-by: Jarrod Flesch <[email protected]> Co-authored-by: James <[email protected]>
- Loading branch information
1 parent
3e954f4
commit c96fa61
Showing
657 changed files
with
34,172 additions
and
20,984 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
import type { QueryOptions } from 'mongoose' | ||
import type { CountGlobalVersions, PayloadRequest } from 'payload' | ||
|
||
import { flattenWhereToOperators } from 'payload' | ||
|
||
import type { MongooseAdapter } from './index.js' | ||
|
||
import { withSession } from './withSession.js' | ||
|
||
export const countGlobalVersions: CountGlobalVersions = async function countGlobalVersions( | ||
this: MongooseAdapter, | ||
{ global, locale, req = {} as PayloadRequest, where }, | ||
) { | ||
const Model = this.versions[global] | ||
const options: QueryOptions = await withSession(this, req) | ||
|
||
let hasNearConstraint = false | ||
|
||
if (where) { | ||
const constraints = flattenWhereToOperators(where) | ||
hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near')) | ||
} | ||
|
||
const query = await Model.buildQuery({ | ||
locale, | ||
payload: this.payload, | ||
where, | ||
}) | ||
|
||
// useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters. | ||
const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0 | ||
|
||
if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) { | ||
// Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding | ||
// a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents, | ||
// which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses | ||
// the correct indexed field | ||
options.hint = { | ||
_id: 1, | ||
} | ||
} | ||
|
||
const result = await Model.countDocuments(query, options) | ||
|
||
return { | ||
totalDocs: result, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
import type { QueryOptions } from 'mongoose' | ||
import type { CountVersions, PayloadRequest } from 'payload' | ||
|
||
import { flattenWhereToOperators } from 'payload' | ||
|
||
import type { MongooseAdapter } from './index.js' | ||
|
||
import { withSession } from './withSession.js' | ||
|
||
export const countVersions: CountVersions = async function countVersions( | ||
this: MongooseAdapter, | ||
{ collection, locale, req = {} as PayloadRequest, where }, | ||
) { | ||
const Model = this.versions[collection] | ||
const options: QueryOptions = await withSession(this, req) | ||
|
||
let hasNearConstraint = false | ||
|
||
if (where) { | ||
const constraints = flattenWhereToOperators(where) | ||
hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near')) | ||
} | ||
|
||
const query = await Model.buildQuery({ | ||
locale, | ||
payload: this.payload, | ||
where, | ||
}) | ||
|
||
// useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters. | ||
const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0 | ||
|
||
if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) { | ||
// Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding | ||
// a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents, | ||
// which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses | ||
// the correct indexed field | ||
options.hint = { | ||
_id: 1, | ||
} | ||
} | ||
|
||
const result = await Model.countDocuments(query, options) | ||
|
||
return { | ||
totalDocs: result, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.