Skip to content

Commit b07145a

Browse files
dcousensdcousens
authored
Move item field parameters from list.itemView() to list() in the AdminMeta (#9684)
Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
1 parent 83ac5f3 commit b07145a

91 files changed

Lines changed: 958 additions & 921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/move-meta-item.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@keystone-6/core": major
3+
---
4+
5+
Move item field parameters from list.itemView() to list() in the KeystoneAdminMeta GraphQL type

.changeset/admin-ui-navigation.md renamed to .changeset/remove-meta-fields.md

File renamed without changes.

.changeset/admin-meta-rename.md renamed to .changeset/rename-meta-fields.md

File renamed without changes.

‎examples/assets-local/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ type KeystoneMeta {
151151

152152
type KeystoneAdminMeta {
153153
lists: [KeystoneAdminUIListMeta!]!
154-
list(key: String!): KeystoneAdminUIListMeta
154+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
155155
}
156156

157157
type KeystoneAdminUIListMeta {
@@ -186,8 +186,8 @@ type KeystoneAdminUIFieldMeta {
186186
viewsIndex: Int!
187187
customViewsIndex: Int
188188
createView: KeystoneAdminUIFieldMetaCreateView!
189+
itemView: KeystoneAdminUIFieldMetaItemView
189190
listView: KeystoneAdminUIFieldMetaListView!
190-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
191191
search: QueryMode
192192
}
193193

@@ -202,15 +202,6 @@ type KeystoneAdminUIFieldMetaCreateView {
202202
isRequired: JSON!
203203
}
204204

205-
type KeystoneAdminUIFieldMetaListView {
206-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
207-
}
208-
209-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
210-
read
211-
hidden
212-
}
213-
214205
type KeystoneAdminUIFieldMetaItemView {
215206
fieldMode: JSON!
216207
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -222,6 +213,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
222213
sidebar
223214
}
224215

216+
type KeystoneAdminUIFieldMetaListView {
217+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
218+
}
219+
220+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
221+
read
222+
hidden
223+
}
224+
225225
enum QueryMode {
226226
default
227227
insensitive

‎examples/assets-s3/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ type KeystoneMeta {
151151

152152
type KeystoneAdminMeta {
153153
lists: [KeystoneAdminUIListMeta!]!
154-
list(key: String!): KeystoneAdminUIListMeta
154+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
155155
}
156156

157157
type KeystoneAdminUIListMeta {
@@ -186,8 +186,8 @@ type KeystoneAdminUIFieldMeta {
186186
viewsIndex: Int!
187187
customViewsIndex: Int
188188
createView: KeystoneAdminUIFieldMetaCreateView!
189+
itemView: KeystoneAdminUIFieldMetaItemView
189190
listView: KeystoneAdminUIFieldMetaListView!
190-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
191191
search: QueryMode
192192
}
193193

@@ -202,15 +202,6 @@ type KeystoneAdminUIFieldMetaCreateView {
202202
isRequired: JSON!
203203
}
204204

205-
type KeystoneAdminUIFieldMetaListView {
206-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
207-
}
208-
209-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
210-
read
211-
hidden
212-
}
213-
214205
type KeystoneAdminUIFieldMetaItemView {
215206
fieldMode: JSON!
216207
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -222,6 +213,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
222213
sidebar
223214
}
224215

216+
type KeystoneAdminUIFieldMetaListView {
217+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
218+
}
219+
220+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
221+
read
222+
hidden
223+
}
224+
225225
enum QueryMode {
226226
default
227227
insensitive

‎examples/auth-magic-link/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ type KeystoneMeta {
137137

138138
type KeystoneAdminMeta {
139139
lists: [KeystoneAdminUIListMeta!]!
140-
list(key: String!): KeystoneAdminUIListMeta
140+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
141141
}
142142

143143
type KeystoneAdminUIListMeta {
@@ -172,8 +172,8 @@ type KeystoneAdminUIFieldMeta {
172172
viewsIndex: Int!
173173
customViewsIndex: Int
174174
createView: KeystoneAdminUIFieldMetaCreateView!
175+
itemView: KeystoneAdminUIFieldMetaItemView
175176
listView: KeystoneAdminUIFieldMetaListView!
176-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
177177
search: QueryMode
178178
}
179179

@@ -188,15 +188,6 @@ type KeystoneAdminUIFieldMetaCreateView {
188188
isRequired: JSON!
189189
}
190190

191-
type KeystoneAdminUIFieldMetaListView {
192-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
193-
}
194-
195-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
196-
read
197-
hidden
198-
}
199-
200191
type KeystoneAdminUIFieldMetaItemView {
201192
fieldMode: JSON!
202193
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -208,6 +199,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
208199
sidebar
209200
}
210201

202+
type KeystoneAdminUIFieldMetaListView {
203+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
204+
}
205+
206+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
207+
read
208+
hidden
209+
}
210+
211211
enum QueryMode {
212212
default
213213
insensitive

‎examples/auth/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ type KeystoneMeta {
114114

115115
type KeystoneAdminMeta {
116116
lists: [KeystoneAdminUIListMeta!]!
117-
list(key: String!): KeystoneAdminUIListMeta
117+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
118118
}
119119

120120
type KeystoneAdminUIListMeta {
@@ -149,8 +149,8 @@ type KeystoneAdminUIFieldMeta {
149149
viewsIndex: Int!
150150
customViewsIndex: Int
151151
createView: KeystoneAdminUIFieldMetaCreateView!
152+
itemView: KeystoneAdminUIFieldMetaItemView
152153
listView: KeystoneAdminUIFieldMetaListView!
153-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
154154
search: QueryMode
155155
}
156156

@@ -165,15 +165,6 @@ type KeystoneAdminUIFieldMetaCreateView {
165165
isRequired: JSON!
166166
}
167167

168-
type KeystoneAdminUIFieldMetaListView {
169-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
170-
}
171-
172-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
173-
read
174-
hidden
175-
}
176-
177168
type KeystoneAdminUIFieldMetaItemView {
178169
fieldMode: JSON!
179170
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -185,6 +176,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
185176
sidebar
186177
}
187178

179+
type KeystoneAdminUIFieldMetaListView {
180+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
181+
}
182+
183+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
184+
read
185+
hidden
186+
}
187+
188188
enum QueryMode {
189189
default
190190
insensitive

‎examples/better-list-search/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ type KeystoneMeta {
263263

264264
type KeystoneAdminMeta {
265265
lists: [KeystoneAdminUIListMeta!]!
266-
list(key: String!): KeystoneAdminUIListMeta
266+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
267267
}
268268

269269
type KeystoneAdminUIListMeta {
@@ -298,8 +298,8 @@ type KeystoneAdminUIFieldMeta {
298298
viewsIndex: Int!
299299
customViewsIndex: Int
300300
createView: KeystoneAdminUIFieldMetaCreateView!
301+
itemView: KeystoneAdminUIFieldMetaItemView
301302
listView: KeystoneAdminUIFieldMetaListView!
302-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
303303
search: QueryMode
304304
}
305305

@@ -314,15 +314,6 @@ type KeystoneAdminUIFieldMetaCreateView {
314314
isRequired: JSON!
315315
}
316316

317-
type KeystoneAdminUIFieldMetaListView {
318-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
319-
}
320-
321-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
322-
read
323-
hidden
324-
}
325-
326317
type KeystoneAdminUIFieldMetaItemView {
327318
fieldMode: JSON!
328319
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -334,6 +325,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
334325
sidebar
335326
}
336327

328+
type KeystoneAdminUIFieldMetaListView {
329+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
330+
}
331+
332+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
333+
read
334+
hidden
335+
}
336+
337337
enum QueryMode {
338338
default
339339
insensitive

‎examples/byte-encoding/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ type KeystoneMeta {
105105

106106
type KeystoneAdminMeta {
107107
lists: [KeystoneAdminUIListMeta!]!
108-
list(key: String!): KeystoneAdminUIListMeta
108+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
109109
}
110110

111111
type KeystoneAdminUIListMeta {
@@ -140,8 +140,8 @@ type KeystoneAdminUIFieldMeta {
140140
viewsIndex: Int!
141141
customViewsIndex: Int
142142
createView: KeystoneAdminUIFieldMetaCreateView!
143+
itemView: KeystoneAdminUIFieldMetaItemView
143144
listView: KeystoneAdminUIFieldMetaListView!
144-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
145145
search: QueryMode
146146
}
147147

@@ -156,15 +156,6 @@ type KeystoneAdminUIFieldMetaCreateView {
156156
isRequired: JSON!
157157
}
158158

159-
type KeystoneAdminUIFieldMetaListView {
160-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
161-
}
162-
163-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
164-
read
165-
hidden
166-
}
167-
168159
type KeystoneAdminUIFieldMetaItemView {
169160
fieldMode: JSON!
170161
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -176,6 +167,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
176167
sidebar
177168
}
178169

170+
type KeystoneAdminUIFieldMetaListView {
171+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
172+
}
173+
174+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
175+
read
176+
hidden
177+
}
178+
179179
enum QueryMode {
180180
default
181181
insensitive

‎examples/cloudinary/schema.graphql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ type KeystoneMeta {
169169

170170
type KeystoneAdminMeta {
171171
lists: [KeystoneAdminUIListMeta!]!
172-
list(key: String!): KeystoneAdminUIListMeta
172+
list(key: String!, itemId: ID): KeystoneAdminUIListMeta
173173
}
174174

175175
type KeystoneAdminUIListMeta {
@@ -204,8 +204,8 @@ type KeystoneAdminUIFieldMeta {
204204
viewsIndex: Int!
205205
customViewsIndex: Int
206206
createView: KeystoneAdminUIFieldMetaCreateView!
207+
itemView: KeystoneAdminUIFieldMetaItemView
207208
listView: KeystoneAdminUIFieldMetaListView!
208-
itemView(id: ID): KeystoneAdminUIFieldMetaItemView
209209
search: QueryMode
210210
}
211211

@@ -220,15 +220,6 @@ type KeystoneAdminUIFieldMetaCreateView {
220220
isRequired: JSON!
221221
}
222222

223-
type KeystoneAdminUIFieldMetaListView {
224-
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
225-
}
226-
227-
enum KeystoneAdminUIFieldMetaListViewFieldMode {
228-
read
229-
hidden
230-
}
231-
232223
type KeystoneAdminUIFieldMetaItemView {
233224
fieldMode: JSON!
234225
fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition!
@@ -240,6 +231,15 @@ enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
240231
sidebar
241232
}
242233

234+
type KeystoneAdminUIFieldMetaListView {
235+
fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
236+
}
237+
238+
enum KeystoneAdminUIFieldMetaListViewFieldMode {
239+
read
240+
hidden
241+
}
242+
243243
enum QueryMode {
244244
default
245245
insensitive

0 commit comments

Comments
 (0)
⚡