Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(next,ui): fixes global doc permissions and optimizes publish access data loading #6451

Merged
merged 13 commits into from
May 22, 2024
Prev Previous commit
Next Next commit
fix: properly threads id through collection doc access
  • Loading branch information
jacobsfletch committed May 21, 2024
commit 3be436ee5238ab9aaee3c50527e52739d0261744
13 changes: 6 additions & 7 deletions packages/next/src/views/Document/getDocumentPermissions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,28 @@ import type {

import { hasSavePermission as getHasSavePermission } from '@payloadcms/ui/utilities/hasSavePermission'
import { isEditing as getIsEditing } from '@payloadcms/ui/utilities/isEditing'
import { notFound } from 'next/navigation.js'
import { docAccessOperation, docAccessOperationGlobal } from 'payload/operations'

export const getDocumentPermissions = async (args: {
collectionConfig?: SanitizedCollectionConfig
data: Data
globalConfig?: SanitizedGlobalConfig
id: number | string
id?: number | string
req: PayloadRequest
}): Promise<{
docPermissions: DocumentPermissions
hasPublishPermission: boolean
hasSavePermission: boolean
}> => {
const { id, collectionConfig, data, globalConfig, req } = args
const { id, collectionConfig, data = {}, globalConfig, req } = args

let docPermissions: DocumentPermissions
let hasPublishPermission: boolean

if (collectionConfig) {
try {
docPermissions = await docAccessOperation({
id: id.toString(),
id: id?.toString(),
collection: {
config: collectionConfig,
},
Expand All @@ -41,7 +40,7 @@ export const getDocumentPermissions = async (args: {
})

hasPublishPermission = await docAccessOperation({
id: id.toString(),
id: id?.toString(),
collection: {
config: collectionConfig,
},
Expand All @@ -54,7 +53,7 @@ export const getDocumentPermissions = async (args: {
},
}).then(({ update }) => update?.permission)
} catch (error) {
notFound()
console.error(error) // eslint-disable-line no-console
}
}

Expand All @@ -79,7 +78,7 @@ export const getDocumentPermissions = async (args: {
},
}).then(({ update }) => update?.permission)
} catch (error) {
notFound()
console.error(error) // eslint-disable-line no-console
}
}

Expand Down