Skip to content

Commit 91dcf6d

Browse files
authored
fix: invalid payload.collections type (#9414)
### What? `payload.collections` was improperly typed. This doesn't seem to work: (the type is `{}`) ``` collections: { [slug: CollectionSlug]: Collection } = {} ``` <img width="794" alt="image" src="https://github.com/user-attachments/assets/7daceab9-8f43-433b-9201-1bf8c48fb8ca"> However, this does: ```ts collections: Record<CollectionSlug, Collection> = {} ``` <img width="540" alt="image" src="https://github.com/user-attachments/assets/e37d595d-f5b4-4b02-b190-bb5d4063787d"> Additionally, the same fix applied to `Permissions`, `PolymorphicUploadField['admin']['sortOptions']`, `PolymorphicRelationshipField['admin']['sortOptions']`
1 parent f5683b0 commit 91dcf6d

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

packages/payload/src/auth/types.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,8 @@ export type SanitizedDocumentPermissions = SanitizedCollectionPermission | Sanit
100100

101101
export type Permissions = {
102102
canAccessAdmin: boolean
103-
collections?: {
104-
[collectionSlug: CollectionSlug]: CollectionPermission
105-
}
106-
globals?: {
107-
[globalSlug: GlobalSlug]: GlobalPermission
108-
}
103+
collections?: Record<CollectionSlug, CollectionPermission>
104+
globals?: Record<GlobalSlug, GlobalPermission>
109105
}
110106

111107
export type SanitizedPermissions = {

packages/payload/src/fields/config/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ type UploadAdminClient = AdminClient & Pick<UploadAdmin, 'allowCreate' | 'isSort
863863

864864
export type PolymorphicUploadField = {
865865
admin?: {
866-
sortOptions?: { [collectionSlug: CollectionSlug]: string }
866+
sortOptions?: Partial<Record<CollectionSlug, string>>
867867
} & UploadAdmin
868868
relationTo: CollectionSlug[]
869869
} & SharedUploadProperties
@@ -1044,7 +1044,7 @@ type RelationshipAdminClient = AdminClient &
10441044

10451045
export type PolymorphicRelationshipField = {
10461046
admin?: {
1047-
sortOptions?: { [collectionSlug: CollectionSlug]: string }
1047+
sortOptions?: Partial<Record<CollectionSlug, string>>
10481048
} & RelationshipAdmin
10491049
relationTo: CollectionSlug[]
10501050
} & SharedRelationshipProperties

packages/payload/src/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,7 @@ export class BasePayload {
242242

243243
authStrategies: AuthStrategy[]
244244

245-
collections: {
246-
[slug: CollectionSlug]: Collection
247-
} = {}
245+
collections: Record<CollectionSlug, Collection> = {}
248246

249247
config: SanitizedConfig
250248
/**

0 commit comments

Comments
 (0)