Merge branch '4.6' into ibx_9060

Author: tbialcz

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
   cs-fix:
     name: Run code style check
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     strategy:
       matrix:
         php:
@@ -35,7 +35,7 @@ jobs:
 
   tests:
     name: Tests
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     timeout-minutes: 10
 
     strategy:
@@ -88,7 +88,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
           --tmpfs /var/lib/postgresql/data
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     timeout-minutes: 20
 
     strategy:
@@ -142,7 +142,7 @@ jobs:
           --health-timeout=5s
           --health-retries=5
           --tmpfs=/var/lib/mysql
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     timeout-minutes: 20
 
     strategy:

.github/workflows/frontend-ci.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
     frontend-test:
         name: Frontend build test
-        runs-on: 'ubuntu-20.04'
+        runs-on: 'ubuntu-24.04'
         timeout-minutes: 5
 
         steps:

features/standard/ContentDraft.feature

@@ -30,8 +30,7 @@ Feature: Content items creation
       And there's draft "TestDraft" on Dashboard list
     When I start editing content draft "TestDraft"
       And I perform the "Delete draft" action
-    Then I should be on Content view Page for root
-      And I open the "Dashboard" page in admin SiteAccess
+    Then  I open the "Dashboard" page in admin SiteAccess
       And there's no draft "TestDraft" on Dashboard list
 
   @javascript

phpstan-baseline.neon

@@ -5208,6 +5208,12 @@ parameters:
 			count: 1
 			path: src/lib/Form/Data/ContentType/Translation/TranslationRemoveData.php
 
+		-
+			message: '#^Property Ibexa\\AdminUi\\Form\\Data\\ContentTypeData\:\:\$isNew in isset\(\) is not nullable nor uninitialized\.$#'
+			identifier: isset.initializedProperty
+			count: 1
+			path: src/lib/Form/Data/ContentTypeData.php
+
 		-
 			message: '#^Method Ibexa\\AdminUi\\Form\\Data\\ContentTypeGroup\\ContentTypeGroupCreateData\:\:setIdentifier\(\) has no return type specified\.$#'
 			identifier: missingType.return

src/bundle/Resources/config/services.yaml

@@ -4,6 +4,7 @@ imports:
     - { resource: services/controller_argument_resolvers.yaml }
     - { resource: services/controllers.yaml }
     - { resource: services/tabs.yaml }
