IBX-9947: Rebranded field type identifiers (#70)

barw4 · web-flow · commit fa9a093d25ff · 2025-06-06T00:37:15.000+02:00
diff --git a/src/bundle/Resources/config/services/fieldtype.yaml b/src/bundle/Resources/config/services/fieldtype.yaml
@@ -1,5 +1,6 @@
 parameters:
-    ibexa.field_type.matrix.identifier: 'ezmatrix'
+    ibexa.field_type.matrix.identifier: 'ibexa_matrix'
+    ibexa.field_type.matrix.legacy_identifier: 'ezmatrix'
 
 services:
     _defaults:
@@ -15,7 +16,7 @@ services:
         arguments:
             $fieldTypeIdentifier: '%ibexa.field_type.matrix.identifier%'
         tags:
-            - { name: ibexa.field_type, alias: '%ibexa.field_type.matrix.identifier%' }
+            - { name: ibexa.field_type, alias: '%ibexa.field_type.matrix.identifier%', legacy_alias: '%ibexa.field_type.matrix.legacy_identifier%' }
 
     Ibexa\FieldTypeMatrix\FieldType\Converter\MatrixConverter:
         tags:
diff --git a/src/bundle/Resources/config/services/graphql.yaml b/src/bundle/Resources/config/services/graphql.yaml
@@ -22,7 +22,7 @@ services:
 
     Ibexa\FieldTypeMatrix\GraphQL\InputHandler:
         tags:
-            - { name: ibexa.graphql.field_type.input.handler, fieldtype: ezmatrix }
+            - { name: ibexa.graphql.field_type.input.handler, fieldtype: ibexa_matrix }
 
     Ibexa\FieldTypeMatrix\GraphQL\FieldValueResolver:
         arguments:
diff --git a/src/bundle/Resources/encore/ibexa.config.manager.js b/src/bundle/Resources/encore/ibexa.config.manager.js
@@ -10,7 +10,7 @@ module.exports = (ibexaConfig, ibexaConfigManager) => {
     ibexaConfigManager.add({
         ibexaConfig,
         entryName: 'ibexa-admin-ui-content-edit-parts-js',
-        newItems: [path.resolve(__dirname, '../public/js/scripts/fieldType/ezmatrix.js')],
+        newItems: [path.resolve(__dirname, '../public/js/scripts/fieldType/ibexa_matrix.js')],
     });
 
     ibexaConfigManager.add({
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js
@@ -4,22 +4,22 @@
     const SELECTOR_ADD_MATRIX_ENTRY = '.ibexa-btn--add-matrix-entry';
     const SELECTOR_MATRIX_ENTRIES_CONTAINER = '.ibexa-table__body';
     const SELECTOR_MATRIX_ENTRY_TEMPLATE = '.ibexa-data-source__entry-template';
-    const SELECTOR_MATRIX_ENTRY_CHECKBOX = '.ibexa-table__ezmatrix-entry-checkbox';
+    const SELECTOR_MATRIX_ENTRY_CHECKBOX = '.ibexa-table__ibexa_matrix-entry-checkbox';
     const SELECTOR_MATRIX_ENTRY = '.ibexa-table__matrix-entry';
-    const SELECTOR_FIELD = '.ibexa-field-edit--ezmatrix';
+    const SELECTOR_FIELD = '.ibexa-field-edit--ibexa_matrix';
     const NUMBER_PLACEHOLDER = /__index__/g;
 
     if (!doc.querySelector(SELECTOR_FIELD)) {
         return;
     }
 
-    class EzMatrixValidator extends ibexa.BaseFieldValidator {
+    class IbexaMatrixValidator extends ibexa.BaseFieldValidator {
         /**
          * Adds an item.
          *
          * @method addItem
          * @param {Event} event
-         * @memberof EzMatrixValidator
+         * @memberof IbexaMatrixValidator
          */
         addItem(event) {
             const matrixNode = event.target.closest(SELECTOR_FIELD);
@@ -51,7 +51,7 @@
          * @param {HTMLElement} parentNode
          * @param {String} template
          * @returns {String}
-         * @memberof EzMatrixValidator
+         * @memberof IbexaMatrixValidator
          */
         setIndex(parentNode, template) {
             return template.replace(NUMBER_PLACEHOLDER, this.getNextIndex(parentNode));
@@ -62,7 +62,7 @@
          *
          * @method updateDisabledState
          * @param {HTMLElement} parentNode
-         * @memberof EzMatrixValidator
+         * @memberof IbexaMatrixValidator
          */
         updateDisabledState(parentNode) {
             const isEnabled = this.findCheckedEntries(parentNode).length > 0;
@@ -76,7 +76,7 @@
          *
          * @method removeItem
          * @param {Event} event
-         * @memberof EzMatrixValidator
+         * @memberof IbexaMatrixValidator
          */
         removeItems(event) {
             const matrixNode = event.target.closest(SELECTOR_FIELD);
@@ -107,7 +107,7 @@
          * Attaches event listeners based on a config.
          *
          * @method init
-         * @memberof EzMatrixValidator
+         * @memberof IbexaMatrixValidator
          */
         init() {
             super.init();
@@ -130,7 +130,7 @@
         }
     }
 
-    const validator = new EzMatrixValidator({
+    const validator = new IbexaMatrixValidator({
         classInvalid: 'is-invalid',
         fieldSelector: SELECTOR_FIELD,
         eventsMap: [
diff --git a/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss b/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss
@@ -1,6 +1,6 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
 
-.ibexa-field-edit--ezmatrix {
+.ibexa-field-edit--ibexa_matrix {
     .ibexa-data-source__field {
         .ibexa-form-error {
             display: none;
diff --git a/src/bundle/Resources/public/scss/matrix.scss b/src/bundle/Resources/public/scss/matrix.scss
@@ -1 +1 @@
-@use 'fieldType/ezmatrix';
+@use 'fieldType/ibexa_matrix';
diff --git a/src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff
@@ -6,10 +6,10 @@
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
     </header>
     <body>
-      <trans-unit id="9b320b4900667da4bd9353127c1f70114587bec4" resname="ezmatrix.name">
+      <trans-unit id="9b320b4900667da4bd9353127c1f70114587bec4" resname="ibexa_matrix.name">
         <source>Matrix</source>
         <target state="new">Matrix</target>
-        <note>key: ezmatrix.name</note>
+        <note>key: ibexa_matrix.name</note>
       </trans-unit>
     </body>
   </file>
diff --git a/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
@@ -6,15 +6,15 @@
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
     </header>
     <body>
-      <trans-unit id="bc68ce8e6e2d293ef01129f0238e11152df66ca6" resname="ezmatrix.add">
+      <trans-unit id="bc68ce8e6e2d293ef01129f0238e11152df66ca6" resname="ibexa_matrix.add">
         <source>Add</source>
         <target state="new">Add</target>
-        <note>key: ezmatrix.add</note>
+        <note>key: ibexa_matrix.add</note>
       </trans-unit>
-      <trans-unit id="f5aef330799a7345c75e72279e06eb9f5b7d0da9" resname="ezmatrix.remove">
+      <trans-unit id="f5aef330799a7345c75e72279e06eb9f5b7d0da9" resname="ibexa_matrix.remove">
         <source>Delete</source>
         <target state="new">Delete</target>
-        <note>key: ezmatrix.remove</note>
+        <note>key: ibexa_matrix.remove</note>
       </trans-unit>
       <trans-unit id="8422049ef51bbcd967ea5578aee3ed094edd252c" resname="field.column.add_new">
         <source>Add</source>
@@ -41,10 +41,10 @@
         <target state="new">Columns</target>
         <note>key: field.columns</note>
       </trans-unit>
-      <trans-unit id="07c51cf854c53ebcc11d9261c7ca5b0772d7f7a4" resname="field_definition.ezmatrix.minimum_rows">
+      <trans-unit id="07c51cf854c53ebcc11d9261c7ca5b0772d7f7a4" resname="field_definition.ibexa_matrix.minimum_rows">
         <source>Minimum number of rows</source>
         <target state="new">Minimum number of rows</target>
-        <note>key: field_definition.ezmatrix.minimum_rows</note>
+        <note>key: field_definition.ibexa_matrix.minimum_rows</note>
       </trans-unit>
       <trans-unit id="fc0bcd313cd08b3ce3b2380d4cc714c20047a5c0" resname="fieldtype.column.identifier">
         <source>Identifier</source>
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
-{% block ezplatform_fieldtype_ezmatrix_widget %}
+{% block ezplatform_fieldtype_ibexa_matrix_widget %}
     {% set readonly = attr.readonly|default(false) %}
 
     <script type="text/template" class="ibexa-data-source__entry-template">
@@ -40,7 +40,7 @@
                         <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                         </svg>
-                        <span class="ibexa-btn__label">{{ 'ezmatrix.add'|trans|desc('Add') }}</span>
+                        <span class="ibexa-btn__label">{{ 'ibexa_matrix.add'|trans|desc('Add') }}</span>
                     </button>
                     <button
                         type="button"
@@ -50,7 +50,7 @@
                         <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
-                        <span class="ibexa-btn__label">{{ 'ezmatrix.remove'|trans|desc('Delete') }}</span>
+                        <span class="ibexa-btn__label">{{ 'ibexa_matrix.remove'|trans|desc('Delete') }}</span>
                     </button>
                 {% endblock %}
             {% endembed %}
@@ -61,12 +61,12 @@
     {% endembed %}
 {% endblock %}
 
-{% block ezplatform_fieldtype_ezmatrix_entry_row %}
+{% block ezplatform_fieldtype_ibexa_matrix_entry_row %}
     {% set readonly = attr.readonly|default(false) %}
     {% set col_checkbox %}
         <input
             type="checkbox"
-            class="ibexa-input ibexa-input--checkbox ibexa-table__ezmatrix-entry-checkbox"
+            class="ibexa-input ibexa-input--checkbox ibexa-table__ibexa_matrix-entry-checkbox"
             {{ readonly ? 'disabled' }}
         >
     {% endset %}
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
-{% block ezmatrix_field %}
+{% block ibexa_matrix_field %}
     {% set columnsSettings = fieldSettings['columns'] %}
     {% set fieldData = field.value.rows %}
 
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
@@ -1,8 +1,8 @@
 {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
-{% set fieldtype_name = 'ezmatrix.name'|trans({}, 'ibexa_fieldtypes')|desc('Matrix') %}
+{% set fieldtype_name = 'ibexa_matrix.name'|trans({}, 'ibexa_fieldtypes')|desc('Matrix') %}
 
-{% block ezmatrix_field_definition_edit %}
+{% block ibexa_matrix_field_definition_edit %}
     <div class="ibexa-matrix-settings__minimum-rows">
         {{- form_label(form.minimum_rows, null, { 'label_attr': { 'class': 'ibexa-label' } }) -}}
         {{- form_errors(form.minimum_rows) -}}
diff --git a/src/bundle/Resources/views/themes/standard/matrix_fieldtype/content_fields.html.twig b/src/bundle/Resources/views/themes/standard/matrix_fieldtype/content_fields.html.twig
@@ -1,4 +1,4 @@
-{% block ezmatrix_field %}
+{% block ibexa_matrix_field %}
     {% set columnsSettings = fieldSettings['columns'] %}
     {% set fieldData = field.value.rows %}
 
diff --git a/src/lib/FieldType/Mapper/MatrixFormMapper.php b/src/lib/FieldType/Mapper/MatrixFormMapper.php
@@ -37,7 +37,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
             ->add('minimum_rows', IntegerType::class, [
                 'required' => false,
                 'property_path' => 'fieldSettings[minimum_rows]',
-                'label' => /** @Desc("Minimum number of rows") */ 'field_definition.ezmatrix.minimum_rows',
+                'label' => /** @Desc("Minimum number of rows") */ 'field_definition.ibexa_matrix.minimum_rows',
                 'translation_domain' => 'ibexa_matrix_fieldtype',
                 'disabled' => $isTranslation,
             ])
diff --git a/src/lib/Form/Type/FieldType/MatrixCollectionType.php b/src/lib/Form/Type/FieldType/MatrixCollectionType.php
@@ -26,7 +26,7 @@ public function getName(): string
 
     public function getBlockPrefix(): string
     {
-        return 'ezplatform_fieldtype_ezmatrix_collection';
+        return 'ezplatform_fieldtype_ibexa_matrix_collection';
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/lib/Form/Type/FieldType/MatrixEntryType.php b/src/lib/Form/Type/FieldType/MatrixEntryType.php
@@ -27,7 +27,7 @@ public function getName(): string
 
     public function getBlockPrefix(): string
     {
-        return 'ezplatform_fieldtype_ezmatrix_entry';
+        return 'ezplatform_fieldtype_ibexa_matrix_entry';
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/lib/Form/Type/FieldType/MatrixFieldType.php b/src/lib/Form/Type/FieldType/MatrixFieldType.php
@@ -31,7 +31,7 @@ public function getName(): string
 
     public function getBlockPrefix(): string
     {
-        return 'ezplatform_fieldtype_ezmatrix';
+        return 'ezplatform_fieldtype_ibexa_matrix';
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php
@@ -48,7 +48,7 @@ public function canWork(Builder $schema, array $args): bool
             && $args['ContentType'] instanceof ContentType
             && isset($args['FieldDefinition'])
             && $args['FieldDefinition'] instanceof FieldDefinition
-            && $args['FieldDefinition']->fieldTypeIdentifier === 'ezmatrix'
+            && $args['FieldDefinition']->fieldTypeIdentifier === 'ibexa_matrix'
             && !$schema->hasType($this->typeName($args));
     }
 
diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php
@@ -42,7 +42,7 @@ public function mapToFieldDefinitionType(FieldDefinition $fieldDefinition): ?str
 
     protected function getFieldTypeIdentifier(): string
     {
-        return 'ezmatrix';
+        return 'ibexa_matrix';
     }
 
     public function mapToFieldValueType(FieldDefinition $fieldDefinition): ?string
diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php
@@ -48,7 +48,7 @@ public function canWork(Builder $schema, array $args): bool
             && $args['ContentType'] instanceof ContentType
             && isset($args['FieldDefinition'])
             && $args['FieldDefinition'] instanceof FieldDefinition
-            && $args['FieldDefinition']->fieldTypeIdentifier === 'ezmatrix'
+            && $args['FieldDefinition']->fieldTypeIdentifier === 'ibexa_matrix'
             && !$schema->hasType($this->typeName($args));
     }
 
diff --git a/tests/lib/Repository/SearchServiceTest.php b/tests/lib/Repository/SearchServiceTest.php
@@ -90,7 +90,7 @@ private function createContentTypeWithMatrixFieldType(string $identifier): Conte
         $typeCreate->creatorId = $this->generateId('user', $permissionResolver->getCurrentUserReference()->getUserId());
         $typeCreate->creationDate = $this->createDateTime();
 
-        $titleFieldCreateStruct = $contentTypeService->newFieldDefinitionCreateStruct('title', 'ezstring');
+        $titleFieldCreateStruct = $contentTypeService->newFieldDefinitionCreateStruct('title', 'ibexa_string');
         $titleFieldCreateStruct->names = [
             'eng-GB' => 'Title',
         ];
@@ -103,7 +103,7 @@ private function createContentTypeWithMatrixFieldType(string $identifier): Conte
         $titleFieldCreateStruct->isSearchable = true;
         $titleFieldCreateStruct->defaultValue = '';
 
-        $tableFieldCreateStruct = $contentTypeService->newFieldDefinitionCreateStruct('table', 'ezmatrix');
+        $tableFieldCreateStruct = $contentTypeService->newFieldDefinitionCreateStruct('table', 'ibexa_matrix');
         $tableFieldCreateStruct->names = [
             'eng-GB' => 'Table',
         ];

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-@use 'fieldType/ezmatrix';`
	`1`	`+@use 'fieldType/ibexa_matrix';`