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

IBX-9086 Autogenerated identifiers for content types & field definitions #1389

Open
wants to merge 9 commits into
base: 4.6
Choose a base branch
from
Open

IBX-9086 Autogenerated identifiers for content types & field definitions #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c2005e
IBX-9086 Autogenerated identifiers for content types & field definitions
bozatko Nov 4, 2024
271f7ea
format js file
bozatko Nov 4, 2024
6c3f4aa
format js file - semicolon
bozatko Nov 4, 2024
0afe1ed
format twig files
bozatko Nov 4, 2024
fcf16ae
format twig fix
bozatko Nov 4, 2024
a4027b4
review fixes
bozatko Nov 5, 2024
8417f47
review fixes pt 2
bozatko Nov 6, 2024
27ff2b2
review fixes pt 3
bozatko Nov 6, 2024
f30925f
remove empty line
bozatko Nov 8, 2024
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
5 changes: 5 additions & 0 deletions src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
detail: { nodes: [fieldNode] },
}),
);
doc.body.dispatchEvent(
new CustomEvent('ibexa-autogenerate-identifier:init', {
detail: { fieldNode, shouldAutogenerateValue: true },
}),
);
};
const insertFieldDefinitionNode = (fieldNode, { targetContainer, draggedItemPosition }) => {
const fieldDefinitionNode = createFieldDefinitionNode(fieldNode, { targetContainer, draggedItemPosition });
Expand Down
34 changes: 26 additions & 8 deletions src/bundle/Resources/public/js/scripts/autogenerate.identifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
(function (doc, ibexa) {
const sourceInputs = doc.querySelectorAll('[data-autogenerate-identifier-target-selector]');

sourceInputs.forEach((sourceInput) => {
const { autogenerateIdentifierTargetSelector } = sourceInput.dataset;
const targetInput = doc.querySelector(autogenerateIdentifierTargetSelector);
const identifierAutogenerator = new ibexa.core.SlugValueInputAutogenerator({
sourceInput,
targetInput,
const initAutogenerator = (elements, shouldAutogenerateValue) => {
elements.forEach((sourceInput) => {
const { autogenerateIdentifierTargetSelector } = sourceInput.dataset;
const targetInput = doc.querySelector(autogenerateIdentifierTargetSelector);
const identifierAutogenerator = new ibexa.core.SlugValueInputAutogenerator({
sourceInput,
targetInput,
shouldAutogenerateValue: shouldAutogenerateValue || !targetInput.value,
});

identifierAutogenerator.init();
bozatko marked this conversation as resolved.
Show resolved Hide resolved
});
};
const attachListeners = () => {
doc.body.addEventListener(
'ibexa-autogenerate-identifier:init',
(event) => {
const { fieldNode, shouldAutogenerateValue } = event.detail;
const sourceFields = fieldNode.querySelectorAll('[data-autogenerate-identifier-target-selector]');

initAutogenerator(sourceFields, shouldAutogenerateValue);
},
false,
);
};

identifierAutogenerator.init();
});
initAutogenerator(sourceInputs);
attachListeners();
})(document, window.ibexa);
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/core/slug.value.input.autogenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
this.sourceInput = config.sourceInput;
this.targetInput = config.targetInput;
this.whitespaceTextReplacer = config.whitespaceTextReplacer || '_';
this.shouldAutogenerateValue = !this.targetInput.value;
this.shouldAutogenerateValue = config.shouldAutogenerateValue || !this.targetInput.value;
}

slugify(text) {
Expand Down
7 changes: 5 additions & 2 deletions src/bundle/Resources/views/themes/admin/content_type/create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@
{% block left_column %}
{% set form_field_options = { row_attr: { class: 'ibexa-form-field' } } %}

{{ form_row(form.name, form_field_options) }}
{{ form_row(form.identifier, form_field_options) }}
{{ form_row(form.name, form_field_options|merge({
attr: { 'data-autogenerate-identifier-target-selector': '#ibexa-edit-content-type-identifier' } }
)) }}
{{ form_row(form.identifier, form_field_options|merge({
id: 'ibexa-edit-content-type-identifier' } ) ) }}
{{ form_row(form.description, form_field_options) }}
{{ form_row(form.nameSchema, form_field_options) }}
{{ form_row(form.urlAliasSchema, form_field_options) }}
Expand Down
7 changes: 5 additions & 2 deletions src/bundle/Resources/views/themes/admin/content_type/edit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@
{% block left_column %}
{% set form_field_options = { row_attr: { class: 'ibexa-form-field' } } %}

{{ form_row(form.name, form_field_options) }}
{{ form_row(form.identifier, form_field_options) }}
{{ form_row(form.name, form_field_options|merge({
attr: { 'data-autogenerate-identifier-target-selector': '#ibexa-edit-content-type-identifier' } }
)) }}
{{ form_row(form.identifier, form_field_options|merge({
id: 'ibexa-edit-content-type-identifier' } ) ) }}
{{ form_row(form.description, form_field_options) }}
{{ form_row(form.nameSchema, form_field_options) }}
{{ form_row(form.urlAliasSchema, form_field_options) }}
Expand Down
8 changes: 6 additions & 2 deletions src/bundle/Resources/views/themes/admin/content_type/field_definition.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@
{% if field_definition.enabled is defined %}
{{ form_row(field_definition.enabled) }}
{% endif %}
{{ form_row(field_definition.name) }}
{{ form_row(field_definition.identifier) }}
{{ form_row(field_definition.name, {
attr: { 'data-autogenerate-identifier-target-selector': '#ibexa-ct-identifier-' ~ field_definition.vars.value.identifier }
}) }}
{{ form_row(field_definition.identifier, {
id: 'ibexa-ct-identifier-' ~ field_definition.vars.value.identifier
}) }}
{{ form_row(field_definition.description) }}
{{ form_row(field_definition.isRequired) }}
{{ form_row(field_definition.isSearchable) }}
Expand Down
8 changes: 6 additions & 2 deletions src/bundle/Resources/views/themes/admin/content_type/part/field_definition_form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
} -%}
{%- block body_content -%}
<div class="ibexa-content-type-edit__field-definition-content">
{{ form_row(form.name) }}
{{ form_row(form.identifier) }}
{{ form_row(form.name, {
attr: { 'data-autogenerate-identifier-target-selector': '#ibexa-ct-identifier-' ~ form.identifier.vars.value }
}) }}
{{ form_row(form.identifier, {
id: 'ibexa-ct-identifier-' ~ form.identifier.vars.value
}) }}
{{ form_row(form.description) }}
{{ form_row(form.isRequired) }}
{{ form_row(form.isSearchable) }}
Expand Down
Loading