Skip to content

Commit 6560c8c

Browse files
committed
Fixed behat test
1 parent 9c8a83b commit 6560c8c

File tree

6 files changed

+34
-15
lines changed

6 files changed

+34
-15
lines changed

dependencies.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/bundle/Resources/public/js/scripts/admin.location.view.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
const queryString = window.location.search;
99
const urlParams = new URLSearchParams(queryString);
1010
const publishedContentId = urlParams.get('publishedContentId');
11-
const handleEditItem = (content, location) => {
11+
const handleEditItem = (content, location, isLanguageSelectorOpened) => {
1212
const contentId = content._id;
1313
const locationId = location._id;
1414
const languageCode = content.mainLanguageCode;
@@ -75,6 +75,10 @@
7575
response.text().then(showModal);
7676
} else if (response.status === 200) {
7777
updateForm();
78+
79+
if (!isLanguageSelectorOpened) {
80+
doc.querySelector('#form_subitems_content_edit_create').click();
81+
}
7882
}
7983
})
8084
.catch(ibexa.helpers.notification.showErrorNotification);
@@ -87,6 +91,7 @@
8791
modalTableTitleNode.setAttribute('title', title);
8892
modalTableTitleNode.dataset.originalTitle = title;
8993
};
94+
9095
const setModalTableBody = (failedItemsData) => {
9196
const modal = doc.querySelector(SELECTOR_MODAL_BULK_ACTION_FAIL);
9297
const table = modal.querySelector('.ibexa-bulk-action-failed-modal__table');

src/bundle/Resources/public/js/scripts/sidebar/btn/content.edit.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
'click',
1313
() => {
1414
languageRadioOption.checked = true;
15-
languageRadioOption.dispatchEvent(new CustomEvent('change'));
15+
languageRadioOption.dispatchEvent(
16+
new CustomEvent('change', {
17+
detail: {
18+
sendImmediately: true,
19+
},
20+
}),
21+
);
1622
},
1723
false,
1824
);

src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
attachModalListeners(wrapper, form, btns);
4747
};
4848
const changeHandler = (form, btns, event) => {
49+
const sendImmediately = event?.detail?.sendImmediately;
4950
const contentIdInput = form.querySelector('.ibexa-extra-actions__form-field--content-info');
5051
const locationInput = form.querySelector('.ibexa-extra-actions__form-field--location');
5152
const contentId = contentIdInput.value;
@@ -75,6 +76,10 @@
7576

7677
return;
7778
}
79+
80+
if (sendImmediately) {
81+
form.submit();
82+
}
7883
}
7984

8085
submitBtn.disabled = false;
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
{% extends '@ibexadesign/content/form_fields.html.twig' %}
22

3-
{% block _content_edit_language_entry_widget %}
3+
{% block language_entry %}
44
<div class="ibexa-instant-filter__group-item">
55
{{ form_widget(form) }}
66
</div>
77
{% endblock %}
88

9+
{% block _content_tree_content_edit_language_entry_widget %}
10+
{{ block('language_entry') }}
11+
{% endblock %}
12+
13+
{% block _content_edit_language_entry_widget %}
14+
{{ block('language_entry') }}
15+
{% endblock %}
16+
917
{% block _content_edit_language_widget %}
1018
{{ form_widget(form, { 'attr': { 'class': 'ibexa-instant-filter__items' } }) }}
1119
{% endblock %}

src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default class TableViewItemComponent extends PureComponent {
2727
priorityValue: props.item.priority,
2828
priorityInputEnabled: false,
2929
startingPriorityValue: props.item.priority,
30+
isLanguageSelectorOpened: false,
3031
};
3132

3233
this.columnsRenderers = {
@@ -118,6 +119,7 @@ export default class TableViewItemComponent extends PureComponent {
118119
*/
119120
editItem(languageCode) {
120121
const { id, currentVersion } = this.props.item.content._info;
122+
const { isLanguageSelectorOpened } = this.state;
121123

122124
this.props.handleEditItem(
123125
{
@@ -132,6 +134,7 @@ export default class TableViewItemComponent extends PureComponent {
132134
},
133135
},
134136
this.props.item.id,
137+
isLanguageSelectorOpened,
135138
);
136139
}
137140

@@ -145,11 +148,14 @@ export default class TableViewItemComponent extends PureComponent {
145148
const { mainLanguageCode, currentVersion } = this.props.item.content._info;
146149
const { languageCodes } = currentVersion;
147150

151+
this.setState(() => ({ isLanguageSelectorOpened: false }));
152+
148153
if (languageCodes.length > 1) {
149154
this.props.setLanguageSelectorData(this.getLanguageSelectorData());
150155
this.props.openLanguageSelector();
156+
this.setState(() => ({ isLanguageSelectorOpened: true }));
151157
} else {
152-
this.editItem(mainLanguageCode);
158+
this.editItem(mainLanguageCode, languageCodes);
153159
}
154160
}
155161

0 commit comments

Comments
 (0)