Singletons as lists

keystonejs · Aug 30, 2022 · b483800 · b483800
1 parent ed736e3
commit b483800
Show file tree

Hide file tree

Showing 55 changed files with 272 additions and 78 deletions.
diff --git a/examples/assets-local/schema.graphql b/examples/assets-local/schema.graphql
@@ -315,6 +315,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/assets-s3/schema.graphql b/examples/assets-s3/schema.graphql
@@ -315,6 +315,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/auth/schema.graphql b/examples/auth/schema.graphql
@@ -193,6 +193,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/basic/schema.graphql b/examples/basic/schema.graphql
@@ -484,6 +484,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/blog/schema.graphql b/examples/blog/schema.graphql
@@ -205,6 +205,41 @@ input PostRelateToManyForCreateInput {
   connect: [PostWhereUniqueInput!]
 }
 
+type Settings {
+  id: ID!
+  siteName: String
+}
+
+input SettingsWhereUniqueInput {
+  id: ID
+}
+
+input SettingsWhereInput {
+  AND: [SettingsWhereInput!]
+  OR: [SettingsWhereInput!]
+  NOT: [SettingsWhereInput!]
+  id: IDFilter
+  siteName: StringFilter
+}
+
+input SettingsOrderByInput {
+  id: OrderDirection
+  siteName: OrderDirection
+}
+
+input SettingsUpdateInput {
+  siteName: String
+}
+
+input SettingsUpdateArgs {
+  where: SettingsWhereUniqueInput! = { id: 1 }
+  data: SettingsUpdateInput!
+}
+
+input SettingsCreateInput {
+  siteName: String
+}
+
 """
 The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
 """
@@ -226,6 +261,15 @@ type Mutation {
   updateAuthors(data: [AuthorUpdateArgs!]!): [Author]
   deleteAuthor(where: AuthorWhereUniqueInput!): Author
   deleteAuthors(where: [AuthorWhereUniqueInput!]!): [Author]
+  createSettings(data: SettingsCreateInput!): Settings
+  createManySettings(data: [SettingsCreateInput!]!): [Settings]
+  updateSettings(
+    where: SettingsWhereUniqueInput! = { id: 1 }
+    data: SettingsUpdateInput!
+  ): Settings
+  updateManySettings(data: [SettingsUpdateArgs!]!): [Settings]
+  deleteSettings(where: SettingsWhereUniqueInput! = { id: 1 }): Settings
+  deleteManySettings(where: [SettingsWhereUniqueInput!]!): [Settings]
 }
 
 type Query {
@@ -245,6 +289,14 @@ type Query {
   ): [Author!]
   author(where: AuthorWhereUniqueInput!): Author
   authorsCount(where: AuthorWhereInput! = {}): Int
+  manySettings(
+    where: SettingsWhereInput! = { id: { equals: 1 } }
+    orderBy: [SettingsOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Settings!]
+  settings(where: SettingsWhereUniqueInput! = { id: 1 }): Settings
+  manySettingsCount(where: SettingsWhereInput! = { id: { equals: 1 } }): Int
   keystone: KeystoneMeta!
 }
 
@@ -274,6 +326,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/blog/schema.prisma b/examples/blog/schema.prisma
@@ -29,4 +29,9 @@ model Author {
   name  String @default("")
   email String @unique @default("")
   posts Post[] @relation("Post_author")
+}
+
+model Settings {
+  id       Int    @id @default(autoincrement())
+  siteName String @default("")
 }
diff --git a/examples/blog/schema.ts b/examples/blog/schema.ts
@@ -24,4 +24,20 @@ export const lists = {
       posts: relationship({ ref: 'Post.author', many: true }),
     },
   }),
+  Settings: list({
+    db: {
+      idField: {
+        kind: 'autoincrement',
+      },
+    },
+    isSingleton: true,
+    fields: {
+      siteName: text(),
+    },
+  }),
+  // Settings2: singleton({
+  //   fields: {
+  //     siteName: text(),
+  //   },
+  // }),
 };
