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.

Sign up for GitHub

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

Jump to bottom

feat(api-headless-cms): optional validation graphql #3562

Merged
merged 4 commits into from
Sep 29, 2023
Merged

feat(api-headless-cms): optional validation graphql #3562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
860c69d
feat(api-headless-cms): remove graphql required fields
brunozoric Sep 28, 2023
0150daa
test(api-headless-cms): update tests to accommodate removal of graphq…
brunozoric Sep 28, 2023
db6fcbd
fix(api-headless-cms): graphql fields with required mark
brunozoric Sep 28, 2023
1cf0646
Merge branch 'next' into feat/bruno/api-headless-cms/optional-entry-v…
brunozoric Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
403 changes: 403 additions & 0 deletions apps/api/graphql/src/test.ts
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions packages/api-aco/__tests__/snapshots/customAppsSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export const createCustomAppsSchemaSnapshot = () => {
}

input AcoSearchRecordCustomTestingApp_LocationInput {
folderId: String!
folderId: String
}

input AcoSearchRecordCustomTestingApp_Data_IdentityInput {
Expand All @@ -155,11 +155,11 @@ export const createCustomAppsSchemaSnapshot = () => {

input AcoSearchRecordCustomTestingAppCreateInput {
id: ID
type: String!
title: String!
type: String
title: String
content: String
location: AcoSearchRecordCustomTestingApp_LocationInput!
data: AcoSearchRecordCustomTestingApp_DataInput!
location: AcoSearchRecordCustomTestingApp_LocationInput
data: AcoSearchRecordCustomTestingApp_DataInput
tags: [String!]
}

Expand Down
10 changes: 5 additions & 5 deletions packages/api-aco/__tests__/snapshots/defaultAppsSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const createDefaultAppsSchemaSnapshot = () => {
}

input AcoSearchRecordWebiny_LocationInput {
folderId: String!
folderId: String
}

input AcoSearchRecordWebiny_Data_IdentityInput {
Expand All @@ -129,11 +129,11 @@ export const createDefaultAppsSchemaSnapshot = () => {

input AcoSearchRecordWebinyCreateInput {
id: ID
type: String!
title: String!
type: String
title: String
content: String
location: AcoSearchRecordWebiny_LocationInput!
data: AcoSearchRecordWebiny_DataInput!
location: AcoSearchRecordWebiny_LocationInput
data: AcoSearchRecordWebiny_DataInput
tags: [String!]
}

Expand Down
8 changes: 4 additions & 4 deletions packages/api-file-manager/__tests__/mocks/file.sdl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ export default /* GraphQL */ `
input FmFileCreateInput {
id: ID!
location: FmFile_LocationInput
name: String!
key: String!
type: String!
size: Number!
name: String
key: String
type: String
size: Number
meta: FmFile_MetaInput
tags: [String!]
aliases: [String!]
Expand Down
24 changes: 0 additions & 24 deletions packages/api-headless-cms/__tests__/contentAPI/fieldValidations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,30 +140,6 @@ describe("fieldValidations", () => {
}
}
});

/**
* GraphQL response must break when not sending required value.
*/
const [requiredResponse] = await createFruit({
data: {
...defaultFruitData,
name: undefined
}
});

expect(requiredResponse).toEqual({
errors: [
{
message: expect.any(String),
locations: [
{
column: expect.any(Number),
line: expect.any(Number)
}
]
}
]
});
});
/**
* testing minLength and maxLength of the array
Expand Down
10 changes: 8 additions & 2 deletions packages/api-headless-cms/__tests__/contentAPI/republish.entries.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ describe("Republish entries", () => {
category: {
entryId: applePublished.id,
modelId: categoryModel.modelId
}
},
price: 1,
color: "red",
image: "https://webiny.com/gala.png"
});
const { entry: goldenEntry } = createEntry(
productModel,
Expand All @@ -305,7 +308,10 @@ describe("Republish entries", () => {
category: {
entryId: bananaPublished.id,
modelId: categoryModel.modelId
}
},
price: 1,
color: "white",
image: "https://webiny.com/golden.png"
},
5
);
Expand Down
10 changes: 5 additions & 5 deletions packages/api-headless-cms/__tests__/contentAPI/snapshots/category.manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export default /* GraphQL */ `
input CategoryApiNameWhichIsABitDifferentThanModelIdInput {
id: ID
wbyAco_location: WbyAcoLocationInput
title: String!
slug: String!
title: String
slug: String
}

input CategoryApiNameWhichIsABitDifferentThanModelIdGetWhereInput {
Expand Down Expand Up @@ -158,11 +158,11 @@ export default /* GraphQL */ `
}

extend type Mutation {
createCategoryApiNameWhichIsABitDifferentThanModelId(data: CategoryApiNameWhichIsABitDifferentThanModelIdInput!): CategoryApiNameWhichIsABitDifferentThanModelIdResponse
createCategoryApiNameWhichIsABitDifferentThanModelId(data: CategoryApiNameWhichIsABitDifferentThanModelIdInput!, options: CreateCmsEntryOptionsInput): CategoryApiNameWhichIsABitDifferentThanModelIdResponse

createCategoryApiNameWhichIsABitDifferentThanModelIdFrom(revision: ID!, data: CategoryApiNameWhichIsABitDifferentThanModelIdInput): CategoryApiNameWhichIsABitDifferentThanModelIdResponse
createCategoryApiNameWhichIsABitDifferentThanModelIdFrom(revision: ID!, data: CategoryApiNameWhichIsABitDifferentThanModelIdInput, options: CreateRevisionCmsEntryOptionsInput): CategoryApiNameWhichIsABitDifferentThanModelIdResponse

updateCategoryApiNameWhichIsABitDifferentThanModelId(revision: ID!, data: CategoryApiNameWhichIsABitDifferentThanModelIdInput!): CategoryApiNameWhichIsABitDifferentThanModelIdResponse
updateCategoryApiNameWhichIsABitDifferentThanModelId(revision: ID!, data: CategoryApiNameWhichIsABitDifferentThanModelIdInput!, options: UpdateCmsEntryOptionsInput): CategoryApiNameWhichIsABitDifferentThanModelIdResponse

moveCategoryApiNameWhichIsABitDifferentThanModelId(revision: ID!, folderId: ID!): CategoryApiNameWhichIsABitDifferentThanModelIdMoveResponse

Expand Down
8 changes: 5 additions & 3 deletions packages/api-headless-cms/__tests__/contentAPI/snapshots/page.manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default /* GraphQL */ `
}

input PageModelApiName_Content_HeroInput {
title: String!
title: String
}

input PageModelApiName_Content_SimpleTextInput {
Expand Down Expand Up @@ -257,7 +257,7 @@ export default /* GraphQL */ `
}

input PageModelApiName_Content_AuthorInput {
author: RefFieldInput!
author: RefFieldInput
authors: [RefFieldInput!]
}

Expand Down Expand Up @@ -437,16 +437,18 @@ export default /* GraphQL */ `
}

extend type Mutation {
createPageModelApiName(data: PageModelApiNameInput!): PageModelApiNameResponse
createPageModelApiName(data: PageModelApiNameInput!, options: CreateCmsEntryOptionsInput): PageModelApiNameResponse

createPageModelApiNameFrom(
revision: ID!
data: PageModelApiNameInput
options: CreateRevisionCmsEntryOptionsInput
): PageModelApiNameResponse

updatePageModelApiName(
revision: ID!
data: PageModelApiNameInput!
options: UpdateCmsEntryOptionsInput
): PageModelApiNameResponse

movePageModelApiName(revision: ID!, folderId: ID!): PageModelApiNameMoveResponse
Expand Down
22 changes: 11 additions & 11 deletions packages/api-headless-cms/__tests__/contentAPI/snapshots/product.manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export default /* GraphQL */ `
name: String
price: Number
image: String
category: RefFieldInput!
category: RefFieldInput
categories: [RefFieldInput]
longText: [String]
}
Expand All @@ -149,27 +149,27 @@ export default /* GraphQL */ `
name: String
price: Number
images: [String]
category: RefFieldInput!
category: RefFieldInput
options: [ProductApiSingular_Variant_OptionsInput!]
}

input ProductApiSingular_FieldsObjectInput {
text: String!
text: String
}


input ProductApiSingularInput {
id: ID
wbyAco_location: WbyAcoLocationInput
title: String!
category: RefFieldInput!
price: Number!
title: String
category: RefFieldInput
price: Number
inStock: Boolean
itemsInStock: Number
availableOn: Date
color: String!
color: String
availableSizes: [String!]
image: String!
image: String
richText: JSON
variant: ProductApiSingular_VariantInput
fieldsObject: ProductApiSingular_FieldsObjectInput
Expand Down Expand Up @@ -360,11 +360,11 @@ export default /* GraphQL */ `
}

extend type Mutation {
createProductApiSingular(data: ProductApiSingularInput!): ProductApiSingularResponse
createProductApiSingular(data: ProductApiSingularInput!, options: CreateCmsEntryOptionsInput): ProductApiSingularResponse

createProductApiSingularFrom(revision: ID!, data: ProductApiSingularInput): ProductApiSingularResponse
createProductApiSingularFrom(revision: ID!, data: ProductApiSingularInput, options: CreateRevisionCmsEntryOptionsInput): ProductApiSingularResponse

updateProductApiSingular(revision: ID!, data: ProductApiSingularInput!): ProductApiSingularResponse
updateProductApiSingular(revision: ID!, data: ProductApiSingularInput!, options: UpdateCmsEntryOptionsInput): ProductApiSingularResponse

moveProductApiSingular(revision: ID!, folderId: ID!): ProductApiSingularMoveResponse

Expand Down
8 changes: 4 additions & 4 deletions packages/api-headless-cms/__tests__/contentAPI/snapshots/review.manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default /* GraphQL */ `
input ReviewApiModelInput {
id: ID
wbyAco_location: WbyAcoLocationInput
text: String!
text: String
product: RefFieldInput
rating: Number
author: RefFieldInput
Expand Down Expand Up @@ -170,11 +170,11 @@ export default /* GraphQL */ `
}

extend type Mutation {
createReviewApiModel(data: ReviewApiModelInput!): ReviewApiModelResponse
createReviewApiModel(data: ReviewApiModelInput!, options: CreateCmsEntryOptionsInput): ReviewApiModelResponse

createReviewApiModelFrom(revision: ID!, data: ReviewApiModelInput): ReviewApiModelResponse
createReviewApiModelFrom(revision: ID!, data: ReviewApiModelInput, options: CreateRevisionCmsEntryOptionsInput): ReviewApiModelResponse

updateReviewApiModel(revision: ID!, data: ReviewApiModelInput!): ReviewApiModelResponse
updateReviewApiModel(revision: ID!, data: ReviewApiModelInput!, options: UpdateCmsEntryOptionsInput): ReviewApiModelResponse

moveReviewApiModel(revision: ID!, folderId: ID!): ReviewApiModelMoveResponse

Expand Down
Loading
Loading