Skip to content

Commit

Permalink
IBX-1696: Rebranded Container parameters and Config Resolver namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
alongosz committed Feb 1, 2022
1 parent d3ba82e commit 1f3d2ab
Show file tree
Hide file tree
Showing 15 changed files with 115 additions and 115 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function process(ContainerBuilder $container)
{
$successHandlerDef = $container->getDefinition('security.authentication.success_handler');
$successHandlerDef->setClass(RedirectToDashboardAuthenticationSuccessHandler::class);
$successHandlerDef->addArgument($container->getParameter('ezpublish.siteaccess.groups'));
$successHandlerDef->addArgument($container->getParameter('ibexa.site_access.groups'));
$successHandlerDef->addArgument('ibexa.dashboard');
}
}
Expand Down
44 changes: 22 additions & 22 deletions src/bundle/Resources/config/default_parameters.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
parameters:
ezsettings.default.content_type.about:
ibexa.site_access.config.default.content_type.about:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#about'
ezsettings.default.content_type.article:
ibexa.site_access.config.default.content_type.article:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#article'
ezsettings.default.content_type.blog:
ibexa.site_access.config.default.content_type.blog:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#blog'
ezsettings.default.content_type.blog_post:
ibexa.site_access.config.default.content_type.blog_post:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#blog_post'
ezsettings.default.content_type.folder:
ibexa.site_access.config.default.content_type.folder:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#folder'
ezsettings.default.content_type.form:
ibexa.site_access.config.default.content_type.form:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#form'
ezsettings.default.content_type.place:
ibexa.site_access.config.default.content_type.place:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#place'
ezsettings.default.content_type.product:
ibexa.site_access.config.default.content_type.product:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#product'
ezsettings.default.content_type.field:
ibexa.site_access.config.default.content_type.field:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#field'
ezsettings.default.content_type.user:
ibexa.site_access.config.default.content_type.user:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#user'
ezsettings.default.content_type.user_group:
ibexa.site_access.config.default.content_type.user_group:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#user_group'
ezsettings.default.content_type.file:
ibexa.site_access.config.default.content_type.file:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#file'
ezsettings.default.content_type.gallery:
ibexa.site_access.config.default.content_type.gallery:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#gallery'
ezsettings.default.content_type.image:
ibexa.site_access.config.default.content_type.image:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#image'
ezsettings.default.content_type.video:
ibexa.site_access.config.default.content_type.video:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#video'
ezsettings.default.content_type.landing_page:
ibexa.site_access.config.default.content_type.landing_page:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#landing_page'
ezsettings.default.content_type.default-config:
ibexa.site_access.config.default.content_type.default-config:
thumbnail: '/bundles/ibexaadminui/img/ibexa-icons.svg#file'

ezplatform.content_view.tabs.default_template: '@@ibexadesign/ui/tab/default.html.twig'
ibexa.content_view.tabs.default_template: '@@ibexadesign/ui/tab/default.html.twig'

ezplatform.multifile_upload.location.mappings: []
ibexa.multifile_upload.location.mappings: []

ezplatform.multifile_upload.location.default_mappings:
ibexa.multifile_upload.location.default_mappings:
# Image
- mime_types:
- image/jpeg
Expand Down Expand Up @@ -68,11 +68,11 @@ parameters:
content_field_identifier: file
name_field_identifier: name

ezplatform.multifile_upload.fallback_content_type:
ibexa.multifile_upload.fallback_content_type:
content_type_identifier: file
content_field_identifier: file
name_field_identifier: name

ez_systems.multifile_upload.max_file_size: 5242880
ibexa.io.multifile_upload.max_file_size: 5242880

ibexa.admin_ui.content_tree.node_factory.max_location_ids_in_single_aggregation: 100
116 changes: 58 additions & 58 deletions src/bundle/Resources/config/ezplatform_default_settings.yaml
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
parameters:
# System Location IDs
ezsettings.default.location_ids.content_structure: 2
ezsettings.default.location_ids.media: 43
ezsettings.default.location_ids.users: 5
ibexa.site_access.config.default.location_ids.content_structure: 2
ibexa.site_access.config.default.location_ids.media: 43
ibexa.site_access.config.default.location_ids.users: 5

