Skip to content

Commit

Permalink
Added MetaFieldDefinitionService
Browse files Browse the repository at this point in the history
  • Loading branch information
@ciastektk
ciastektk committed Sep 15, 2022
1 parent da72243 commit b02f117
Show file tree
Hide file tree
Showing 6 changed files with 214 additions and 128 deletions.
132 changes: 7 additions & 125 deletions src/bundle/Controller/ContentTypeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace Ibexa\Bundle\AdminUi\Controller;

use Ibexa\AdminUi\Config\AdminUiForms\ContentTypeFieldTypesResolverInterface;
use Ibexa\AdminUi\Form\Data\ContentType\ContentTypeCopyData;
use Ibexa\AdminUi\Form\Data\ContentType\ContentTypeEditData;
use Ibexa\AdminUi\Form\Data\ContentType\ContentTypesDeleteData;
Expand All @@ -19,11 +18,11 @@
use Ibexa\AdminUi\Form\Factory\FormFactory;
use Ibexa\AdminUi\Form\SubmitHandler;
use Ibexa\AdminUi\Form\Type\ContentType\ContentTypeUpdateType;
use Ibexa\AdminUi\Service\MetaFieldType\MetaFieldDefinitionServiceInterface;
use Ibexa\AdminUi\Tab\ContentType\TranslationsTab;
use Ibexa\AdminUi\UI\Module\FieldTypeToolbar\FieldTypeToolbarFactory;
use Ibexa\AdminUi\View\ContentTypeCreateView;
use Ibexa\AdminUi\View\ContentTypeEditView;
use Ibexa\Bundle\AdminUi\DependencyInjection\Configuration\Parser\AdminUiForms;
use Ibexa\ContentForms\Form\ActionDispatcher\ActionDispatcherInterface;
use Ibexa\Contracts\AdminUi\Controller\Controller;
use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface;
Expand All @@ -35,15 +34,9 @@
use Ibexa\Contracts\Core\Repository\UserService;
use Ibexa\Contracts\Core\Repository\Values\Content\Language;
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeCreateStruct;
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft;
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup;
use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCollection;
use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct;
use Ibexa\Contracts\Core\Repository\Values\ValueObject;
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
use Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList;
use Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface;
use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
use Pagerfanta\Adapter\ArrayAdapter;
use Pagerfanta\Pagerfanta;
Expand All @@ -55,10 +48,6 @@

