after QA

Author: tischsoic

src/bundle/Resources/public/js/scripts/admin.search.filters.js

@@ -96,11 +96,15 @@
 
         applyBtn[methodName]('disabled', !isEnabled);
     };
-    const toggleDatesSelectVisibility = (select, dateRange) => {
+    const toggleDatesSelectVisibility = (event, select, dateRange) => {
+        const datesRangeNode = doc.querySelector(event.target.dataset.targetSelector);
+
         if (select.value !== 'custom_range') {
-            dateRange.clearDates();
             dateRange.toggleHidden(true);
 
+            dateRange.clearDates();
+            doc.querySelector(datesRangeNode.dataset.periodSelector).value = event.target.value;
+
             toggleDisabledStateOnApplyBtn();
 
             return;
@@ -308,10 +312,14 @@
     subtreeInput.addEventListener('change', toggleDisabledStateOnApplyBtn, false);
     lastModifiedSelectNode.addEventListener(
         'change',
-        () => toggleDatesSelectVisibility(lastModifiedSelectNode, lastModifiedDateRange),
+        (event) => toggleDatesSelectVisibility(event, lastModifiedSelectNode, lastModifiedDateRange),
+        false,
+    );
+    lastCreatedSelectNode.addEventListener(
+        'change',
+        (event) => toggleDatesSelectVisibility(event, lastCreatedSelectNode, lastCreatedDateRange),
         false,
     );
-    lastCreatedSelectNode.addEventListener('change', () => toggleDatesSelectVisibility(lastCreatedSelectNode, lastCreatedDateRange), false);
     creatorInput.addEventListener('keyup', handleTyping, false);
     usersList.addEventListener('click', handleSelectUser, false);
     contentTypeCheckboxes.forEach((checkbox) => checkbox.addEventListener('change', filterByContentType, false));

src/bundle/Resources/public/js/scripts/admin.trash.list.js

@@ -194,10 +194,16 @@
         formSearch.submit();
     };
     const toggleDatesSelectVisibility = (event) => {
+        const datesRangeNode = doc.querySelector(event.target.dataset.targetSelector);
+
         if (event.target.value !== 'custom_range') {
-            trashedDateTimeRange.clearDates();
             trashedDateTimeRange.toggleHidden(true);
 
+            trashedDateTimeRange.clearDates();
+            doc.querySelector(datesRangeNode.dataset.periodSelector).value = event.target.value;
+
+            formSearch.submit();
+
             return;
         }
 
@@ -207,7 +213,7 @@
         event.preventDefault();
 
         if (event.target.value !== 'custom_range') {
-            formSearch.submit();
+            // formSearch.submit();
         }
     };
     const setSortedClass = () => {

src/bundle/Resources/views/themes/admin/trash/list.html.twig

@@ -61,7 +61,7 @@
                 'attr': {'class': 'ibexa-trash-search-form__item ibexa-trash-search-form__item--auto-send'}
             }),
             form_row(form_search.trashed, {
-                'attr': {'data-target-selector': '.ibexa-trash-search-form__range-wrapper--select-trashed-range'}
+                attr: { 'data-target-selector': '.ibexa-trash-search-form__trashed-date-time-range' },
             }),
         ] %}
 

src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig

@@ -328,6 +328,9 @@
     {{ form_widget(form) }}
     {% include '@ibexadesign/ui/component/date_time_range_single/date_time_range_single.twig' with {
         is_hidden: form.vars.data != 'custom_range',
+        attr: {
+            class: 'ibexa-trash-search-form__last-modified-date-time-range',
+        },
         start_date: form.parent.vars.data.lastModified.start_date|default(null),
         end_date: form.parent.vars.data.lastModified.end_date|default(null),
         period_input_selector: '#' ~ form.parent.last_modified.children.date_interval.vars.id,
@@ -339,6 +342,9 @@
     {{ form_widget(form) }}
     {% include '@ibexadesign/ui/component/date_time_range_single/date_time_range_single.twig' with {
         is_hidden: form.vars.data != 'custom_range',
+        attr: {
+            class: 'ibexa-trash-search-form__created-date-time-range',
+        },
         start_date: form.parent.vars.data.created.start_date|default(null),
         end_date: form.parent.vars.data.created.end_date|default(null),
         period_input_selector: '#' ~ form.parent.created.children.date_interval.vars.id,

src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig

@@ -41,6 +41,7 @@
             {{ form_widget(form.last_modified_select, {
                 'attr': {
                     'class': 'ibexa-filters__select',
+                    'data-target-selector': '.ibexa-trash-search-form__last-modified-date-time-range',
                 }
             }) }}
             {{ form_errors(form.last_modified_select) }}
@@ -50,6 +51,7 @@
             {{ form_widget(form.created_select, {
                 'attr': {
                     'class': 'ibexa-filters__select',
+                    'data-target-selector': '.ibexa-trash-search-form__created-date-time-range',
                 }
             }) }}
             {{ form_errors(form.created_select) }}