Skip to content

Commit

Permalink
Add field groups
Browse files Browse the repository at this point in the history
  • Loading branch information
@emmatown
emmatown committed Nov 16, 2022
1 parent 2a03de4 commit 179e152
Show file tree
Hide file tree
Showing 58 changed files with 696 additions and 106 deletions.
5 changes: 5 additions & 0 deletions .changeset/warm-gifts-change.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-6/core': minor
---

Adds `group` function to allow grouping of fields in the Admin UI
30 changes: 30 additions & 0 deletions docs/pages/docs/fields/overview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,36 @@ export default config({
});
```

{% if $nextRelease %}

## Groups

Fields can be grouped together using the `group` function with a `label` and optionally `description`.

```typescript
export default config({
lists: {
SomeListName: list({
fields: {
...group({
label: 'Group label',
description: 'Group description',
fields: {
someFieldName: text({ /* ... */ }),
/* ... */
},
}),
/* ... */
},
}),
/* ... */
},
/* ... */
});
```

{% /if %}

## Scalar types

- [BigInt](./bigint)
Expand Down
9 changes: 8 additions & 1 deletion examples/assets-local/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -351,6 +352,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/assets-s3/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -351,6 +352,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/auth/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -235,6 +236,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/basic/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -505,6 +506,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/blog/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -312,6 +313,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-admin-ui-logo/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -312,6 +313,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-admin-ui-navigation/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -312,6 +313,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-admin-ui-pages/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -312,6 +313,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-field-view/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -315,6 +316,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-field/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -167,6 +168,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/custom-session-validation/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -353,6 +354,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/default-values/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -330,6 +331,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/document-field-customisation/keystone-server/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -303,6 +304,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
9 changes: 8 additions & 1 deletion examples/document-field/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,10 @@ type KeystoneAdminUIListMeta {
pageSize: Int!
labelField: String!
fields: [KeystoneAdminUIFieldMeta!]!
groups: [KeystoneAdminUIFieldGroupMeta!]!
initialSort: KeystoneAdminUISort
isHidden: Boolean!
isSingleton: Boolean
isSingleton: Boolean!
}

type KeystoneAdminUIFieldMeta {
Expand Down Expand Up @@ -327,6 +328,12 @@ enum QueryMode {
insensitive
}

type KeystoneAdminUIFieldGroupMeta {
label: String!
description: String
fields: [KeystoneAdminUIFieldMeta!]!
}

type KeystoneAdminUISort {
field: String!
direction: KeystoneAdminUISortDirection!
Expand Down
Loading

0 comments on commit 179e152

Please sign in to comment.