# Pagination limits
ezsettings.admin_group.pagination.search_limit: 10
ezsettings.admin_group.pagination.trash_limit: 10
ezsettings.admin_group.pagination.section_limit: 10
ezsettings.admin_group.pagination.language_limit: 10
ezsettings.admin_group.pagination.role_limit: 10
ezsettings.admin_group.pagination.content_type_group_limit: 10
ezsettings.admin_group.pagination.content_type_limit: 10
ezsettings.admin_group.pagination.role_assignment_limit: 10
ezsettings.admin_group.pagination.policy_limit: 10
ezsettings.admin_group.pagination.version_draft_limit: 5
ezsettings.admin_group.pagination.reverse_relation_limit: 10
ezsettings.admin_group.pagination.content_system_url_limit: 5
ezsettings.admin_group.pagination.content_custom_url_limit: 5
ezsettings.admin_group.pagination.content_role_limit: 5
ezsettings.admin_group.pagination.content_policy_limit: 5
ezsettings.admin_group.pagination.bookmark_limit: 10
ezsettings.admin_group.pagination.notification_limit: 5
ezsettings.admin_group.pagination.user_settings_limit: 10
ezsettings.admin_group.pagination.content_draft_limit: 10
ezsettings.admin_group.pagination.location_limit: 10
ezsettings.admin_group.pagination.url_wildcards: 10
ibexa.site_access.config.admin_group.pagination.search_limit: 10
ibexa.site_access.config.admin_group.pagination.trash_limit: 10
ibexa.site_access.config.admin_group.pagination.section_limit: 10
ibexa.site_access.config.admin_group.pagination.language_limit: 10
ibexa.site_access.config.admin_group.pagination.role_limit: 10
ibexa.site_access.config.admin_group.pagination.content_type_group_limit: 10
ibexa.site_access.config.admin_group.pagination.content_type_limit: 10
ibexa.site_access.config.admin_group.pagination.role_assignment_limit: 10
ibexa.site_access.config.admin_group.pagination.policy_limit: 10
ibexa.site_access.config.admin_group.pagination.version_draft_limit: 5
ibexa.site_access.config.admin_group.pagination.reverse_relation_limit: 10
ibexa.site_access.config.admin_group.pagination.content_system_url_limit: 5
ibexa.site_access.config.admin_group.pagination.content_custom_url_limit: 5
ibexa.site_access.config.admin_group.pagination.content_role_limit: 5
ibexa.site_access.config.admin_group.pagination.content_policy_limit: 5
ibexa.site_access.config.admin_group.pagination.bookmark_limit: 10
ibexa.site_access.config.admin_group.pagination.notification_limit: 5
ibexa.site_access.config.admin_group.pagination.user_settings_limit: 10
ibexa.site_access.config.admin_group.pagination.content_draft_limit: 10
ibexa.site_access.config.admin_group.pagination.location_limit: 10
ibexa.site_access.config.admin_group.pagination.url_wildcards: 10

# Security
ezsettings.admin_group.security.token_interval_spec: PT1H
ibexa.site_access.config.admin_group.security.token_interval_spec: PT1H

# Subitems Module
ezsettings.default.subitems_module.limit: 10
ibexa.site_access.config.default.subitems_module.limit: 10

# User identifier
ezsettings.admin_group.user_content_type_identifier: ['user']
ibexa.site_access.config.admin_group.user_content_type_identifier: ['user']

# User Group identifier
ezsettings.admin_group.user_group_content_type_identifier: ['user_group']
ibexa.site_access.config.admin_group.user_group_content_type_identifier: ['user_group']

# Subtree Operations
ezsettings.admin_group.subtree_operations.copy_subtree.limit: 100
ibexa.site_access.config.admin_group.subtree_operations.copy_subtree.limit: 100

# Notifications
ezsettings.admin_group.notifications.error.timeout: 0
ezsettings.admin_group.notifications.warning.timeout: 0
ezsettings.admin_group.notifications.success.timeout: 5000
ezsettings.admin_group.notifications.info.timeout: 0
ibexa.site_access.config.admin_group.notifications.error.timeout: 0
ibexa.site_access.config.admin_group.notifications.warning.timeout: 0
ibexa.site_access.config.admin_group.notifications.success.timeout: 5000
ibexa.site_access.config.admin_group.notifications.info.timeout: 0

