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.

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

IBX-7409: Changed Content Type label to content type #58

Merged
merged 3 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/bundle/Resources/config/graphql/Content.types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Content:
description: "The Content item's unique ID."
contentTypeId:
type: "Int!"
description: "The Content Type ID of the Content item."
description: "The content type ID of the Content item."
contentType:
type: "ContentType"
description: "The Content Type of the Content item."
description: "The content type of the Content item."
resolve: "@=resolver('ContentTypeById', [value.contentTypeId])"
name:
type: "String"
Expand Down
18 changes: 9 additions & 9 deletions src/bundle/Resources/config/graphql/ContentType.types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ContentType:
fields:
id:
type: "Int!"
description: "The Content Type's unique ID."
description: "The content type's unique ID."
description:
type: "String"
description: "The content type's description"
Expand All @@ -23,30 +23,30 @@ ContentType:
description: "The status of the content type. One of ContentType::STATUS_DEFINED|ContentType::STATUS_DRAFT|ContentType::STATUS_MODIFIED."
identifier:
type: "String"
description: "The identifier of the Content Type."
description: "The identifier of the content type."
name:
type: "String"
description: "The Content Type's name in the main language"
description: "The content type's name in the main language"
args:
language:
type: "RepositoryLanguage"
defaultValue: ~
resolve: "@=value.getName(args['language']) ?: ''"
names:
type: "[String]"
description: "The Content Type's names in all languages"
description: "The content type's names in all languages"
creationDate:
type: "DateTime"
description: "The date of the creation of this Content Type."
description: "The date of the creation of this content type."
modificationDate:
type: "DateTime"
description: "the date of the last modification of this Content Type."
description: "the date of the last modification of this content type."
creatorId:
type: "Int"
description: "The user id of the creator of this Content Type."
description: "The user id of the creator of this content type."
creator:
type: "User"
description: "The user who created this Content Type."
description: "The user who created this content type."
resolve: "@=resolver('UserById', [value.creatorId])"
modifierId:
type: "Int"
Expand All @@ -57,7 +57,7 @@ ContentType:
resolve: "@=resolver('UserById', [value.modifierId])"
remoteId:
type: "String"
description: "A global unique id of the Content Type."
description: "A global unique id of the content type."
urlAliasSchema:
type: "String"
description: "URL alias schema. If nothing is provided, nameSchema will be used instead."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AbstractDomainContent:
typeName: DomainContent
description: "The Content item's unique ID."
_type:
description: "The item's Content type"
description: "The item's content type"
type: ContentType
resolve: '@=resolver("ContentTypeById", [value.contentInfo.contentTypeId])'
_content:
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/graphql/Item.types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ AbstractItem:
typeName: DomainContent
description: "The Content item's unique ID."
_type:
description: "The item's Content type"
description: "The item's content type"
type: ContentType
resolve: '@=resolver("ContentTypeById", [value.getContentInfo().contentTypeId])'
_contentInfo:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Resolver/DomainContentMutationResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function updateDomainContent($input, Argument $args, $versionNo, $languag
try {
$contentType = $this->getContentTypeService()->loadContentType($contentInfo->contentTypeId);
} catch (RepositoryExceptions\NotFoundException $e) {
throw new UserError("Could not load Content Type with ID $contentInfo->contentTypeId");
throw new UserError("Could not load content type with ID $contentInfo->contentTypeId");
}

$contentUpdateStruct = $this->getContentService()->newContentUpdateStruct();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Schema/Domain/Content/ContentDomainIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function iterate(): Generator

foreach ($this->contentTypeService->loadContentTypes($contentTypeGroup) as $contentType) {
if (!$this->nameValidator->isValidName($contentType->identifier)) {
$this->nameValidator->generateInvalidNameWarning('Content Type', $contentType->identifier);
$this->nameValidator->generateInvalidNameWarning('Content type', $contentType->identifier);

continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Value/ContentFieldValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ContentFieldValue extends ValueObject
protected $fieldDefIdentifier;

/**
* Id of the Content Type this value is from.
* Id of the content type this value is from.
*/
protected $contentTypeId;

Expand Down
Loading