+    - { resource: services/action_menu.yaml }
     - { resource: services/menu.yaml }
     - { resource: services/pagination.yaml }
     - { resource: services/ui_config/* }

src/bundle/Resources/config/services/action_menu.yaml

@@ -0,0 +1,23 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+
+    Ibexa\AdminUi\Menu\Action\DraftListActionMenuBuilder:
+        tags:
+            - { name: knp_menu.menu_builder, method: build, alias: ibexa.admin_ui.action.draft_list }
+
+    Ibexa\AdminUi\Menu\Action\VersionListActionMenuBuilder:
+        tags:
+            - { name: knp_menu.menu_builder, method: build, alias: ibexa.admin_ui.action.version_list }
+
+    ibexa.adminui.listener.draft_list_action_menu.reorder_by_order_number:
+        class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener
+        tags:
+            - { name: kernel.event_listener, event: Ibexa\AdminUi\Menu\Action\DraftListActionMenuBuilder, method: reorderMenuItems, priority: -50 }
+
+    ibexa.adminui.listener.version_list_action_menu.reorder_by_order_number:
+        class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener
+        tags:
+            - { name: kernel.event_listener, event: Ibexa\AdminUi\Menu\Action\VersionListActionMenuBuilder, method: reorderMenuItems, priority: -50 }

src/bundle/Resources/public/img/ibexa-icons.svg

@@ -120,10 +120,20 @@ import { getRestInfo } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scri
                 return;
             }
 
-            if (this.inputNode.value.length > MIN_QUERY_LENGTH) {
+            if (this.inputNode.value.length >= MIN_QUERY_LENGTH) {
                 this.getSuggestions(this.inputNode.value);
             }
         }
+
+        init() {
+            super.init();
+
+            this.inputNode.addEventListener('input', ({ currentTarget }) => {
+                if (currentTarget.value.length < MIN_QUERY_LENGTH) {
+                    this.hideSuggestionsList();
+                }
+            });
+        }
     }
 
     ibexa.addConfig('core.SuggestionTaggify', SuggestionTaggify);

src/bundle/Resources/public/img/icons/activate.svg

@@ -10,6 +10,7 @@
 
             this.attachEventsToTag = this.attachEventsToTag.bind(this);
             this.handleInputKeyUp = this.handleInputKeyUp.bind(this);
+            this.addElementAttributes = this.addElementAttributes.bind(this);
         }
 
         afterTagsUpdate() {}
@@ -18,17 +19,34 @@
             return this.acceptKeys.includes(key);
         }
 
-        addTag(name, value, dataset = {}) {
+        addElementAttributes(element, attrs) {
+            const getValue = (value) => (typeof value === 'object' ? JSON.stringify(value) : value);
+
+            Object.entries(attrs).forEach(([attrKey, attrValue]) => {
+                if (attrKey === 'dataset') {
+                    Object.entries(attrValue).forEach(([datasetKey, datasetValue]) => {
+                        element.dataset[datasetKey] = getValue(datasetValue);
+                    });
+                } else if (element.hasAttribute(attrKey)) {
+                    console.warn(`Element already has the attribute named ${attrKey}`);
+                } else {
+                    element.setAttribute(attrKey, getValue(attrValue));
+                }
+            });
+        }
+
+        addTag(name, value, attrs = {}, tooltipAttrs = {}) {
             const tagTemplate = this.listNode.dataset.template;
             const renderedTemplate = tagTemplate.replace('{{ name }}', name).replace('{{ value }}', value);
             const div = doc.createElement('div');
 
             div.insertAdjacentHTML('beforeend', renderedTemplate);
 
             const tag = div.querySelector('.ibexa-taggify__list-tag');
+            const tagNameNode = tag.querySelector('.ibexa-taggify__list-tag-name');
 
-            Object.entries(dataset).forEach(([datasetKey, datasetValue]) => (tag.dataset[datasetKey] = datasetValue));
-
+            this.addElementAttributes(tag, attrs);
+            this.addElementAttributes(tagNameNode, tooltipAttrs);
             this.attachEventsToTag(tag, value);
             this.listNode.insertBefore(tag, this.inputNode);
             this.tags.add(value);
@@ -37,6 +55,7 @@
 
         removeTag(tag, value) {
             this.tags.delete(value);
+
             tag.remove();
 
             this.afterTagsUpdate();
@@ -53,7 +72,7 @@
                 return;
             }
 
-            if (this.isAcceptKeyPressed(event.key)) {
+            if (this.isAcceptKeyPressed(event.key) && this.inputNode.value && !this.tags.has(this.inputNode.value)) {
                 this.addTag(this.inputNode.value, this.inputNode.value);
 
                 this.inputNode.value = '';

src/bundle/Resources/public/img/icons/deactivate.svg

@@ -4,9 +4,14 @@
         const showMoreIcon = showMoreBtn.querySelector('.ibexa-details__show-more-btn-icon');
         const showMoreLabel = showMoreBtn.querySelector('.ibexa-details__show-more-label');
         const showLessLabel = showMoreBtn.querySelector('.ibexa-details__show-less-label');
+        const ellipsizedLinesNo = getComputedStyle(ellipsizedContent).getPropertyValue('--ibexa-details__ellipsized-lines-no');
 
         ellipsizedContent.classList.toggle('ibexa-details__item-content--ellipsized');
 
+        if (ellipsizedLinesNo) {
+            ellipsizedContent.classList.toggle('ibexa-details__item-content--multi-line-ellipsized');
+        }
+
         showMoreLabel.classList.toggle('ibexa-details__show-more-label--hidden');
         showLessLabel.classList.toggle('ibexa-details__show-less-label--hidden');
         showMoreIcon.classList.toggle('ibexa-details__show-more-btn-icon--opened');
@@ -16,7 +21,9 @@
     showMoreBtns.forEach((showMoreBtn) => {
         const contentWrapper = showMoreBtn.closest('.ibexa-details__item-content-wrapper');
         const ellipsizedContent = contentWrapper.querySelector('.ibexa-details__item-content');
-        const isEllipsized = ellipsizedContent.offsetWidth < ellipsizedContent.scrollWidth;
+        const isEllipsized =
+            ellipsizedContent.offsetWidth < ellipsizedContent.scrollWidth ||
+            ellipsizedContent.offsetHeight < ellipsizedContent.scrollHeight;
 
         showMoreBtn.classList.toggle('ibexa-details__show-more-btn--hidden', !isEllipsized);
 

src/bundle/Resources/public/img/icons/mail-open.svg

@@ -23,7 +23,7 @@
             }
 
             if (!isEmpty) {
-                const isUrlValid = URL.canParse(urlValue);
+                const isUrlValid = ibexa.errors.urlRegexp.test(urlValue);
 
                 if (!isUrlValid) {
                     result.isError = true;