Fixed behat test

Author: OstafinL

dependencies.json

@@ -8,7 +8,7 @@
     const queryString = window.location.search;
     const urlParams = new URLSearchParams(queryString);
     const publishedContentId = urlParams.get('publishedContentId');
-    const handleEditItem = (content, location) => {
+    const handleEditItem = (content, location, isLanguageSelectorOpened) => {
         const contentId = content._id;
         const locationId = location._id;
         const languageCode = content.mainLanguageCode;
@@ -75,6 +75,10 @@
                     response.text().then(showModal);
                 } else if (response.status === 200) {
                     updateForm();
+
+                    if (!isLanguageSelectorOpened) {
+                        doc.querySelector('#form_subitems_content_edit_create').click();
+                    }
                 }
             })
             .catch(ibexa.helpers.notification.showErrorNotification);
@@ -87,6 +91,7 @@
         modalTableTitleNode.setAttribute('title', title);
         modalTableTitleNode.dataset.originalTitle = title;
     };
+
     const setModalTableBody = (failedItemsData) => {
         const modal = doc.querySelector(SELECTOR_MODAL_BULK_ACTION_FAIL);
         const table = modal.querySelector('.ibexa-bulk-action-failed-modal__table');

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

@@ -12,7 +12,13 @@
         'click',
         () => {
             languageRadioOption.checked = true;
-            languageRadioOption.dispatchEvent(new CustomEvent('change'));
+            languageRadioOption.dispatchEvent(
+                new CustomEvent('change', {
+                    detail: {
+                        sendImmediately: true,
+                    },
+                }),
+            );
         },
         false,
     );

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

@@ -46,14 +46,15 @@
         attachModalListeners(wrapper, form, btns);
     };
     const changeHandler = (form, btns, event) => {
+        const sendImmediately = event?.detail?.sendImmediately;
         const contentIdInput = form.querySelector('.ibexa-extra-actions__form-field--content-info');
         const locationInput = form.querySelector('.ibexa-extra-actions__form-field--location');
         const contentId = contentIdInput.value;
         const locationId = locationInput.value;
         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 activeLanguageItem = event.target.closest('.ibexa-instant-filter__group-item')?.querySelector('.ibexa-label');
         const allLanguageItems = form.querySelectorAll('.ibexa-instant-filter__group-item .ibexa-label');
         const submitBtn = form.querySelector('.ibexa-extra-actions__confirm-btn');
 
@@ -75,10 +76,14 @@
 
                     return;
                 }
+
+                if (sendImmediately) {
+                    form.submit();
+                }
             }
 
             submitBtn.disabled = false;
-            activeLanguageItem.classList.add('ibexa-label--active');
+            activeLanguageItem?.classList.add('ibexa-label--active');
         });
     };
     const attachEventsToEditActionsWidget = (container) => {

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

@@ -1,11 +1,19 @@
 {% extends '@ibexadesign/content/form_fields.html.twig' %}
 
-{% block _content_edit_language_entry_widget %}
+{% block language_entry %}
     <div class="ibexa-instant-filter__group-item">
         {{ form_widget(form) }}
     </div>
 {% endblock %}
 
+{% block _content_tree_content_edit_language_entry_widget %}
+   {{ block('language_entry') }}
+{% endblock %}
+
+{% block _content_edit_language_entry_widget %}
+    {{ block('language_entry') }}
+{% endblock %}
+
 {% block _content_edit_language_widget %}
     {{ form_widget(form, { 'attr': { 'class': 'ibexa-instant-filter__items' } }) }}
 {% endblock %}

src/bundle/Resources/views/themes/admin/content/widget/form_fields.html.twig

@@ -27,6 +27,7 @@ export default class TableViewItemComponent extends PureComponent {
             priorityValue: props.item.priority,
             priorityInputEnabled: false,
             startingPriorityValue: props.item.priority,
+            isLanguageSelectorOpened: false,
         };
 
         this.columnsRenderers = {
@@ -118,6 +119,7 @@ export default class TableViewItemComponent extends PureComponent {
      */
     editItem(languageCode) {
         const { id, currentVersion } = this.props.item.content._info;
+        const { isLanguageSelectorOpened } = this.state;
 
         this.props.handleEditItem(
             {
@@ -132,6 +134,7 @@ export default class TableViewItemComponent extends PureComponent {
                 },
             },
             this.props.item.id,
+            isLanguageSelectorOpened,
         );
     }
 
@@ -145,11 +148,14 @@ export default class TableViewItemComponent extends PureComponent {
         const { mainLanguageCode, currentVersion } = this.props.item.content._info;
         const { languageCodes } = currentVersion;
 
+        this.setState(() => ({ isLanguageSelectorOpened: false }));
+
         if (languageCodes.length > 1) {
             this.props.setLanguageSelectorData(this.getLanguageSelectorData());
             this.props.openLanguageSelector();
+            this.setState(() => ({ isLanguageSelectorOpened: true }));
         } else {
-            this.editItem(mainLanguageCode);
+            this.editItem(mainLanguageCode, languageCodes);
         }
     }