diff --git a/examples/custom-admin-ui-logo/schema.graphql b/examples/custom-admin-ui-logo/schema.graphql
@@ -274,6 +274,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/custom-admin-ui-navigation/schema.graphql b/examples/custom-admin-ui-navigation/schema.graphql
@@ -274,6 +274,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/custom-admin-ui-pages/schema.graphql b/examples/custom-admin-ui-pages/schema.graphql
@@ -274,6 +274,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/custom-field-view/schema.graphql b/examples/custom-field-view/schema.graphql
@@ -277,6 +277,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/custom-field/schema.graphql b/examples/custom-field/schema.graphql
@@ -154,6 +154,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/custom-session-validation/schema.graphql b/examples/custom-session-validation/schema.graphql
@@ -322,6 +322,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/default-values/schema.graphql b/examples/default-values/schema.graphql
@@ -274,6 +274,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/document-field/schema.graphql b/examples/document-field/schema.graphql
@@ -289,6 +289,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/ecommerce/schema.graphql b/examples/ecommerce/schema.graphql
@@ -954,6 +954,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/embedded-nextjs/schema.graphql b/examples/embedded-nextjs/schema.graphql
@@ -145,6 +145,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/extend-graphql-schema-graphql-ts/schema.graphql b/examples/extend-graphql-schema-graphql-ts/schema.graphql
@@ -283,6 +283,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/extend-graphql-schema-nexus/schema.graphql b/examples/extend-graphql-schema-nexus/schema.graphql
@@ -276,6 +276,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/extend-graphql-schema/schema.graphql b/examples/extend-graphql-schema/schema.graphql
@@ -298,6 +298,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/extend-graphql-subscriptions/schema.graphql b/examples/extend-graphql-subscriptions/schema.graphql
@@ -279,6 +279,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/graphql-api-endpoint/schema.graphql b/examples/graphql-api-endpoint/schema.graphql
@@ -428,6 +428,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/json/schema.graphql b/examples/json/schema.graphql
@@ -243,6 +243,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/rest-api/schema.graphql b/examples/rest-api/schema.graphql
@@ -275,6 +275,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/roles/schema.graphql b/examples/roles/schema.graphql
@@ -407,6 +407,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/task-manager/schema.graphql b/examples/task-manager/schema.graphql
@@ -275,6 +275,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/testing/schema.graphql b/examples/testing/schema.graphql
@@ -317,6 +317,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/virtual-field/schema.graphql b/examples/virtual-field/schema.graphql
@@ -285,6 +285,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/examples/with-auth/schema.graphql b/examples/with-auth/schema.graphql
@@ -317,6 +317,7 @@ type KeystoneAdminUIListMeta {
   fields: [KeystoneAdminUIFieldMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean
 }
 
 type KeystoneAdminUIFieldMeta {

diff --git a/...ges/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx b/...ges/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx
@@ -26,10 +26,15 @@ type ListCardProps = {
 const ListCard = ({ listKey, count, hideCreate }: ListCardProps) => {
   const { colors, palette, radii, spacing } = useTheme();
   const list = useList(listKey);
+  const countNum = count.type === 'success' ? count.count : 0;
+
+  // on delete of singleton, go to homepage
   return (
     <div css={{ position: 'relative' }}>
       <Link
-        href={`/${list.path}`}
+        href={
+          list.isSingleton ? `/${list.path}/${countNum === 1 ? '1' : 'create'}` : `/${list.path}`
+        }
         css={{
           backgroundColor: colors.background,
           borderColor: colors.border,
@@ -62,7 +67,7 @@ const ListCard = ({ listKey, count, hideCreate }: ListCardProps) => {
           'No access'
         )}
       </Link>
-      {hideCreate === false && (
+      {hideCreate === false && !list.isSingleton && (
         <CreateButton title={`Create ${list.singular}`} href={`/${list.path}/create`}>
           <PlusIcon size="large" />
           <VisuallyHidden>Create {list.singular}</VisuallyHidden>