perf(next): avoid re-calculating permissions in some server functions, pass missing args (#15428)

Requires #15427 to be merged
first.
This PR avoids re-calculating permissions in certain server functions,
since through #15427, they are now available in server functions due to
an `initReq` that we already ran.
It also passes some missing properties to `serverProps` and render
handles that are now available.

Author: AlessioGr

packages/next/src/views/Document/handleServerFunction.tsx

@@ -2,22 +2,23 @@ import type { RenderDocumentServerFunction } from '@payloadcms/ui'
 importtype{DocumentPreferences,VisibleEntities}from'payload'
 
 import{getClientConfig}from'@payloadcms/ui/utilities/getClientConfig'
-import{headersasgetHeaders}from'next/headers.js'
-import{canAccessAdmin,getAccessResults,isEntityHidden,parseCookies}from'payload'
+import{canAccessAdmin,isEntityHidden}from'payload'
 import{applyLocaleFiltering}from'payload/shared'
 
 import{renderDocument}from'./index.js'
 
 exportconstrenderDocumentHandler: RenderDocumentServerFunction=async(args)=>{
 const{
  collectionSlug,
+ cookies,
  disableActions,
  docID,
  drawerSlug,
  initialData,
  locale,
  overrideEntityVisibility,
  paramsOverride,
+ permissions,
  redirectAfterCreate,
  redirectAfterDelete,
  redirectAfterDuplicate,
@@ -32,10 +33,6 @@ export const renderDocumentHandler: RenderDocumentServerFunction = async (args)
  versions,
 }=args
 
-constheaders=awaitgetHeaders()
-
-constcookies=parseCookies(headers)
-
 awaitcanAccessAdmin({ req })
 
 constclientConfig=getClientConfig({
@@ -88,10 +85,6 @@ export const renderDocumentHandler: RenderDocumentServerFunction = async (args)
 .filter(Boolean),
 }
 
-constpermissions=awaitgetAccessResults({
- req,
-})
-
 const{ data, Document }=awaitrenderDocument({
  clientConfig,
  disableActions,
@@ -112,11 +105,13 @@ export const renderDocumentHandler: RenderDocumentServerFunction = async (args)
 translations: undefined,// TODO
  visibleEntities,
 },
+ locale,
  overrideEntityVisibility,
 params: paramsOverride??{
 segments: ['collections',collectionSlug,String(docID)],
 },
  payload,
+ permissions,
  redirectAfterCreate,
  redirectAfterDelete,
  redirectAfterDuplicate,

packages/next/src/views/Document/index.tsx

@@ -95,7 +95,6 @@ export const renderDocument = async ({
  config,
 config: {
 routes: {admin: adminRoute,api: apiRoute},
- serverURL,
 },
 },
  user,
@@ -357,7 +356,8 @@ export const renderDocument = async ({
  collectionConfig,
  globalConfig,
  hasSavePermission,
-permissions: docPermissions,
+ locale,
+ permissions,
  req,
 })
 

packages/next/src/views/Document/renderDocumentSlots.tsx

@@ -2,12 +2,13 @@ import type {
 BeforeDocumentControlsServerPropsOnly,
 DocumentSlots,
 EditMenuItemsServerPropsOnly,
+Locale,
 PayloadRequest,
 PreviewButtonServerPropsOnly,
 PublishButtonServerPropsOnly,
 SanitizedCollectionConfig,
-SanitizedDocumentPermissions,
 SanitizedGlobalConfig,
+SanitizedPermissions,
 SaveButtonServerPropsOnly,
 SaveDraftButtonServerPropsOnly,
 ServerFunction,
@@ -29,10 +30,11 @@ export const renderDocumentSlots: (args: {
 globalConfig?: SanitizedGlobalConfig
 hasSavePermission: boolean
 id?: number|string
-permissions: SanitizedDocumentPermissions
+locale: Locale
+permissions: SanitizedPermissions
 req: PayloadRequest
 })=>DocumentSlots=(args)=>{
-const{ id, collectionConfig, globalConfig, hasSavePermission, req }=args
+const{ id, collectionConfig, globalConfig, hasSavePermission,locale, permissions,req }=args
 
 constcomponents: DocumentSlots={}asDocumentSlots
 
@@ -43,7 +45,9 @@ export const renderDocumentSlots: (args: {
 constserverProps: ServerProps={
  id,
 i18n: req.i18n,
+ locale,
 payload: req.payload,
+ permissions,
 user: req.user,
 // TODO: Add remaining serverProps
 }
@@ -212,15 +216,16 @@ export const renderDocumentSlotsHandler: ServerFunction<{
 collectionSlug: string
 id?: number|string
 }>=async(args)=>{
-const{ id, collectionSlug, req }=args
+const{ id, collectionSlug,locale, permissions,req }=args
 
 constcollectionConfig=req.payload.collections[collectionSlug]?.config
 
 if(!collectionConfig){
 thrownewError(req.t('error:incorrectCollection'))
 }
 
-const{ docPermissions, hasSavePermission }=awaitgetDocumentPermissions({
+const{ hasSavePermission }=awaitgetDocumentPermissions({
+ id,
  collectionConfig,
 data: {},
  req,
@@ -230,7 +235,8 @@ export const renderDocumentSlotsHandler: ServerFunction<{
  id,
  collectionConfig,
  hasSavePermission,
-permissions: docPermissions,
+ locale,
+ permissions,
  req,
 })
 }

packages/next/src/views/List/handleServerFunction.tsx

@@ -2,14 +2,7 @@ import type { RenderListServerFnArgs, RenderListServerFnReturnType } from '@payl
 importtype{CollectionPreferences,ServerFunction,VisibleEntities}from'payload'
 
 import{getClientConfig}from'@payloadcms/ui/utilities/getClientConfig'
-import{headersasgetHeaders}from'next/headers.js'
-import{
-canAccessAdmin,
-getAccessResults,
-isEntityHidden,
-parseCookies,
-UnauthorizedError,
-}from'payload'
+import{canAccessAdmin,isEntityHidden,UnauthorizedError}from'payload'
 import{applyLocaleFiltering}from'payload/shared'
 
 import{renderListView}from'./index.js'
@@ -20,13 +13,16 @@ export const renderListHandler: ServerFunction<
 >=async(args)=>{
 const{
  collectionSlug,
+ cookies,
  disableActions,
  disableBulkDelete,
  disableBulkEdit,
  disableQueryPresets,
  drawerSlug,
  enableRowSelections,
+ locale,
  overrideEntityVisibility,
+ permissions,
  query,
  redirectAfterDelete,
  redirectAfterDuplicate,
@@ -43,10 +39,6 @@ export const renderListHandler: ServerFunction<
 thrownewUnauthorizedError()
 }
 
-constheaders=awaitgetHeaders()
-
-constcookies=parseCookies(headers)
-
 awaitcanAccessAdmin({ req })
 
 constclientConfig=getClientConfig({
@@ -95,10 +87,6 @@ export const renderListHandler: ServerFunction<
 .filter(Boolean),
 }
 
-constpermissions=awaitgetAccessResults({
- req,
-})
-
 const{ List }=awaitrenderListView({
  clientConfig,
  disableActions,
@@ -114,16 +102,19 @@ export const renderListHandler: ServerFunction<
  cookies,
 globalConfig: payload.config.globals.find((global)=>global.slug===collectionSlug),
 languageOptions: undefined,// TODO
+ locale,
  permissions,
  req,
 translations: undefined,// TODO
  visibleEntities,
 },
+ locale,
  overrideEntityVisibility,
 params: {
 segments: ['collections',collectionSlug],
 },
  payload,
+ permissions,
  query,
  redirectAfterDelete,
  redirectAfterDuplicate,

packages/payload/src/admin/functions/index.ts

@@ -127,7 +127,6 @@ export type BuildTableStateArgs = {
 }
 query?: ListQuery
 renderRowTypes?: boolean
-req: PayloadRequest
 tableAppearance?: 'condensed'|'default'
 }
 

packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx

@@ -8,7 +8,6 @@ import type { DocumentDrawerProps } from './types.js'
 
 import{LoadingOverlay}from'../../elements/Loading/index.js'
 import{useConfig}from'../../providers/Config/index.js'
-import{useLocale}from'../../providers/Locale/index.js'
 import{useServerFunctions}from'../../providers/ServerFunctions/index.js'
 import{useTranslation}from'../../providers/Translation/index.js'
 import{abortAndIgnore,handleAbortRef}from'../../utilities/abortAndIgnore.js'
@@ -30,7 +29,6 @@ export const DocumentDrawerContent: React.FC<DocumentDrawerProps> = ({
  redirectAfterRestore,
 })=>{
 const{ getEntityConfig }=useConfig()
-constlocale=useLocale()
 
 const[collectionConfig]=useState(()=>getEntityConfig({ collectionSlug }))
 
@@ -62,7 +60,6 @@ export const DocumentDrawerContent: React.FC<DocumentDrawerProps> = ({
  docID,
  drawerSlug,
  initialData,
- locale,
  overrideEntityVisibility,
  redirectAfterCreate,
 redirectAfterDelete: redirectAfterDelete!==undefined ? redirectAfterDelete : false,
@@ -99,7 +96,6 @@ export const DocumentDrawerContent: React.FC<DocumentDrawerProps> = ({
 closeModal,
 overrideEntityVisibility,
 t,
-locale,
 ],
 )
 

packages/ui/src/elements/PublishButton/ScheduleDrawer/index.tsx

@@ -59,7 +59,6 @@ export const ScheduleDrawer: React.FC<Props> = ({ slug, defaultType, schedulePub
 },
  localization,
 routes: { api },
- serverURL,
 },
 }=useConfig()
 const{ id, collectionSlug, globalSlug }=useDocumentInfo()
@@ -158,18 +157,7 @@ export const ScheduleDrawer: React.FC<Props> = ({ slug, defaultType, schedulePub
 }),
 )
 setUpcoming(docs)
-},[
-collectionSlug,
-globalSlug,
-serverURL,
-api,
-i18n,
-dateFormat,
-localization,
-supportedTimezones,
-t,
-id,
-])
+},[collectionSlug,globalSlug,api,i18n,dateFormat,localization,supportedTimezones,t,id])
 
 constdeleteHandler=React.useCallback(
 async(id: number|string)=>{
@@ -198,10 +186,10 @@ export const ScheduleDrawer: React.FC<Props> = ({ slug, defaultType, schedulePub
 
 setProcessing(true)
 
-letpublishSpecificLocale: string
+letlocaleToPublish: string
 
 if(typeoflocale==='object'&&locale.value!=='all'&&type==='publish'){
-publishSpecificLocale=locale.value
+localeToPublish=locale.value
 }
 
 try{
@@ -215,7 +203,7 @@ export const ScheduleDrawer: React.FC<Props> = ({ slug, defaultType, schedulePub
 }
  : undefined,
 global: globalSlug||undefined,
-locale: publishSpecificLocale,
+localeToPublish,
  timezone,
 })
 

packages/ui/src/providers/ServerFunctions/index.tsx

@@ -7,7 +7,6 @@ import type {
 DocumentSlots,
 FormState,
 GetFolderResultsComponentAndDataArgs,
-Locale,
 Params,
 RenderDocumentVersionsProperties,
 ServerFunction,
@@ -68,7 +67,6 @@ type RenderDocumentBaseArgs = {
 drawerSlug?: string
 initialData?: Data
 initialState?: FormState
-locale?: Locale
 overrideEntityVisibility?: boolean
 paramsOverride?: AdminViewServerPropsOnly['params']
 redirectAfterCreate?: boolean
@@ -162,10 +160,10 @@ export const ServerFunctionsProvider: React.FC<{
 
 try{
 if(!remoteSignal?.aborted){
-constresult=(awaitserverFunction({
+constresult=awaitserverFunction({
 name: 'schedule-publish',
 args: { ...rest},
-}))asAwaited<ReturnType<typeofschedulePublishHandler>>// TODO: infer this type when `strictNullChecks` is enabled
+})
 
 if(!remoteSignal?.aborted){
 returnresult

packages/ui/src/utilities/buildTableState.ts

@@ -11,7 +11,7 @@ import type {
 Where,
 }from'payload'
 
-import{APIError,canAccessAdmin,formatErrors,getAccessResults}from'payload'
+import{APIError,canAccessAdmin,formatErrors}from'payload'
 import{applyLocaleFiltering,isNumber}from'payload/shared'
 
 import{getClientConfig}from'./getClientConfig.js'
@@ -69,16 +69,18 @@ export const buildTableStateHandler: ServerFunction<
 }
 }
 
-constbuildTableState=async(
-args: BuildTableStateArgs,
-): Promise<BuildTableStateSuccessResult>=>{
+constbuildTableState: ServerFunction<
+BuildTableStateArgs,
+Promise<BuildTableStateSuccessResult>
+>=async(args)=>{
 const{
  collectionSlug,
 columns: columnsFromArgs,
 data: dataFromArgs,
  enableRowSelections,
  orderableFieldName,
  parent,
+ permissions,
  query,
  renderRowTypes,
  req,
@@ -102,8 +104,6 @@ const buildTableState = async (
 
 awaitapplyLocaleFiltering({ clientConfig, config, req })
 
-constpermissions=awaitgetAccessResults({ req })
-
 letcollectionConfig: SanitizedCollectionConfig
 letclientCollectionConfig: ClientCollectionConfig
 
@@ -221,6 +221,7 @@ const buildTableState = async (
  payload,
  query,
  renderRowTypes,
+ req,
  tableAppearance,
 useAsTitle: Array.isArray(collectionSlug)
  ? payload.collections[collectionSlug[0]]?.config?.admin?.useAsTitle