ibexa · ciastektk · Feb 26, 2025 · Feb 26, 2025 · Feb 26, 2025 · Feb 26, 2025
diff --git a/src/bundle/Resources/config/services.yaml b/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/* }

diff --git a/src/bundle/Resources/config/services/action_menu.yaml b/src/bundle/Resources/config/services/action_menu.yaml
@@ -0,0 +1,13 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+
+    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 }
diff --git a/src/bundle/Resources/translations/ibexa_action_menu.en.xliff b/src/bundle/Resources/translations/ibexa_action_menu.en.xliff
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="not.available">
+    <header>
+      <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+      <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
+    </header>
+    <body>
+      <trans-unit id="9a3c440d94f09d2b4bbddb67d0394ca555f8bd3f" resname="draft_list__action__content_edit">
+        <source>Edit</source>
+        <target state="new">Edit</target>
+        <note>key: draft_list__action__content_edit</note>
+      </trans-unit>
+      <trans-unit id="3574634178fbd999f1dc70abc2bb1af1adb0a5fa" resname="version_list__action__content_edit">
+        <source>Edit</source>
+        <target state="new">Edit</target>
+        <note>key: version_list__action__content_edit</note>
+      </trans-unit>
+      <trans-unit id="1a76a5a34ec8f37aa0af6fb321aa10b4b1a4f321" resname="version_list__action__restore_version">
+        <source>Restore archived version</source>
+        <target state="new">Restore archived version</target>
+        <note>key: version_list__action__restore_version</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/bundle/Resources/translations/ibexa_dashboard.en.xliff b/src/bundle/Resources/translations/ibexa_dashboard.en.xliff
@@ -71,11 +71,6 @@
         <target state="new">Can't fetch contributor</target>
         <note>key: dashboard.table.contributor.not_found</note>
       </trans-unit>
-      <trans-unit id="93a5fc53032106ea0ae1658261fd187e5c9c6a94" resname="dashboard.table.draft.edit">
-        <source>Edit</source>
-        <target state="new">Edit</target>
-        <note>key: dashboard.table.draft.edit</note>
-      </trans-unit>
       <trans-unit id="5c6a58e397b164610db6371fe26b4e79aa3962f8" resname="dashboard.table.draft.unauthorized">
         <source>You do not have the '%function%' '%module%' permission for content ID: %contentId%</source>
         <target state="new">You do not have the '%function%' '%module%' permission for content ID: %contentId%</target>

diff --git a/src/bundle/Resources/translations/ibexa_drafts.en.xliff b/src/bundle/Resources/translations/ibexa_drafts.en.xliff
@@ -16,11 +16,6 @@
         <target state="new">Drafts</target>
         <note>key: drafts.list</note>
       </trans-unit>
-      <trans-unit id="7a00fa1045089ab6b05a30314644f3f53477ecbf" resname="drafts.list.action.edit">
-        <source>Edit</source>
-        <target state="new">Edit</target>
-        <note>key: drafts.list.action.edit</note>
-      </trans-unit>
       <trans-unit id="887b9056de68ebd1c33c43af14093c2cafb38c5d" resname="drafts.list.action.remove">
         <source>Remove</source>
         <target state="new">Remove</target>

diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff
@@ -603,16 +603,6 @@
         <target state="new">Swap the Content item at this Location with another</target>
         <note>key: tab.locations.swap_with_another</note>
       </trans-unit>
-      <trans-unit id="d2e707023baa6830915c5d12b915974d627522e4" resname="tab.versions.table.action.archived.edit">
-        <source>Restore archived version</source>
-        <target state="new">Restore archived version</target>
-        <note>key: tab.versions.table.action.archived.edit</note>
-      </trans-unit>
-      <trans-unit id="97721a4a6c33834bb6421c29ef72e8654f39a4ab" resname="tab.versions.table.action.draft.edit">
-        <source>Edit</source>
-        <target state="new">Edit</target>
-        <note>key: tab.versions.table.action.draft.edit</note>
-      </trans-unit>
       <trans-unit id="a602612589c6e902caaf8acf1fd51fcd215955f1" resname="tab.versions.table.author.not_found">
         <source>Can't fetch contributor</source>
         <target state="new">Can't fetch contributor</target>

diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig
@@ -65,27 +65,13 @@
                     ]) %}
 
                     {% set col_raw %}
-                        {{ ibexa_render_component_group('content-drafts-list-actions', { version_info: row.versionInfo }) }}
-                        <button
-                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit"
-                            title="{{ 'drafts.list.action.edit'|trans|desc('Edit') }}"
-                            data-content-id="{{ row.versionInfo.contentInfo.id }}"
-                            data-language-code="{{ row.versionInfo.initialLanguageCode }}"
-                            data-content-draft-edit-url="{{ path(content_draft_edit_url, {
-                                'contentId': row.versionInfo.contentInfo.id,
-                                'versionNo': row.versionInfo.versionNo,
-                                'language': row.versionInfo.initialLanguageCode
-                            }) }}"
-                            data-version-has-conflict-url="{{ path('ibexa.version.has_no_conflict', {
-                                'contentId': row.versionInfo.contentInfo.id,
-                                'versionNo': row.versionInfo.versionNo,
-                                'languageCode': row.versionInfo.initialLanguageCode
-                            }) }}"
-                        >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
-                                <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
-                            </svg>
-                        </button>
+                        {% set draft_action_list = knp_menu_get(
+                            'ibexa.admin_ui.action.draft_list',
+                            [],
+                            { versionInfo: row.versionInfo}) %}
+                        {{ knp_menu_render(draft_action_list, {
+                            template: '@ibexadesign/ui/action_list.html.twig',
+                        }) }}
                     {% endset %}
                     {% set body_row_cols = body_row_cols|merge([{
                         has_action_btns: true,

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig
@@ -43,19 +43,6 @@
         </thead>
         <tbody class="ibexa-table__body">
             {% for version in versions %}
-                {% set edit_url = content_is_user is defined and content_is_user ?
-                        path('ibexa.user.update', {
-                        'contentId': version.contentInfo.id,
-                        'versionNo': version.versionNo,
-                        'language': version.initialLanguageCode,
-                    }) : path('ibexa.content.draft.edit', {
-                        'contentId': version.contentInfo.id,
-                        'versionNo': version.versionNo,
-                        'language': version.initialLanguageCode,
-                        'locationId': location.id ?? null
-                    })
-                %}
-
                 {% set custom_columns %}
                     {% block custom_columns %}{% endblock %}
                 {% endset %}
@@ -102,51 +89,23 @@
                             content: version.modificationDate|ibexa_full_datetime,
                         } %}
 
-                        {% if have_actions %}
+                        {% set version_action_list = knp_menu_get(
+                            'ibexa.admin_ui.action.version_list',
+                            [],
+                            {
+                                versionInfo: version,
+                                isDraftConflict: is_draft_conflict,
+                                locationId: location.id ?? null
+                            })
+                        %}
+
+                        {% if have_actions or version_action_list != null %}
                             {% embed '@ibexadesign/ui/component/table/table_body_cell.html.twig' with { has_action_btns: true } %}
                                 {% block action_btns_content %}
                                     {{ custom_actions_column }}
-                                    {% if is_draft_conflict %}
-                                        <a
-                                            href="{{ edit_url }}"
-                                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
-                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit') }}"
-                                        >
-                                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
-                                                <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
-                                            </svg>
-                                        </a>
-                                    {% elseif is_draft %}
-                                        <button
-                                            data-content-draft-edit-url="{{ edit_url }}"
-                                            data-version-has-conflict-url="{{ path('ibexa.version.has_no_conflict', {
-                                                'contentId': version.contentInfo.id,
-                                                'versionNo': version.versionNo,
-                                                'languageCode': version.initialLanguageCode
-                                            }) }}"
-                                            data-content-id="{{ version.contentInfo.id }}"
-                                            data-language-code="{{ version.initialLanguageCode }}"
-                                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit"
-                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit') }}"
-                                        >
-                                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
-                                                <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
-                                            </svg>
-                                        </button>
-                                    {% endif %}
-                                    {% if is_archived %}
-                                        <button
-                                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-edit"
-                                            title="{{ 'tab.versions.table.action.archived.edit'|trans|desc('Restore archived version') }}"
-                                            data-content-id="{{ version.contentInfo.id }}"
-                                            data-version-no="{{ version.versionNo }}"
-                                            data-language-code="{{ version.initialLanguageCode }}"
-                                        >
-                                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
-                                                <use xlink:href="{{ ibexa_icon_path('archive-restore') }}"></use>
-                                            </svg>
-                                        </button>
-                                    {% endif %}
+                                    {{ knp_menu_render(version_action_list, {
+                                        template: '@ibexadesign/ui/action_list.html.twig',
+                                    }) }}
                                 {% endblock %}
                             {% endembed %}
                         {% endif %}

diff --git a/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig
@@ -0,0 +1,24 @@
+{% import "@ibexadesign/ui/component/macros.html.twig" as html %}
+
+{% for action in item.children %}
+    {% set element = action.uri ? 'a' : 'button' %}
+    {% set classess = {
+        class: 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text' ~ ' ' ~ action.attributes.class|default('')
+    } %}
+
+    {% set attr = {
+        title: action.label
+    }|merge(action.attributes, classess) %}
+
+    {% if action.uri %}
+        {% set attr = attr|merge({ href: action.uri })%}
+    {% else %}
+        {% set attr = attr|merge({ type: 'button' })%}
+    {% endif %}
+
+    <{{ element }} {{ html.attributes(attr) }}>
+    <svg class="ibexa-icon ibexa-icon--small">
+        <use xlink:href="{{ ibexa_icon_path(action.extras.icon) }}"></use>
+    </svg>
+    </{{ element }}>
+{% endfor %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig
@@ -26,27 +26,13 @@
         ]) %}
 
         {% set col_raw %}
-            {{ ibexa_render_component_group('content-drafts-list-actions', { version_info: row.versionInfo }) }}
-            <button
-                class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit"
-                title="{{ 'dashboard.table.draft.edit'|trans|desc('Edit') }}"
-                data-content-draft-edit-url="{{ path(content_draft_edit_url, {
-                    'contentId': row.versionInfo.contentInfo.id,
-                    'versionNo': row.versionInfo.versionNo,
-                    'language': row.versionInfo.initialLanguageCode
-                }) }}"
-                data-version-has-conflict-url="{{ path('ibexa.version.has_no_conflict', {
-                    'contentId': row.versionInfo.contentInfo.id,
-                    'versionNo': row.versionInfo.versionNo,
-                    'languageCode': row.versionInfo.initialLanguageCode
-                }) }}"
-                data-content-id="{{ row.versionInfo.contentInfo.id }}"
-                data-language-code="{{ row.versionInfo.initialLanguageCode }}"
-            >
-                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
-                    <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
-                </svg>
-            </button>
+            {% set draft_action_list = knp_menu_get(
+                'ibexa.admin_ui.action.draft_list',
+                [],
+                { versionInfo: row.versionInfo}) %}
+            {{ knp_menu_render(draft_action_list, {
+                template: '@ibexadesign/ui/action_list.html.twig',
+            }) }}
         {% endset %}
         {% set body_row_cols = body_row_cols|merge([{
             has_action_btns: true,