class ContentTypeController extends Controller
{
private ContentTypeFieldTypesResolverInterface $contentTypeFieldTypesResolver;

private LocaleConverterInterface $localeConverter;

/** @var \Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface */
private $notificationHandler;

Expand Down Expand Up @@ -97,11 +86,9 @@ class ContentTypeController extends Controller
/** @var \Ibexa\AdminUi\UI\Module\FieldTypeToolbar\FieldTypeToolbarFactory */
private $fieldTypeToolbarFactory;

private FieldsGroupsList $fieldsGroupsList;
private MetaFieldDefinitionServiceInterface $metaFieldDefinitionService;

public function __construct(
ContentTypeFieldTypesResolverInterface $contentTypeFieldTypesResolver,
LocaleConverterInterface $localeConverter,
TranslatableNotificationHandlerInterface $notificationHandler,
TranslatorInterface $translator,
ContentTypeService $contentTypeService,
Expand All @@ -114,10 +101,8 @@ public function __construct(
ContentTypeDraftMapper $contentTypeDraftMapper,
ConfigResolverInterface $configResolver,
FieldTypeToolbarFactory $fieldTypeToolbarFactory,
FieldsGroupsList $fieldsGroupsList
MetaFieldDefinitionServiceInterface $metaFieldDefinitionService
) {
$this->contentTypeFieldTypesResolver = $contentTypeFieldTypesResolver;
$this->localeConverter = $localeConverter;
$this->notificationHandler = $notificationHandler;
$this->translator = $translator;
$this->contentTypeService = $contentTypeService;
Expand All @@ -130,7 +115,7 @@ public function __construct(
$this->contentTypeDraftMapper = $contentTypeDraftMapper;
$this->configResolver = $configResolver;
$this->fieldTypeToolbarFactory = $fieldTypeToolbarFactory;
$this->fieldsGroupsList = $fieldsGroupsList;
$this->metaFieldDefinitionService = $metaFieldDefinitionService;
}

/**
Expand Down Expand Up @@ -209,7 +194,7 @@ public function addAction(ContentTypeGroup $group)
$createStruct->mainLanguageCode = $mainLanguageCode;
$createStruct->names = [$mainLanguageCode => 'New Content Type'];

$this->addMetaFieldDefinitions($createStruct, $this->languageService->loadLanguage($mainLanguageCode));
$this->metaFieldDefinitionService->addMetaFieldDefinitions($createStruct, $this->languageService->loadLanguage($mainLanguageCode));

try {
$contentTypeDraft = $this->contentTypeService->createContentType($createStruct, [$group]);
Expand Down Expand Up @@ -397,7 +382,7 @@ public function editAction(Request $request, ContentTypeGroup $group, ContentTyp
['contentType' => $contentType]
);

$this->addMetaFieldDefinitions($contentTypeDraft);
$this->metaFieldDefinitionService->addMetaFieldDefinitions($contentTypeDraft);

$form->handleRequest($request);
if ($form->isSubmitted()) {
Expand Down Expand Up @@ -742,7 +727,7 @@ public function createUpdateForm(
Language $language = null,
?Language $baseLanguage = null
): FormInterface {
$this->addMetaFieldDefinitions($contentTypeDraft, $language);
$this->metaFieldDefinitionService->addMetaFieldDefinitions($contentTypeDraft, $language);
$contentTypeData = $this->contentTypeDraftMapper->mapToFormData(
$contentTypeDraft,
[
Expand Down Expand Up @@ -783,109 +768,6 @@ protected function createDeleteForm(ContentTypeGroup $group, ContentType $conten
return $formBuilder->getForm();
}

private function addMetaFieldDefinitions(
ValueObject $contentType,
?Language $language = null
): void {
$metaFieldTypeIdentifiers = $this->contentTypeFieldTypesResolver->getMetaFieldTypeIdentifiers();

if (null === $language) {
$language = $this->languageService->loadLanguage($this->languageService->getDefaultLanguageCode());
}

foreach ($metaFieldTypeIdentifiers as $metaFieldTypeIdentifier) {
$fieldGroup = $this->getDefaultMetaDataFieldTypeGroup() ?? $this->fieldsGroupsList->getDefaultGroup();

if ($this->isMetaFieldDefinitionExists($metaFieldTypeIdentifier, $fieldGroup, $contentType)) {
continue;
}

$fieldDefinitionCreateStruct = $this->createMetaFieldDefinitionCreateStruct(
$metaFieldTypeIdentifier,
$fieldGroup,
$language,
$this->getNextFieldPosition($contentType)
);

if ($contentType instanceof ContentTypeDraft) {
$this->contentTypeService->addFieldDefinition($contentType, $fieldDefinitionCreateStruct);
}

if ($contentType instanceof ContentTypeCreateStruct) {
$contentType->addFieldDefinition($fieldDefinitionCreateStruct);
}
}
}

private function createMetaFieldDefinitionCreateStruct(
string $identifier,
string $fieldGroup,
Language $language,
int $position
): FieldDefinitionCreateStruct {
$fieldDefinitionCreateStruct = $this->contentTypeService->newFieldDefinitionCreateStruct(
uniqid('field_'),
$identifier
);

$fieldDefinitionCreateStruct->fieldGroup = $fieldGroup;
$label = $this->translator->trans(/** @Ignore */
$identifier . '.name',
[],
'fieldtypes',
$this->localeConverter->convertToPOSIX($language->languageCode)
);

$fieldDefinitionCreateStruct->names = [
$language->languageCode => $label,
];

$fieldDefinitionCreateStruct->position = $position;

return $fieldDefinitionCreateStruct;
}

private function isMetaFieldDefinitionExists(
string $fieldTypeIdentifier,
string $fieldTypeGroup,
ValueObject $contentType
): bool {
foreach ($contentType->fieldDefinitions as $fieldDefinition) {
if (
$fieldDefinition->fieldTypeIdentifier === $fieldTypeIdentifier
&& $fieldDefinition->fieldGroup === $fieldTypeGroup
) {
return true;
}
}

return false;
}

private function getNextFieldPosition(ValueObject $contentType): int
{
$fieldDefinitions = $contentType->fieldDefinitions;

if (is_array($fieldDefinitions) && !empty($fieldDefinitions)) {
return end($fieldDefinitions)->position + 1;
}

if ($fieldDefinitions instanceof FieldDefinitionCollection && !$fieldDefinitions->isEmpty()) {
return $contentType->fieldDefinitions->last()->position + 1;
}

return 0;
}

private function getDefaultMetaDataFieldTypeGroup(): ?string
{
if (!$this->configResolver->hasParameter(AdminUiForms::CONTENT_TYPE_DEFAULT_META_FIELD_TYPE_GROUP_PARAM)) {
return null;
}

return $this->configResolver->getParameter(AdminUiForms::CONTENT_TYPE_DEFAULT_META_FIELD_TYPE_GROUP_PARAM);
}

/**
* @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] $contentTypes
*
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/config/services.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ imports:
- { resource: services/modules/field_type_toolbar.yaml }
- { resource: services/form_processors.yaml }
- { resource: services/validators.yaml }
- { resource: services/services.yaml }
- { resource: services/siteaccess.yaml }
- { resource: services/universal_discovery_widget.yaml }
- { resource: services/utils.yaml }
Expand Down
10 changes: 10 additions & 0 deletions src/bundle/Resources/config/services/services.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
_defaults:
autowire: true
autoconfigure: true
public: false

Ibexa\AdminUi\Service\MetaFieldType\MetaFieldDefinitionService: ~

Ibexa\AdminUi\Service\MetaFieldType\MetaFieldDefinitionServiceInterface:
'@Ibexa\AdminUi\Service\MetaFieldType\MetaFieldDefinitionService'
3 changes: 0 additions & 3 deletions src/lib/Form/Data/FieldDefinitionData.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
*/
class FieldDefinitionData extends FieldDefinitionUpdateStruct
{
/**
* @var bool
*/
public bool $enabled;

/**
Expand Down
Loading

0 comments on commit b02f117

Please sign in to comment.