Skip to content

IBX-12038: DS introduction fixes #1961

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

Merged
dew326 merged 5 commits into from
Jul 23, 2026
Merged

IBX-12038: DS introduction fixes #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfd36df
convert old button
tischsoic Jul 7, 2026
74602ca
Adjusted selector for language checkbox
katarzynazawada Jul 7, 2026
8c0ea07
Adjusted keyword selector
katarzynazawada Jul 7, 2026
e43f69c
fix label scss
tischsoic Jul 8, 2026
719bbe6
fix selector in form.validation.helper.js
tischsoic Jul 14, 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
11 changes: 7 additions & 4 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
@@ -1,6 +1,9 @@
import { getTranslator } from './context.helper';
import { getIconPath } from './icon.helper';

const SELECTOR_INPUT = '.ids-input, .ibexa-input';
const SELECTOR_LABEL = '.ids-label';

const formatErrorLine = (errorMessage) => {
const errorIcon = `<svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
<use xlink:href="${getIconPath('notice')}"></use>
Expand All @@ -17,8 +20,8 @@ const formatErrorLine = (errorMessage) => {
const checkIsEmpty = (field) => {
let errorMessage = '';
const Translator = getTranslator();
const input = field.querySelector('.ibexa-input');
const label = field.querySelector('.ids-label');
const input = field.querySelector(SELECTOR_INPUT);
const label = field.querySelector(SELECTOR_LABEL);

if (label) {
const fieldName = label.innerText;
Expand All @@ -34,8 +37,8 @@ const checkIsEmpty = (field) => {
};
};
const validateIsEmptyField = (field) => {
const input = field.querySelector('.ibexa-input');
const label = field.querySelector('.ids-label');
const input = field.querySelector(SELECTOR_INPUT);
const label = field.querySelector(SELECTOR_LABEL);
const errorWrapper = field.querySelector('.ibexa-form-error');
const validatorOutput = checkIsEmpty(field);
const { isValid, errorMessage } = validatorOutput;
Expand Down
26 changes: 0 additions & 26 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 @@ -5,32 +5,6 @@
.ids-label {
@include label-required();

& {
font-size: $ibexa-text-font-size-small;
color: $ibexa-color-dark-400;
line-height: calculateRem(18px);
margin-bottom: calculateRem(8px);
padding-top: 0;
padding-bottom: 0;
}

.ibexa-icon {
fill: $ibexa-color-dark-400;
}

&--checkbox-radio {
font-size: calculateRem(14px);
line-height: calculateRem(21px);
color: $ibexa-color-dark;
margin: 0 0 calculateRem(9px);

&.required {
&:after {
content: '';
}
}
}

&.form-label.is-invalid {
color: $ibexa-color-danger;
}
Expand Down
8 changes: 6 additions & 2 deletions src/bundle/Resources/views/themes/admin/account/notifications/side_panel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@
message: 'notification.modal.delete.confirm_message'|trans({}, 'ibexa_notifications')|desc('Are you sure you want to delete this notification?'),
} %}
{% block confirm_button %}
<button class="btn ibexa-btn ibexa-btn--primary ibexa-notifications-modal--delete--confirm" data-bs-dismiss="modal">
<twig:ibexa:button
type="primary"
class="ibexa-notifications-modal--delete--confirm"
data-bs-dismiss="modal"
>
{{ 'modal.delete'|trans|desc('Delete') }}
</button>
</twig:ibexa:button>
{% endblock %}
{% endembed %}
2 changes: 1 addition & 1 deletion src/lib/Behat/Component/Fields/Keywords.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class Keywords extends FieldTypeComponent
private string $setKeywordsValueScript = <<<SCRIPT
const SELECTOR_TAGGIFY = '.ibexa-data-source__taggify';
const taggifyContainer = document.querySelector(SELECTOR_TAGGIFY);
const keywordInput = taggifyContainer.closest('.ibexa-data-source').querySelector('.ibexa-data-source__input-wrapper .ibexa-data-source__input.form-control');
const keywordInput = taggifyContainer.closest('.ibexa-data-source').querySelector('.ibexa-data-source__input-wrapper .ibexa-data-source__input');
class KeywordTaggify extends window.ibexa.core.Taggify {
afterTagsUpdate() {
const tags = [...this.tags];
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Behat/Page/LanguagePage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ protected function specifyLocators(): array
return [
new VisibleCSSLocator('pageTitle', '.ibexa-page-title h1'),
new VisibleCSSLocator('button', '.ids-btn'),
new VisibleCSSLocator('enabledField', '.ibexa-input--checkbox'),
new VisibleCSSLocator('enabledField', '.ids-input--checkbox'),
new VisibleCSSLocator('languagePropertiesItem', '.ibexa-details__item'),
new VisibleCSSLocator('languagePropertiesLabel', '.ibexa-details__item-label'),
new VisibleCSSLocator('languagePropertiesValue', '.ibexa-details__item-content'),
Expand Down
Loading