Skip to content

IBX-11415: Use ibexa DS label component #1852

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

Open
tischsoic wants to merge 14 commits into
base: main
Choose a base branch
from
Open

IBX-11415: Use ibexa DS label component #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f1cd4db
IBX-11236: Phase 1 - Migrate simple ibexa-label elements to DS <twig:…
tischsoic Mar 11, 2026
4b480bc
IBX-11236: Phase 2 - Migrate required/modal ibexa-label elements to D…
tischsoic Mar 11, 2026
167a221
IBX-11236: Phase 3 - Migrate field type edit ibexa-label elements to …
tischsoic Mar 11, 2026
7b0b2b1
IBX-11236: Phase 4 - Update JS selectors from ibexa-label to ids-labe…
tischsoic Mar 11, 2026
d1c55ae
IBX-11236: Phase 5 - Swap ibexa-label to ids-label in Symfony form th…
tischsoic Mar 11, 2026
53eeb13
IBX-11236: Phase 6 - Replace React ibexa-label with DS Label componen…
tischsoic Mar 11, 2026
ed31356
IBX-11236: Phase 7 - Add TODO comments for unmigrateable div labels; …
tischsoic Mar 11, 2026
0f2c773
IBX-11236: Phase 8 - Update Behat CSS selectors from .ibexa-label to …
tischsoic Mar 11, 2026
705351c
IBX-11236: Phase 9 - Rename .ibexa-label to .ids-label in all SCSS files
tischsoic Mar 11, 2026
a4c17a3
IBX-11236: Phase 9 followup - Swap ibexa-label to ids-label on remain…
tischsoic Mar 11, 2026
5838b7e
IBX-11236: use DS labels in admin-ui details
tischsoic Mar 13, 2026
8bae147
IBX-11236: remove outdated details label TODO
tischsoic Mar 16, 2026
a5d88c3
IBX-11236: align sub-items active label class
tischsoic Mar 17, 2026
5726a9c
IBX-11236: align edit form active label class
tischsoic Mar 17, 2026
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
2 changes: 1 addition & 1 deletion 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 @@ -371,7 +371,7 @@
const validateInput = (input) => {
const isInputEmpty = !input.value;
const field = input.closest('.form-group');
const labelNode = field?.querySelector('.ibexa-label');
const labelNode = field?.querySelector('.ids-label');
const errorNode = field?.querySelector('.ibexa-form-error');

input.classList.toggle('is-invalid', isInputEmpty);
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const checkIsEmpty = (field) => {
let errorMessage = '';
const Translator = getTranslator();
const input = field.querySelector('.ibexa-input');
const label = field.querySelector('.ibexa-label');
const label = field.querySelector('.ids-label');

if (label) {
const fieldName = label.innerText;
Expand All @@ -35,7 +35,7 @@ const checkIsEmpty = (field) => {
};
const validateIsEmptyField = (field) => {
const input = field.querySelector('.ibexa-input');
const label = field.querySelector('.ibexa-label');
const label = field.querySelector('.ids-label');
const errorWrapper = field.querySelector('.ibexa-form-error');
const validatorOutput = checkIsEmpty(field);
const { isValid, errorMessage } = validatorOutput;
Expand Down
8 changes: 4 additions & 4 deletions src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
const checkedBtn = event.currentTarget;
const languageCode = checkedBtn.value;
const checkVersionDraftLink = Routing.generate('ibexa.version_draft.has_no_conflict', { contentId, languageCode, locationId });
const activeLanguageItem = event.target.closest('.ibexa-instant-filter__group-item')?.querySelector('.ibexa-label');
const allLanguageItems = form.querySelectorAll('.ibexa-instant-filter__group-item .ibexa-label');
const activeLanguageItem = event.target.closest('.ibexa-instant-filter__group-item')?.querySelector('.ids-label');
const allLanguageItems = form.querySelectorAll('.ibexa-instant-filter__group-item .ids-label');
const submitBtn = form.querySelector('.ibexa-extra-actions__confirm-btn');

allLanguageItems.forEach((item) => {
item.classList.remove('ibexa-label--active');
item.classList.remove('ids-label--active');
});

fetch(checkVersionDraftLink, {
Expand All @@ -83,7 +83,7 @@
}

submitBtn.disabled = false;
activeLanguageItem?.classList.add('ibexa-label--active');
activeLanguageItem?.classList.add('ids-label--active');
});
};
const attachEventsToEditActionsWidget = (container) => {
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_adaptive-filters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
align-items: flex-end;
padding-right: calculateRem(16px);

.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_add-translation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
flex-wrap: wrap;
padding-bottom: calculateRem(140px);

.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_content-type-edit.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
.form-check {
margin-bottom: calculateRem(16px);

.ibexa-label {
.ids-label {
margin-bottom: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_custom-url-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
margin-bottom: calculateRem(24px);

&:first-child {
.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_details.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
flex-basis: 25%;
padding: calculateRem(8px) calculateRem(8px) calculateRem(8px) 0;

.ibexa-label {
.ids-label {
margin-top: calculateRem(8px);
margin-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_extra-actions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
padding-left: 0;
}

.ibexa-label {
.ids-label {
@include edit-language-item;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_field-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
&__language-form {
display: flex;

.ibexa-label {
.ids-label {
margin: calculateRem(8px) calculateRem(8px) 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_filters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
margin-bottom: 0;
}

.ibexa-label {
.ids-label {
font-size: $ibexa-text-font-size-medium;
color: $ibexa-color-dark;
margin-top: calculateRem(16px);
Expand Down
6 changes: 3 additions & 3 deletions src/bundle/Resources/public/scss/_labels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins' as *;

.ibexa-label {
.ids-label {
@include label-required();

& {
Expand Down Expand Up @@ -37,7 +37,7 @@
}

.form-check-inline {
.ibexa-label {
.ids-label {
&--checkbox-radio {
margin: 0;
}
Expand All @@ -46,7 +46,7 @@

.ibexa-form-block {
.form-group:first-of-type {
.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_list-filters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}

&__item {
.ibexa-label {
.ids-label {
margin: 0;
padding: 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/scss/_login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
background-image: url('/bundles/ibexaadminui/img/login-background.jpg');
background-size: cover;

.ibexa-label {
.ids-label {
margin-top: calculateRem(40px);
}

Expand Down Expand Up @@ -81,7 +81,7 @@
margin-top: calculateRem(32px);

& + .has-error {
.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@mixin datetime-field() {
&.is-invalid {
.ibexa-label {
.ids-label {
color: $ibexa-color-danger;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_modals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
margin-top: calculateRem(18px);
}

.ibexa-label {
.ids-label {
font-size: calculateRem(16px);
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_search-links-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
padding-left: calculateRem(24px);
border-left: calculateRem(1px) solid $ibexa-color-light;

.ibexa-label {
.ids-label {
margin-top: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
}

.form-group:first-child {
.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
display: flex;
align-self: flex-end;

.ibexa-label {
.ids-label {
display: none;
padding-bottom: calculateRem(8px);
}
Expand Down Expand Up @@ -83,7 +83,7 @@
&--disabled {
pointer-events: none;

.ibexa-label {
.ids-label {
color: $ibexa-color-black-300;
}

Expand Down Expand Up @@ -167,7 +167,7 @@
justify-content: space-between;
width: 100%;

.ibexa-label {
.ids-label {
display: inline-flex;
margin: calculateRem(8px) 0 0 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/fieldType/edit/_ibexa_binaryfile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
font-size: calculateRem(16px);
margin-right: calculateRem(40px);

.ibexa-label {
.ids-label {
margin-bottom: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
&__file-name-wrapper,
&__dimensions-wrapper,
&__file-size-wrapper {
.ibexa-label {
.ids-label {
margin-top: 0;
margin-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image_asset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

.ibexa-field-edit-preview {
&__file-name-wrapper {
.ibexa-label {
.ids-label {
margin-top: 0;
margin-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
min-width: 0;
padding: calculateRem(8px);

.ibexa-label {
.ids-label {
margin-top: 0;
margin-bottom: 0;
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/fieldType/edit/_ibexa_user.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
max-width: 80%;

.ibexa-data-source__field:first-of-type {
.ibexa-label {
.ids-label {
margin-top: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %}

{% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field__label-wrapper')|trim}) %}
{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-field__label ibexa-label')|trim}) %}
{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-field__label ids-label')|trim}) %}
{% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-input ibexa-input--text ibexa-data-source__input')|trim}) %}
{% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %}

Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/account/login/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% block login_form_fields %}
<div class="form-group{% if error %} has-error{% endif %}">
<div class="ibexa-login__input-label-wrapper">
<label class="ibexa-label" for="username">{{ 'authentication.username'|trans|desc('Username') }}</label>
<twig:ibexa:label for="username">{{ 'authentication.username'|trans|desc('Username') }}</twig:ibexa:label>
</div>
{%- embed '@ibexadesign/ui/component/input_text.html.twig' -%}
{% block content %}
Expand All @@ -43,7 +43,7 @@
</div>
<div class="form-group{% if error %} has-error{% endif %} position-relative">
<div class="ibexa-login__input-label-wrapper">
<label class="ibexa-label" for="password">{{ 'authentication.password'|trans|desc('Password') }}</label>
<twig:ibexa:label for="password">{{ 'authentication.password'|trans|desc('Password') }}</twig:ibexa:label>
</div>
{%- embed '@ibexadesign/ui/component/input_text.html.twig' with {
type: 'password',
Expand Down
8 changes: 4 additions & 4 deletions src/bundle/Resources/views/themes/admin/account/notifications/filters/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
} %}
{% block content %}
<div class="form-group">
<label class="ibexa-label form-label">
<twig:ibexa:label class="form-label">
{{ 'ibexa.notifications.search_form.label.from'|trans|desc('From') }}
</label>
</twig:ibexa:label>
{{ form_widget(form.children.min, {
attr: {
'data-seconds': 0,
Expand All @@ -48,9 +48,9 @@
</div>

<div class="form-group">
<label class="ibexa-label form-label">
<twig:ibexa:label class="form-label">
{{ 'ibexa.notifications.search_form.label.to'|trans|desc('To') }}
</label>
</twig:ibexa:label>
{{ form_widget(form.children.max, {
attr: {
'data-seconds': 0,
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/content/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{% if required %}{% set wrapper_class = (wrapper_class ~ ' ibexa-data-source__field--required')|trim %}{% endif %}
{% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %}

{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-data-source__label')|trim}) %}
{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ids-label ibexa-data-source__label')|trim}) %}
{% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ ' ibexa-data-source__label-wrapper')|trim}) %}
{% set attr = attr|merge({
class: (attr.class|default('') ~ ' ibexa-data-source__input' ~ (is_small ? ' ibexa-input--small'))|trim,
Expand Down Expand Up @@ -105,7 +105,7 @@
{% set attr = attr|merge({'readonly': 'readonly'}) %}
{% endif %}
{% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field-edit__label-wrapper')|trim}) %}
{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-field-edit__label')|trim}) %}
{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ids-label ibexa-field-edit__label')|trim}) %}
{% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-data-source__input')|trim}) %}
{% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %}

Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
{% block entries_labels %}
{% trans_default_domain 'ibexa_locationview' %}

<label class="ibexa-label ibexa-user-invitation-modal__label">
<twig:ibexa:label class="ibexa-user-invitation-modal__label">
{{ 'modal.email_address'|trans|desc('Email address') }}
</label>
</twig:ibexa:label>
{% endblock %}

{% set info = 'modal.info'|trans|desc('Enter your team members email addresses.') %}
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/themes/admin/content/tab/content.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% if languages|length > 1 %}
<form class="form-inline ibexa-raw-content-title__language-form">
<label class="ibexa-label">{{ 'tab.view.preview'|trans()|desc('Preview') }}</label>
<twig:ibexa:label>{{ 'tab.view.preview'|trans()|desc('Preview') }}</twig:ibexa:label>
{% set choices = languages|map((language) => {
value: path('ibexa.content.translation.view', {
'contentId': location.contentId,
Expand Down
Loading
Loading