-
-
-
+
+ 
+ Dashboard
+
+
- Action
+ Actions
+
diff --git a/addons/web/static/src/search/cog_menu/action_menus_items.js b/addons/web/static/src/search/cog_menu/action_menus_items.js
deleted file mode 100644
index 1dc0406c531..00000000000
--- a/addons/web/static/src/search/cog_menu/action_menus_items.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @odoo-module **/
-
-import { ActionMenus } from "@web/search/action_menus/action_menus";
-
-
-/**
- * Combined Action menus (or Action/Print bar, previously called 'Sidebar')
- *
- * This is a variation of the ActionMenus, combined into a single DropDown.
- *
- * The side bar is the group of dropdown menus located on the left side of the
- * control panel. Its role is to display a list of items depending on the view
- * type and selected records and to execute a set of actions on active records.
- * It is made out of 2 dropdown: Print and Action.
- *
- * @extends Component
- */
-export class ActionMenusItems extends ActionMenus {
- static template = "web.ActionMenusItems";
-}
diff --git a/addons/web/static/src/search/cog_menu/action_menus_items.xml b/addons/web/static/src/search/cog_menu/action_menus_items.xml
deleted file mode 100644
index b38bada3f18..00000000000
--- a/addons/web/static/src/search/cog_menu/action_menus_items.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.js b/addons/web/static/src/search/cog_menu/cog_menu.js
index 282604bb688..5e86fe0fe42 100644
--- a/addons/web/static/src/search/cog_menu/cog_menu.js
+++ b/addons/web/static/src/search/cog_menu/cog_menu.js
@@ -2,8 +2,9 @@
import { registry } from "@web/core/registry";
import { Dropdown } from "@web/core/dropdown/dropdown";
+import { ActionMenus } from "@web/search/action_menus/action_menus";
-import { Component } from "@odoo/owl";
+import { onWillStart, onWillUpdateProps } from "@odoo/owl";
const cogMenuRegistry = registry.category("cogMenu");
@@ -17,32 +18,61 @@ const cogMenuRegistry = registry.category("cogMenu");
* type and selected records and to execute a set of actions on active records.
* It is made out of 2 dropdown: Print and Action.
*
- * @extends Component
+ * @extends ActionMenus
*/
-export class CogMenu extends Component {
+export class CogMenu extends ActionMenus {
static template = "web.CogMenu";
static components = {
+ ...ActionMenus.components,
Dropdown,
};
static props = {
- slots: { type: Object, optional: true },
+ ...ActionMenus.props,
+ getActiveIds: { type: ActionMenus.props.getActiveIds, optional: true },
+ context: { type: ActionMenus.props.context, optional: true },
+ resModel: { type: ActionMenus.props.resModel, optional: true },
+ items: { ...ActionMenus.props.items, optional: true },
+ };
+ static defaultProps = {
+ ...ActionMenus.defaultProps,
+ items: {},
};
- get hasItems() {
- return this.cogItems.length || !!this.props.slots?.default;
+ setup() {
+ super.setup();
+ onWillStart(async () => {
+ this.registryItems = await this._registryItems();
+ });
+ onWillUpdateProps(async () => {
+ this.registryItems = await this._registryItems();
+ });
}
- get cogItems() {
- const registryMenus = [];
+ get hasItems() {
+ return this.cogItems.length || this.printItems.length;
+ }
+
+ async _registryItems() {
+ const items = [];
for (const item of cogMenuRegistry.getAll()) {
- if ("isDisplayed" in item ? item.isDisplayed(this.env) : true) {
- registryMenus.push({
+ if ("isDisplayed" in item ? await item.isDisplayed(this.env) : true) {
+ items.push({
Component: item.Component,
groupNumber: item.groupNumber,
key: item.Component.name,
});
}
}
- return registryMenus;
+ return items;
+ }
+
+ get cogItems() {
+ return [...this.actionItems, ...this.registryItems].sort((item1, item2) => {
+ const grp = (item1.groupNumber || 0) - (item2.groupNumber || 0);
+ if (grp !== 0) {
+ return grp;
+ }
+ return (item1.sequence || 0) - (item2.sequence || 0);
+ });
}
}
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.scss b/addons/web/static/src/search/cog_menu/cog_menu.scss
new file mode 100644
index 00000000000..6da63803721
--- /dev/null
+++ b/addons/web/static/src/search/cog_menu/cog_menu.scss
@@ -0,0 +1,12 @@
+.o_cp_action_menus {
+ .o_cp_action_app_icon {
+ width: var(--oi-font-size, 1em);
+ vertical-align: -0.2em;
+ }
+
+ .dropdown-item:not(.focus) > .o_cp_action_app_icon {
+ // Temporary workaround until we'll support inline SVGs icons
+ // globally (eg. Spreadsheet's toolbar icons)
+ filter: saturate(0%) brightness(0%) invert(23%) sepia(7%) saturate(1896%) hue-rotate(179deg) brightness(91%) contrast(88%);
+ }
+}
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.xml b/addons/web/static/src/search/cog_menu/cog_menu.xml
index 6fa1fff0a94..e175fe391ec 100644
--- a/addons/web/static/src/search/cog_menu/cog_menu.xml
+++ b/addons/web/static/src/search/cog_menu/cog_menu.xml
@@ -7,14 +7,42 @@
-
+
+
+
+
+ Print
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+ Dashboard
+
+
+
diff --git a/addons/web/static/src/search/action_menus/action_menus.js b/addons/web/static/src/search/action_menus/action_menus.js
index 00027d843df..300644fb0e5 100644
--- a/addons/web/static/src/search/action_menus/action_menus.js
+++ b/addons/web/static/src/search/action_menus/action_menus.js
@@ -8,6 +8,10 @@ import { DropdownItem } from "@web/core/dropdown/dropdown_item";
import { useService } from "@web/core/utils/hooks";
import { Component, onWillStart, onWillUpdateProps } from "@odoo/owl";
+
+export const STATIC_ACTIONS_GROUP_NUMBER = 1;
+export const ACTIONS_GROUP_NUMBER = 100;
+
/**
* Action menus (or Action/Print bar, previously called 'Sidebar')
*
@@ -46,12 +50,16 @@ export class ActionMenus extends Component {
async getActionItems(props) {
return (props.items.action || []).map((action) => {
if (action.callback) {
- return Object.assign({ key: `action-${action.description}` }, action);
+ return Object.assign(
+ { key: `action-${action.description}`, groupNumber: ACTIONS_GROUP_NUMBER },
+ action
+ );
} else {
return {
action,
description: action.name,
key: action.id,
+ groupNumber: action.groupNumber || ACTIONS_GROUP_NUMBER,
};
}
});
diff --git a/addons/web/static/src/search/action_menus/action_menus.xml b/addons/web/static/src/search/action_menus/action_menus.xml
index 141c0ea4a1c..e7523b3cc44 100644
--- a/addons/web/static/src/search/action_menus/action_menus.xml
+++ b/addons/web/static/src/search/action_menus/action_menus.xml
@@ -18,11 +18,12 @@