# Views
ezsettings.default.content_translate_view: {}
ezsettings.default.limitation_value_templates:
ibexa.site_access.config.default.content_translate_view: {}
ibexa.site_access.config.default.limitation_value_templates:
- { template: '@@ibexadesign/limitation/limitation_values.html.twig', priority: 0 }
ezsettings.admin_group.user_settings.templates.list: "@@ibexadesign/account/settings/list.html.twig"
ezsettings.admin_group.user_settings.templates.update: "@@ibexadesign/account/settings/update.html.twig"
ezsettings.admin_group.user_change_password.templates.form: "@@ibexadesign/account/change_password/index.html.twig"
ezsettings.admin_group.user_forgot_password.templates.form: "@@ibexadesign/account/forgot_password/index.html.twig"
ezsettings.admin_group.user_forgot_password_success.templates.form: "@@ibexadesign/account/forgot_password/confirmation_page.html.twig"
ezsettings.admin_group.user_forgot_password_login.templates.form: "@@ibexadesign/account/forgot_password/index_with_login.html.twig"
ezsettings.admin_group.user_forgot_password.templates.mail: "@@ibexadesign/account/forgot_password/mail.html.twig"
ezsettings.admin_group.user_reset_password.templates.form: "@@ibexadesign/account/reset_password/index.html.twig"
ezsettings.admin_group.user_reset_password.templates.invalid_link: "@@ibexadesign/account/reset_password/invalid_link_page.html.twig"
ezsettings.admin_group.user_reset_password.templates.success: "@@ibexadesign/account/reset_password/confirmation_page.html.twig"
ezsettings.admin_group.user_edit.templates.update: '@@ibexadesign/user/edit.html.twig'
ezsettings.admin_group.user_edit.templates.create: '@@ibexadesign/user/create.html.twig'
ibexa.site_access.config.admin_group.user_settings.templates.list: "@@ibexadesign/account/settings/list.html.twig"
ibexa.site_access.config.admin_group.user_settings.templates.update: "@@ibexadesign/account/settings/update.html.twig"
ibexa.site_access.config.admin_group.user_change_password.templates.form: "@@ibexadesign/account/change_password/index.html.twig"
ibexa.site_access.config.admin_group.user_forgot_password.templates.form: "@@ibexadesign/account/forgot_password/index.html.twig"
ibexa.site_access.config.admin_group.user_forgot_password_success.templates.form: "@@ibexadesign/account/forgot_password/confirmation_page.html.twig"
ibexa.site_access.config.admin_group.user_forgot_password_login.templates.form: "@@ibexadesign/account/forgot_password/index_with_login.html.twig"
ibexa.site_access.config.admin_group.user_forgot_password.templates.mail: "@@ibexadesign/account/forgot_password/mail.html.twig"
ibexa.site_access.config.admin_group.user_reset_password.templates.form: "@@ibexadesign/account/reset_password/index.html.twig"
ibexa.site_access.config.admin_group.user_reset_password.templates.invalid_link: "@@ibexadesign/account/reset_password/invalid_link_page.html.twig"
ibexa.site_access.config.admin_group.user_reset_password.templates.success: "@@ibexadesign/account/reset_password/confirmation_page.html.twig"
ibexa.site_access.config.admin_group.user_edit.templates.update: '@@ibexadesign/user/edit.html.twig'
ibexa.site_access.config.admin_group.user_edit.templates.create: '@@ibexadesign/user/create.html.twig'

# Content Tree Module
ezsettings.admin_group.content_tree_module.load_more_limit: 30
ezsettings.admin_group.content_tree_module.children_load_max_limit: 200
ezsettings.admin_group.content_tree_module.tree_max_depth: 10
ezsettings.admin_group.content_tree_module.allowed_content_types: []
ezsettings.admin_group.content_tree_module.ignored_content_types: []
ezsettings.admin_group.content_tree_module.tree_root_location_id: ~
ezsettings.default.content_tree_module.contextual_tree_root_location_ids: []
ibexa.site_access.config.admin_group.content_tree_module.load_more_limit: 30
ibexa.site_access.config.admin_group.content_tree_module.children_load_max_limit: 200
ibexa.site_access.config.admin_group.content_tree_module.tree_max_depth: 10
ibexa.site_access.config.admin_group.content_tree_module.allowed_content_types: []
ibexa.site_access.config.admin_group.content_tree_module.ignored_content_types: []
ibexa.site_access.config.admin_group.content_tree_module.tree_root_location_id: ~
ibexa.site_access.config.default.content_tree_module.contextual_tree_root_location_ids: []

# Autosave
ezsettings.default.autosave.enabled: false
ezsettings.default.autosave.interval: 60
ibexa.site_access.config.default.autosave.enabled: false
ibexa.site_access.config.default.autosave.interval: 60

ezsettings.admin_group.autosave.enabled: true
ezsettings.admin_group.autosave.interval: 60
ibexa.site_access.config.admin_group.autosave.enabled: true
ibexa.site_access.config.admin_group.autosave.interval: 60
6 changes: 3 additions & 3 deletions src/bundle/Resources/config/role.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
# Limitation mappers
ezplatform.content_forms.limitation.null.template: "@@ibexadesign/limitation/null_limitation_values.html.twig"
ezplatform.content_forms.limitation.udw.template: "@@ibexadesign/limitation/udw_limitation_value.html.twig"
ezplatform.content_forms.limitation.multiple_selection.template: "@@ibexadesign/limitation/base_limitation_values.html.twig"
ibexa.content_forms.limitation.null.template: "@@ibexadesign/limitation/null_limitation_values.html.twig"
ibexa.content_forms.limitation.udw.template: "@@ibexadesign/limitation/udw_limitation_value.html.twig"
ibexa.content_forms.limitation.multiple_selection.template: "@@ibexadesign/limitation/base_limitation_values.html.twig"
6 changes: 3 additions & 3 deletions src/bundle/Resources/config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ services:

