From 3326281e1a73bf0b9a4e18c7472bc610cc814488 Mon Sep 17 00:00:00 2001
From: Younn Olivier <yol@odoo.com>
Date: Thu, 10 Mar 2022 16:02:01 +0100
Subject: [PATCH] [FIX] web, website: correct items order on website systray

Before that commit, after the OWL2 rebase, the website systray items
were shuffled following those steps:
- Install website_blog
- Go to the posts list
- Click on a post
-> Until now, the systray items are correctly sorted
- Go back to the posts list, clicking on the blog navbar menu
-> Items are shuffled

For now, a temporary fix is to add an empty div with the index of the
item as the data-attribute to somehow force the rerender of the systray
items. That bug should be investigated further.

See merge commit for more information.

task-2687506
---
 addons/web/static/src/webclient/navbar/navbar.xml     | 2 ++
 addons/website/static/src/components/navbar/navbar.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/webclient/navbar/navbar.xml b/addons/web/static/src/webclient/navbar/navbar.xml
index 4ec8ad12ae6..57d1f232ffb 100644
--- a/addons/web/static/src/webclient/navbar/navbar.xml
+++ b/addons/web/static/src/webclient/navbar/navbar.xml
@@ -30,6 +30,8 @@
         <!-- Systray -->
         <div class="o_menu_systray d-flex flex-shrink-0 ml-auto" role="menu">
           <t t-foreach="systrayItems" t-as="item" t-key="item.key">
+            <!-- This ensures the correct order of the systray items -->
+            <div t-att-data-index="item.index"/>
             <ErrorHandler onError="error => this.handleItemError(error, item)">
                 <t t-component="item.Component" t-props="item.props"/>
             </ErrorHandler>
diff --git a/addons/website/static/src/components/navbar/navbar.js b/addons/website/static/src/components/navbar/navbar.js
index c489fb8d504..e32d62f2aa3 100644
--- a/addons/website/static/src/components/navbar/navbar.js
+++ b/addons/website/static/src/components/navbar/navbar.js
@@ -59,7 +59,7 @@ patch(NavBar.prototype, 'website_navbar', {
         if (this.websiteService.currentWebsite) {
             return websiteSystrayRegistry
                 .getEntries()
-                .map(([key, value]) => ({ key, ...value }))
+                .map(([key, value], index) => ({ key, ...value, index }))
                 .filter((item) => ('isDisplayed' in item ? item.isDisplayed(this.env) : true))
                 .reverse();
         }