Ibexa\AdminUi\EventListener\CredentialsExpiredListener:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
tags:
- {name: kernel.event_subscriber}

Ibexa\AdminUi\EventListener\CredentialsExpirationWarningListener:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
tags:
- {name: kernel.event_subscriber}

Expand All @@ -145,6 +145,6 @@ services:
$formFactory: '@form.factory'
$configResolver: '@ibexa.config.resolver'
$requestStack: '@request_stack'
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
tags:
- {name: kernel.event_subscriber}
10 changes: 5 additions & 5 deletions src/bundle/Resources/config/services/events.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ services:

Ibexa\AdminUi\EventListener\RequestListener:
arguments:
- '%ezpublish.siteaccess.groups_by_siteaccess%'
- '%ibexa.site_access.groups_by_site_access%'
tags:
- { name: kernel.event_subscriber }

Ibexa\AdminUi\EventListener\RequestLocaleListener:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
$availableTranslations: '%available_translations%'
tags:
- { name: kernel.event_subscriber }

Ibexa\AdminUi\EventListener\RequestAttributesListener:
arguments:
- '%ezpublish.siteaccess.groups%'
- '%ibexa.site_access.groups%'
tags:
- {name: kernel.event_subscriber}

Ibexa\AdminUi\EventListener\AdminExceptionListener:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
$kernelProjectDir: '%kernel.project_dir%'
$kernelEnvironment: '%kernel.environment%'
$encoreTagRenderer: '@webpack_encore.tag_renderer'
Expand All @@ -49,6 +49,6 @@ services:

Ibexa\AdminUi\EventListener\ContentDownloadRouteReferenceListener:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
tags:
- {name: kernel.event_subscriber}
12 changes: 6 additions & 6 deletions src/bundle/Resources/config/services/form_processors.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
ezplatform.content_forms.form_processor.content_type.options.redirect_route_after_publish: ~
ezplatform.content_forms.form_processor.content_type.options:
redirectRouteAfterPublish: "%ezplatform.content_forms.form_processor.content_type.options.redirect_route_after_publish%"
ibexa.content_forms.form_processor.content_type.options.redirect_route_after_publish: ~
ibexa.content_forms.form_processor.content_type.options:
redirectRouteAfterPublish: '%ibexa.content_forms.form_processor.content_type.options.redirect_route_after_publish%'

services:
_defaults:
Expand All @@ -25,21 +25,21 @@ services:
public: true
decorates: Ibexa\ContentForms\Form\Processor\SystemUrlRedirectProcessor
arguments:
$siteaccessGroups: '%ezpublish.siteaccess.groups%'
$siteaccessGroups: '%ibexa.site_access.groups%'
$systemUrlRedirectProcessor: '@Ibexa\AdminUi\Form\Processor\Content\UrlRedirectProcessor.inner'

Ibexa\AdminUi\Form\Processor\ContentEditNotificationFormProcessor:
public: true
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'

Ibexa\AdminUi\Form\Processor\ContentType\ContentTypeDiscardChangesFormProcessor: ~

Ibexa\AdminUi\Form\Processor\ContentType\ContentTypeFormProcessor:
arguments:
- '@ibexa.api.service.content_type'
- "@router"
- "%ezplatform.content_forms.form_processor.content_type.options%"
- '%ibexa.content_forms.form_processor.content_type.options%'
calls:
- [ setGroupsList, [ '@Ibexa\Core\Helper\FieldsGroups\ArrayTranslatorFieldsGroupsList' ] ]

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/services/forms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ services:

Ibexa\AdminUi\Form\Type\Policy\PolicyChoiceType:
arguments:
$policyMap: "%ezpublish.api.role.policy_map%"
$policyMap: '%ibexa.api.role.policy_map%'

Ibexa\AdminUi\Form\Type\Policy\PolicyCreateType: ~

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/services/rest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ services:

Ibexa\AdminUi\REST\Security\NonAdminRESTRequestMatcher:
arguments:
$siteAccessGroups: '%ezpublish.siteaccess.groups%'
$siteAccessGroups: '%ibexa.site_access.groups%'
Loading

0 comments on commit 1f3d2ab

Please sign in to comment.