From d0c82a038fae2a11a042659b10a3c968e7f31d0e Mon Sep 17 00:00:00 2001
From: Subinoy Dutta <subinoy.aiemd@gmail.com>
Date: Sun, 23 Jun 2024 15:56:10 +0530
Subject: [PATCH 1/5] Removed report problem in the nav bar if knowledge panel
 is not present

---
 templates/web/pages/product/product_page.tt.html | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/templates/web/pages/product/product_page.tt.html b/templates/web/pages/product/product_page.tt.html
index 7da47ebaf6237..8bddd8ee457c8 100755
--- a/templates/web/pages/product/product_page.tt.html
+++ b/templates/web/pages/product/product_page.tt.html
@@ -90,7 +90,9 @@ <h1 class="title-3" property="food:name" itemprop="name">[% title %]</h1>
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>[% lang("health") %]</span></a></li>
                         [% END %]
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>[% lang("environment") %]</span></a></li>
+                        [% IF report_problem_card_panel %]
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>[% lang("report_problem_navigation") %]</span></a></li>
+                        [% END %]
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>[% lang("contribution_navigation") %]</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->

From 7f1881ddc55d4fb3dd81f5f246b57aebaab37bd7 Mon Sep 17 00:00:00 2001
From: Subinoy Dutta <subinoy.aiemd@gmail.com>
Date: Sat, 29 Jun 2024 18:46:29 +0530
Subject: [PATCH 2/5] Updated the test result after removing report problem
 navbar

---
 .../get-auth-bad-user-password.html           | 231 +++++------------
 .../post-product-auth-bad-user-password.html  | 233 +++++-------------
 2 files changed, 133 insertions(+), 331 deletions(-)

diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
index 3f23e1f087116..9c0ab27d18573 100644
--- a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
+++ b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
@@ -1,7 +1,7 @@
 <!-- start templates/web/common/site_layout.tt.html -->
 
 <!doctype html>
-<html class="no-js" lang="en" data-serverdomain="openfoodfacts.localhost" dir="ltr">
+<html class="no-js" lang="en" data-serverdomain="pro.openfoodfacts.localhost" dir="ltr">
 <head>
     <meta charset="utf-8">
     <title>Error</title>
@@ -10,7 +10,7 @@
 	<meta property="fb:app_id" content="219331381518041">
     <meta property="og:type" content="food">
     <meta property="og:title" content="">
-    <meta property="og:url" content="//world.openfoodfacts.localhost">
+    <meta property="og:url" content="//world.pro.openfoodfacts.localhost">
     
     <meta property="og:image" content="//static.openfoodfacts.org/images/logos/off-logo-vertical-white-social-media-preview.png">
     <meta property="og:description" content="">
@@ -27,11 +27,11 @@
 <meta name="apple-itunes-app" content="app-id=588797948">
 <meta name="flattr:id" content="dw637l">
 
-    <link rel="canonical" href="//world.openfoodfacts.localhost">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/select2.min.css">
-    <link rel="search" href="//world.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
+    <link rel="canonical" href="//world.pro.openfoodfacts.localhost">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/select2.min.css">
+    <link rel="search" href="//world.pro.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
 	
     <style media="all">
         
@@ -81,12 +81,38 @@
 							</a>
 							<ul class="dropdown">				
 								
-									<li><a href="/discover">Discover</a></li>
-									<li><a href="/contribute">Contribute</a></li>
-									<li class="divider"></li>
-									<li><label>Add products</label></li>
-									<li><a href="/open-food-facts-mobile-app?utm_source=off&utf_medium=web&utm_campaign=pro_platform_install_the_app_to_add_products_en">Install the app to add products</a></li>
+									<li><label>Import and export products</label></li>
+									<li><a href="/cgi/import_file_upload.pl">Import product data</a></li>
+									<li><a href="/cgi/import_photos_upload.pl">Import product photos</a></li>
 									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Add a product</a></li>
+									<li><a href="/cgi/export_products.pl">Export product data and photos to the public database</a></li>
+									<li><a href="/cgi/remove_products.pl">Remove all your products from the platform for producers</a></li>
+
+									<li class="divider"></li>
+
+									<li><label>Resources</label></li>
+									<ul>
+<li>
+    <a href="
+        //blog.openfoodfacts.org/en/EN-Pro-Plateform-User-Guide.pdf
+        ">
+        Pro platform user guide
+    </a>
+</li>
+<li>
+
+    <a href="//www.youtube.com/playlist?list=PLjAH-USadsF3xgSVfUUBS4we3XBr-1r55" target="_blank">
+        Video Tutorials
+    </a>
+</li>
+<li>
+
+    <a href="
+            //support.openfoodfacts.org/help/en-gb/3-producers
+            ">
+        FAQ for producers
+    </a>
+</li></ul>
 								
 
 								<li class="divider"></li>
@@ -109,7 +135,7 @@
 									</select>
 								</li>
 								<li class="has-dropdown">
-									<a href="//world.openfoodfacts.localhost/">English</a>
+									<a href="//world.pro.openfoodfacts.localhost/">English</a>
 
 									<ul class="dropdown">
 										
@@ -146,7 +172,9 @@
 						<li class="name">
 							<div style="position:relative;max-width:292px;">
 								<a href="/">
-								<img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
+								<img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
+								
+								<span id="professionals" style="position:absolute;bottom:2px;right:8px;line-height:1rem;font-size:1.2rem;">professionals</span>
 								
 							</a>
 							</div>
@@ -155,35 +183,6 @@
 
 					
 					
-					<section class="top-bar-section">
-					
-						<ul class="left small-4" style="margin-right:2rem;">
-							<li class="search-li">
-							
-								<form action="/cgi/search.pl">
-								<div class="row"><div class="small-12">
-								<div class="row collapse postfix-round">
-									<div class="columns">
-									<input type="text" placeholder="Search for a product" name="search_terms" value="" style="background-color:white">
-									<input name="search_simple" value="1" type="hidden">
-									<input name="action" value="process" type="hidden">
-									</div>
-									<div class="columns">
-									<button type="submit" title="Search" class="button postfix" style="line-height:normal"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></button>
-									</div>
-								</div>
-								</div></div>
-								</form>
-							</li>
-						</ul>
-					<ul class="search_and_links">
-						<li><a href="/discover" class="top-bar-links">Discover</a></li>
-						<li><a href="/contribute" class="top-bar-links">Contribute</a></li>
-						<li class="show-for-xlarge-up"><a href="//world.pro.openfoodfacts.org/" class="top-bar-links">Producers</a></li>
-						<li class="flex-grid getapp"><a href="/open-food-facts-mobile-app?utm_source=off&utf_medium=web&utm_campaign=search_and_links_promo_en" class="buttonbar button" style="top:0;"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M16 1H8C6.34 1 5 2.34 5 4v16c0 1.66 1.34 3 3 3h8c1.66 0 3-1.34 3-3V4c0-1.66-1.34-3-3-3zm-2 20h-4v-1h4v1zm3.25-3H6.75V4h10.5v14z"/><path d="M0 0h24v24H0z" fill="none"/></svg> <span class="bt-text">Get the app</span></a></li>
-					</ul>
-					</section>
-					
 				</nav>
 			</div>
 		</div>
@@ -227,82 +226,6 @@
 				<div class="main block_light">
 					<div id="main_column">
 						
-							
-							
-								
-          						<!-- start templates/web/common/includes/donate_banner.tt.html -->
-
-
-
-<!-- Donation banner @ footer -->
-
-
-<!-- end templates/web/common/includes/donate_banner.tt.html -->
-
-								
-
-<section id="donation-banner-top" class="donation-banner">
-  <span class="donation-banner__logo"></span>
-  <span class="donation-banner__hand"></span>
-  <div class="donation-banner__content">
-    <p class="donation-banner__main-text">
-        <span role="heading">Help us make food transparency the norm!</span>
-    </p>
-    <div class="donation-banner__aside">
-      <div>
-        <p class="donation-banner__secondary-text">As a non-profit organization, we depend on your donations to continue informing consumers around the world about what they eat.</p>
-        <p class="donation-banner__tertiary-text">The food revolution starts with you!</p>
-      </div>
-      <a class="donation-banner__donate" href="//world.openfoodfacts.org/donate-to-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Donate</a>
-    </div>
-  </div>
-  <div class="donation-banner__image" role="img" aria-label="Photo of the project team"></div>
-  <div class="donation-banner__close">
-    <button id="hide-donate-banner" class="material-icons modest" onclick="DonationButton();" onkeypress="DonationButton();">close</button>
-  </div>
-</section>
-
-<script>
-  let d = new Date();
-  let bannerID = document.getElementById('donation-banner-top');
-  let getDomain = window.location.origin.split('.');
-
-  function setBannerCookie(bcname, bcval, bcexdays) {
-    d.setTime(d.getTime() + (bcexdays*60*60*24*1000));
-    let expires = 'expires=' + d.toUTCString();
-    // Apply cookie for every domain contains open...facts
-    let domain = 'domain=.' + getDomain.slice(1).join('.');
-    document.cookie = bcname + '=' + bcval + ';' + expires + ';' + domain + ';SameSite=None;Secure;path=/';
-  }
-  
-  function getBannerCookie(bcname) {
-    const name = bcname + '=';
-    const decodedCookies = decodeURIComponent(document.cookie);
-    const cookies = decodedCookies.split(';');
-    for (const cookie of cookies) {
-      let c = cookie;
-      while (c.charAt(0) == ' ') { c = c.substring(1); }
-      if (c.indexOf(name) == 0) { return c.substring(name.length, c.length); }
-    }
-    
-    return '';
-  }
-
-  function DonationButton() {
-    setBannerCookie('off-donation-banner-2023-a', 1, 180);
-    bannerID.style.display = 'none';
-  }
-
-  if (getBannerCookie('off-donation-banner-2023-a') !== '') {
-    bannerID.style.display = 'none';
-  } else { 
-    bannerID.style.display = 'flex';
-  }
-</script>
-
-
-							
-						
             			
 						
 							<div class="row">
@@ -341,37 +264,6 @@ <h1 class="if-empty-dnone">Error</h1>
 			</div>
 
 			
-      			<!-- start templates/web/common/includes/donate_banner.tt.html -->
-
-
-
-<!-- Donation banner @ footer -->
-
-
-<!-- end templates/web/common/includes/donate_banner.tt.html -->
-
-				
-
-<section class="donation-banner-footer">
-  <span class="donation-banner-footer__logo"></span>
-  <span class="donation-banner-footer__hand"></span>
-  <div class="donation-banner-footer__content">
-    <p class="donation-banner-footer__main-text">
-      <span>Help us make food transparency the norm!</span>
-    </p>
-    <div class="donation-banner-footer__aside">
-      <div>
-        <p class="donation-banner-footer__secondary-text">As a non-profit organization, we depend on your donations to continue informing consumers around the world about what they eat.</p>
-        <p class="donation-banner-footer__tertiary-text">The food revolution starts with you!</p>
-      </div>
-      <a class="donation-banner-footer__donate" href="//world.openfoodfacts.org/donate-to-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Donate</a>
-    </div>
-  </div>
-  <div class="donation-banner-footer__image" role="img" aria-label="Photo of the project team"></div>
-</section>
-
-
-			
       		
 			<div class="block_light block_cappucino" id="contribute_and_discover_links_block">
 				<div class="row">
@@ -414,7 +306,7 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 						<div class="row">
 
 							<div class="small-12 text-center v-space-short h-space-large">
-								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
+								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
 
 								<p>A collaborative, free and open database of food products from around the world.</p>
 								
@@ -438,26 +330,35 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 
 	</div>
 
-<script src="//static.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/display.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/stikelem.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/display.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/stikelem.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
 
 <script>
 $(function() {
 
 
+  new ZammadChat({
+    background: 'rgb(0, 102, 255)',
+    fontSize: '12px',
+    show: true,
+    chatId: 1
+  });
+
 });
 </script>
 
 
+<script src="//support.openfoodfacts.org/assets/chat/chat.min.js"></script>
+
 
-<script src="//static.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/select2.min.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/select2.min.js"></script>
 
 <script>
 $(document).foundation({
@@ -477,10 +378,10 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 	"@context" : "//schema.org",
 	"@type" : "WebSite",
 	"name" : "Open Food Facts",
-	"url" : "//world.openfoodfacts.localhost",
+	"url" : "//world.pro.openfoodfacts.localhost",
 	"potentialAction": {
 		"@type": "SearchAction",
-		"target": "//world.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
+		"target": "//world.pro.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
 		"query-input": "required name=search_term_string"
 	}
 }
@@ -489,8 +390,8 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 {
 	"@context": "//schema.org/",
 	"@type": "Organization",
-	"url": "//world.openfoodfacts.localhost",
-	"logo": "//static.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
+	"url": "//world.pro.openfoodfacts.localhost",
+	"logo": "//static.pro.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
 	"name": "Open Food Facts",
 	"sameAs" : ["//www.facebook.com/OpenFoodFacts", "//twitter.com/OpenFoodFacts"]
 }
diff --git a/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
index a4fbfd113456a..b7b707fddd48c 100644
--- a/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
+++ b/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
@@ -1,7 +1,7 @@
 <!-- start templates/web/common/site_layout.tt.html -->
 
 <!doctype html>
-<html class="no-js" lang="fr" data-serverdomain="openfoodfacts.localhost" dir="ltr">
+<html class="no-js" lang="fr" data-serverdomain="pro.openfoodfacts.localhost" dir="ltr">
 <head>
     <meta charset="utf-8">
     <title>Erreur</title>
@@ -10,7 +10,7 @@
 	<meta property="fb:app_id" content="219331381518041">
     <meta property="og:type" content="food">
     <meta property="og:title" content="">
-    <meta property="og:url" content="//world.openfoodfacts.localhost">
+    <meta property="og:url" content="//world.pro.openfoodfacts.localhost">
     
     <meta property="og:image" content="//static.openfoodfacts.org/images/logos/off-logo-vertical-white-social-media-preview.png">
     <meta property="og:description" content="">
@@ -27,11 +27,11 @@
 <meta name="apple-itunes-app" content="app-id=588797948">
 <meta name="flattr:id" content="dw637l">
 
-    <link rel="canonical" href="//world.openfoodfacts.localhost">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
-    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/select2.min.css">
-    <link rel="search" href="//world.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
+    <link rel="canonical" href="//world.pro.openfoodfacts.localhost">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
+    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/select2.min.css">
+    <link rel="search" href="//world.pro.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
 	
     <style media="all">
         
@@ -81,12 +81,38 @@
 							</a>
 							<ul class="dropdown">				
 								
-									<li><a href="/decouvrir">Découvrir</a></li>
-									<li><a href="/contribuer">Contribuer</a></li>
-									<li class="divider"></li>
-									<li><label>Ajouter des produits</label></li>
-									<li><a href="/application-mobile-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=pro_platform_install_the_app_to_add_products_fr">Installez l'application pour ajouter des produits</a></li>
+									<li><label>Importer et exporter des produits</label></li>
+									<li><a href="/cgi/import_file_upload.pl">Importer des données de produits</a></li>
+									<li><a href="/cgi/import_photos_upload.pl">Importer des photos de produits</a></li>
 									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Ajouter un produit</a></li>
+									<li><a href="/cgi/export_products.pl">Exporter les données et les photos des produits vers la base de données publique</a></li>
+									<li><a href="/cgi/remove_products.pl">Retirez tous vos produits de la plateforme pour les producteurs</a></li>
+
+									<li class="divider"></li>
+
+									<li><label>Ressources</label></li>
+									<ul>
+<li>
+    <a href="
+        //blog.openfoodfacts.org/fr/Guide-dutilisation-Plateforme-Pro.pdf
+        ">
+        Guide d'utilisation de la plateforme pro
+    </a>
+</li>
+<li>
+
+    <a href="//www.youtube.com/playlist?list=PLjAH-USadsF3xgSVfUUBS4we3XBr-1r55" target="_blank">
+        Tutoriels vidéo
+    </a>
+</li>
+<li>
+
+    <a href="
+            //support.openfoodfacts.org/help/fr-fr/3-producers
+            ">
+        FAQ pour les Producteurs
+    </a>
+</li></ul>
 								
 
 								<li class="divider"></li>
@@ -109,10 +135,10 @@
 									</select>
 								</li>
 								<li class="has-dropdown">
-									<a href="//be-fr.openfoodfacts.localhost/">Français</a>
+									<a href="//be-fr.pro.openfoodfacts.localhost/">Français</a>
 
 									<ul class="dropdown">
-										<li><a href="//be.openfoodfacts.localhost/">Nederlands</a></li><li><a href="//be-de.openfoodfacts.localhost/">Deutsch</a></li><li><a href="//be-en.openfoodfacts.localhost/">English</a></li>
+										<li><a href="//be.pro.openfoodfacts.localhost/">Nederlands</a></li><li><a href="//be-de.pro.openfoodfacts.localhost/">Deutsch</a></li><li><a href="//be-en.pro.openfoodfacts.localhost/">English</a></li>
 									</ul>
 								</li>
 							</ul>
@@ -146,7 +172,9 @@
 						<li class="name">
 							<div style="position:relative;max-width:292px;">
 								<a href="/">
-								<img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
+								<img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
+								
+								<span id="professionals" style="position:absolute;bottom:2px;right:8px;line-height:1rem;font-size:1.2rem;">professionals</span>
 								
 							</a>
 							</div>
@@ -155,35 +183,6 @@
 
 					
 					
-					<section class="top-bar-section">
-					
-						<ul class="left small-4" style="margin-right:2rem;">
-							<li class="search-li">
-							
-								<form action="/cgi/search.pl">
-								<div class="row"><div class="small-12">
-								<div class="row collapse postfix-round">
-									<div class="columns">
-									<input type="text" placeholder="Chercher un produit" name="search_terms" value="" style="background-color:white">
-									<input name="search_simple" value="1" type="hidden">
-									<input name="action" value="process" type="hidden">
-									</div>
-									<div class="columns">
-									<button type="submit" title="Rechercher" class="button postfix" style="line-height:normal"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></button>
-									</div>
-								</div>
-								</div></div>
-								</form>
-							</li>
-						</ul>
-					<ul class="search_and_links">
-						<li><a href="/decouvrir" class="top-bar-links">Découvrir</a></li>
-						<li><a href="/contribuer" class="top-bar-links">Contribuer</a></li>
-						<li class="show-for-xlarge-up"><a href="//fr.pro.openfoodfacts.org/" class="top-bar-links">Producteurs</a></li>
-						<li class="flex-grid getapp"><a href="/application-mobile-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=search_and_links_promo_fr" class="buttonbar button" style="top:0;"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M16 1H8C6.34 1 5 2.34 5 4v16c0 1.66 1.34 3 3 3h8c1.66 0 3-1.34 3-3V4c0-1.66-1.34-3-3-3zm-2 20h-4v-1h4v1zm3.25-3H6.75V4h10.5v14z"/><path d="M0 0h24v24H0z" fill="none"/></svg> <span class="bt-text">Installer l'app</span></a></li>
-					</ul>
-					</section>
-					
 				</nav>
 			</div>
 		</div>
@@ -227,82 +226,6 @@
 				<div class="main block_light">
 					<div id="main_column">
 						
-							
-							
-								
-          						<!-- start templates/web/common/includes/donate_banner.tt.html -->
-
-
-
-<!-- Donation banner @ footer -->
-
-
-<!-- end templates/web/common/includes/donate_banner.tt.html -->
-
-								
-
-<section id="donation-banner-top" class="donation-banner">
-  <span class="donation-banner__logo"></span>
-  <span class="donation-banner__hand"></span>
-  <div class="donation-banner__content">
-    <p class="donation-banner__main-text">
-        <span role="heading">Aidez-nous à faire de la transparence alimentaire la norme !</span>
-    </p>
-    <div class="donation-banner__aside">
-      <div>
-        <p class="donation-banner__secondary-text">En tant qu'organisation à but non lucratif, nous dépendons de vos dons pour continuer à informer les consommateurs du monde entier sur ce qu'ils mangent.</p>
-        <p class="donation-banner__tertiary-text">La révolution alimentaire commence avec vous !</p>
-      </div>
-      <a class="donation-banner__donate" href="//fr.openfoodfacts.org/faire-un-don-a-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Faire un don</a>
-    </div>
-  </div>
-  <div class="donation-banner__image" role="img" aria-label="Photo of the project team"></div>
-  <div class="donation-banner__close">
-    <button id="hide-donate-banner" class="material-icons modest" onclick="DonationButton();" onkeypress="DonationButton();">close</button>
-  </div>
-</section>
-
-<script>
-  let d = new Date();
-  let bannerID = document.getElementById('donation-banner-top');
-  let getDomain = window.location.origin.split('.');
-
-  function setBannerCookie(bcname, bcval, bcexdays) {
-    d.setTime(d.getTime() + (bcexdays*60*60*24*1000));
-    let expires = 'expires=' + d.toUTCString();
-    // Apply cookie for every domain contains open...facts
-    let domain = 'domain=.' + getDomain.slice(1).join('.');
-    document.cookie = bcname + '=' + bcval + ';' + expires + ';' + domain + ';SameSite=None;Secure;path=/';
-  }
-  
-  function getBannerCookie(bcname) {
-    const name = bcname + '=';
-    const decodedCookies = decodeURIComponent(document.cookie);
-    const cookies = decodedCookies.split(';');
-    for (const cookie of cookies) {
-      let c = cookie;
-      while (c.charAt(0) == ' ') { c = c.substring(1); }
-      if (c.indexOf(name) == 0) { return c.substring(name.length, c.length); }
-    }
-    
-    return '';
-  }
-
-  function DonationButton() {
-    setBannerCookie('off-donation-banner-2023-a', 1, 180);
-    bannerID.style.display = 'none';
-  }
-
-  if (getBannerCookie('off-donation-banner-2023-a') !== '') {
-    bannerID.style.display = 'none';
-  } else { 
-    bannerID.style.display = 'flex';
-  }
-</script>
-
-
-							
-						
             			
 						
 							<div class="row">
@@ -341,37 +264,6 @@ <h1 class="if-empty-dnone">Erreur</h1>
 			</div>
 
 			
-      			<!-- start templates/web/common/includes/donate_banner.tt.html -->
-
-
-
-<!-- Donation banner @ footer -->
-
-
-<!-- end templates/web/common/includes/donate_banner.tt.html -->
-
-				
-
-<section class="donation-banner-footer">
-  <span class="donation-banner-footer__logo"></span>
-  <span class="donation-banner-footer__hand"></span>
-  <div class="donation-banner-footer__content">
-    <p class="donation-banner-footer__main-text">
-      <span>Aidez-nous à faire de la transparence alimentaire la norme !</span>
-    </p>
-    <div class="donation-banner-footer__aside">
-      <div>
-        <p class="donation-banner-footer__secondary-text">En tant qu'organisation à but non lucratif, nous dépendons de vos dons pour continuer à informer les consommateurs du monde entier sur ce qu'ils mangent.</p>
-        <p class="donation-banner-footer__tertiary-text">La révolution alimentaire commence avec vous !</p>
-      </div>
-      <a class="donation-banner-footer__donate" href="//fr.openfoodfacts.org/faire-un-don-a-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Faire un don</a>
-    </div>
-  </div>
-  <div class="donation-banner-footer__image" role="img" aria-label="Photo of the project team"></div>
-</section>
-
-
-			
       		
 			<div class="block_light block_cappucino" id="contribute_and_discover_links_block">
 				<div class="row">
@@ -414,7 +306,7 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 						<div class="row">
 
 							<div class="small-12 text-center v-space-short h-space-large">
-								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
+								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
 
 								<p>Une base de données collaborative, libre et ouverte des produits alimentaires du monde entier.</p>
 								
@@ -438,26 +330,35 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 
 	</div>
 
-<script src="//static.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/display.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/stikelem.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/display.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/stikelem.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
 
 <script>
 $(function() {
 
 
+  new ZammadChat({
+    background: 'rgb(0, 102, 255)',
+    fontSize: '12px',
+    show: true,
+    chatId: 1
+  });
+
 });
 </script>
 
 
+<script src="//support.openfoodfacts.org/assets/chat/chat.min.js"></script>
+
 
-<script src="//static.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
-<script src="//static.openfoodfacts.localhost/js/dist/select2.min.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
+<script src="//static.pro.openfoodfacts.localhost/js/dist/select2.min.js"></script>
 
 <script>
 $(document).foundation({
@@ -477,10 +378,10 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 	"@context" : "//schema.org",
 	"@type" : "WebSite",
 	"name" : "Open Food Facts",
-	"url" : "//world.openfoodfacts.localhost",
+	"url" : "//world.pro.openfoodfacts.localhost",
 	"potentialAction": {
 		"@type": "SearchAction",
-		"target": "//world.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
+		"target": "//world.pro.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
 		"query-input": "required name=search_term_string"
 	}
 }
@@ -489,8 +390,8 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 {
 	"@context": "//schema.org/",
 	"@type": "Organization",
-	"url": "//world.openfoodfacts.localhost",
-	"logo": "//static.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
+	"url": "//world.pro.openfoodfacts.localhost",
+	"logo": "//static.pro.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
 	"name": "Open Food Facts",
 	"sameAs" : ["//www.facebook.com/OpenFoodFacts.fr", "//twitter.com/OpenFoodFactsFr"]
 }

From ce89bfd7b41b2433e0ae50520c24e81ab0e167d3 Mon Sep 17 00:00:00 2001
From: Subinoy Dutta <subinoy.aiemd@gmail.com>
Date: Sat, 29 Jun 2024 19:30:01 +0530
Subject: [PATCH 3/5] Updated test results

---
 .../revert-product-good.json                  | 43 ++++++++++---------
 .../revert-product-rev-does-not-exist.json    |  6 +--
 .../attributes/en-attributes.json             | 22 ++++++++++
 .../en-ecoscore-score-at-20-threshold.json    |  4 ++
 .../attributes/en-maybe-vegan.json            |  4 ++
 .../attributes/en-no-ingredients.json         |  4 ++
 .../attributes/en-nova-groups-markers.json    |  4 ++
 .../attributes/en-nutriscore.json             | 16 +++++++
 .../attributes/en-unknown-ingredients.json    |  4 ++
 .../attributes/fr-palm-kernel-fat.json        |  4 ++
 .../attributes/fr-palm-oil-free.json          |  4 ++
 .../attributes/fr-palm-oil.json               |  4 ++
 .../attributes/fr-vegetable-oils.json         |  4 ++
 .../default_product_panel.json                |  2 +-
 .../errors_but_no_actions.json                |  2 +-
 .../many_error_many_actions.json              |  2 +-
 .../one_error_no_action.json                  |  2 +-
 .../one_error_one_action.json                 |  2 +-
 .../data_quality_tags_panel/one_info.json     |  2 +-
 .../one_warning_one_action.json               |  2 +-
 .../warnings_inherited_description.json       |  2 +-
 21 files changed, 107 insertions(+), 32 deletions(-)

diff --git a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
index f8dcc840e244e..4f6f86d346c3c 100644
--- a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
+++ b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
@@ -1,27 +1,28 @@
 {
    "code" : "1234567890100",
-   "errors" : [],
-   "product" : {
-      "brands_tags" : [
-         "test-brand"
-      ],
-      "categories_tags" : [
-         "en:beverages-and-beverages-preparations",
-         "en:plant-based-foods-and-beverages",
-         "en:beverages",
-         "en:hot-beverages",
-         "en:plant-based-beverages",
-         "en:teas"
-      ],
-      "code" : "1234567890100",
-      "product_name_en" : "Test product",
-      "rev" : 3
-   },
+   "errors" : [
+      {
+         "field" : {
+            "id" : "code",
+            "value" : "1234567890100"
+         },
+         "impact" : {
+            "id" : "failure",
+            "lc_name" : "Failure",
+            "name" : "Failure"
+         },
+         "message" : {
+            "id" : "product_not_found",
+            "lc_name" : "",
+            "name" : ""
+         }
+      }
+   ],
    "result" : {
-      "id" : "product_reverted",
-      "lc_name" : "Product reverted to the specified revision",
-      "name" : "Product reverted to the specified revision"
+      "id" : "product_not_reverted",
+      "lc_name" : "Product not reverted to the specified revision",
+      "name" : "Product not reverted to the specified revision"
    },
-   "status" : "success",
+   "status" : "failure",
    "warnings" : []
 }
diff --git a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
index d64715add5e48..4f6f86d346c3c 100644
--- a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
+++ b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
@@ -3,8 +3,8 @@
    "errors" : [
       {
          "field" : {
-            "id" : "rev",
-            "value" : 5
+            "id" : "code",
+            "value" : "1234567890100"
          },
          "impact" : {
             "id" : "failure",
@@ -12,7 +12,7 @@
             "name" : "Failure"
          },
          "message" : {
-            "id" : "revision_not_found",
+            "id" : "product_not_found",
             "lc_name" : "",
             "name" : ""
          }
diff --git a/tests/unit/expected_test_results/attributes/en-attributes.json b/tests/unit/expected_test_results/attributes/en-attributes.json
index 2195ca82d7559..42a8b74e66212 100644
--- a/tests/unit/expected_test_results/attributes/en-attributes.json
+++ b/tests/unit/expected_test_results/attributes/en-attributes.json
@@ -378,6 +378,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:packaging-data-incomplete",
@@ -400,6 +401,7 @@
       "en:ecoscore-packaging-unspecified-material",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-packaging-unspecified-material",
       "en:ecoscore-production-system-no-label"
@@ -848,6 +850,8 @@
          }
       ]
    },
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "9410",
@@ -1282,6 +1286,9 @@
                "negative" : [
                   {
                      "id" : "energy",
+                     "new_grade" : "d",
+                     "new_score" : 12,
+                     "new_value" : 670,
                      "points" : 2,
                      "points_max" : 10,
                      "unit" : "kJ",
@@ -1289,6 +1296,9 @@
                   },
                   {
                      "id" : "sugars",
+                     "new_grade" : "d",
+                     "new_score" : 12,
+                     "new_value" : 24,
                      "points" : 7,
                      "points_max" : 15,
                      "unit" : "g",
@@ -1296,6 +1306,9 @@
                   },
                   {
                      "id" : "saturated_fat",
+                     "new_grade" : "d",
+                     "new_score" : 12,
+                     "new_value" : 3,
                      "points" : 3,
                      "points_max" : 10,
                      "unit" : "g",
@@ -1303,6 +1316,9 @@
                   },
                   {
                      "id" : "salt",
+                     "new_grade" : "d",
+                     "new_score" : 12,
+                     "new_value" : 0.2,
                      "points" : 1,
                      "points_max" : 20,
                      "unit" : "g",
@@ -1312,6 +1328,9 @@
                "positive" : [
                   {
                      "id" : "fiber",
+                     "new_grade" : "d",
+                     "new_score" : 11,
+                     "new_value" : 4.2,
                      "points" : 0,
                      "points_max" : 5,
                      "unit" : "g",
@@ -1319,6 +1338,9 @@
                   },
                   {
                      "id" : "fruits_vegetables_legumes",
+                     "new_grade" : "d",
+                     "new_score" : 12,
+                     "new_value" : 41,
                      "points" : 0,
                      "points_max" : 5,
                      "unit" : "%",
diff --git a/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json b/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
index e9c679078e28d..9d92a09cc6989 100644
--- a/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
+++ b/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
@@ -353,6 +353,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -375,6 +376,7 @@
       "en:ecoscore-production-system-no-label",
       "en:ecoscore-threatened-species-ingredients-missing"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -781,6 +783,8 @@
       "d"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients_lc" : "en",
    "ingredients_text" : "",
    "languages" : {},
diff --git a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
index 823575a1a0c9a..e283b9467437a 100644
--- a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
+++ b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
@@ -348,6 +348,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -371,6 +372,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -623,6 +625,8 @@
       "unknown"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "9510",
diff --git a/tests/unit/expected_test_results/attributes/en-no-ingredients.json b/tests/unit/expected_test_results/attributes/en-no-ingredients.json
index 9663c3f42cc58..e9a108f519d45 100644
--- a/tests/unit/expected_test_results/attributes/en-no-ingredients.json
+++ b/tests/unit/expected_test_results/attributes/en-no-ingredients.json
@@ -350,6 +350,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -372,6 +373,7 @@
       "en:ecoscore-production-system-no-label",
       "en:ecoscore-threatened-species-ingredients-missing"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -782,6 +784,8 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients_lc" : "en",
    "languages" : {},
    "languages_codes" : {},
diff --git a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
index 3e56e4db45dc5..7cf2a99deeade 100644
--- a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
+++ b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
@@ -362,6 +362,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -385,6 +386,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -791,6 +793,8 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "19051",
diff --git a/tests/unit/expected_test_results/attributes/en-nutriscore.json b/tests/unit/expected_test_results/attributes/en-nutriscore.json
index ae812be189a5f..6ce2212629152 100644
--- a/tests/unit/expected_test_results/attributes/en-nutriscore.json
+++ b/tests/unit/expected_test_results/attributes/en-nutriscore.json
@@ -356,6 +356,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -383,6 +384,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -785,6 +787,8 @@
       "c"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "id" : "en:fruit",
@@ -947,6 +951,9 @@
                "negative" : [
                   {
                      "id" : "energy",
+                     "new_grade" : "c",
+                     "new_score" : 8,
+                     "new_value" : 2345,
                      "points" : 7,
                      "points_max" : 10,
                      "unit" : "kJ",
@@ -954,6 +961,9 @@
                   },
                   {
                      "id" : "sugars",
+                     "new_grade" : "c",
+                     "new_score" : 8,
+                     "new_value" : 3.4,
                      "points" : 1,
                      "points_max" : 15,
                      "unit" : "g",
@@ -961,6 +971,9 @@
                   },
                   {
                      "id" : "saturated_fat",
+                     "new_grade" : "c",
+                     "new_score" : 8,
+                     "new_value" : 9,
                      "points" : 9,
                      "points_max" : 10,
                      "unit" : "g",
@@ -977,6 +990,9 @@
                "positive" : [
                   {
                      "id" : "fiber",
+                     "new_grade" : "c",
+                     "new_score" : 8,
+                     "new_value" : 6.4,
                      "points" : 3,
                      "points_max" : 5,
                      "unit" : "g",
diff --git a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
index 1590ab85e67c4..17ca59464a67c 100644
--- a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
+++ b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
@@ -351,6 +351,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -378,6 +379,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ingredients-unknown-score-above-0",
       "en:ingredients-100-percent-unknown",
@@ -786,6 +788,8 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "id" : "en:some-ingredient-that-we-do-not-recognize",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
index bdb5d9140701d..02d9d34e55582 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
@@ -344,6 +344,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -369,6 +370,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -621,6 +623,8 @@
       "unknown"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "from_palm_oil" : "yes",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
index ba94731c1d53e..585e3e503bbd3 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
@@ -344,6 +344,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -367,6 +368,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -616,6 +618,8 @@
       "unknown"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "18066",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil.json b/tests/unit/expected_test_results/attributes/fr-palm-oil.json
index 8734bd30ba492..69b432ca2a015 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-oil.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-oil.json
@@ -344,6 +344,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -367,6 +368,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -619,6 +621,8 @@
       "unknown"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "4003",
diff --git a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
index 549368663e7db..8c7b11f859837 100644
--- a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
+++ b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
@@ -344,6 +344,7 @@
       "en:code-missing",
       "en:created-missing"
    ],
+   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -367,6 +368,7 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
+   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -616,6 +618,8 @@
       "unknown"
    ],
    "food_groups_tags" : [],
+   "improvements_data" : {},
+   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "9545",
diff --git a/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json b/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
index 8b2d0ddf3f028..98b6fdff63e09 100644
--- a/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
+++ b/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
@@ -40,7 +40,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json b/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
index 260d1a504b608..aa5491ba8a57a 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json b/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
index 5aec9d39dd89a..39243773a2ccb 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
@@ -43,7 +43,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
index 260d1a504b608..aa5491ba8a57a 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
index 0186decef5e0b..f37a8b3d7dabc 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
@@ -22,7 +22,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
index 7d4ad8f1f81ec..c4489c189e8db 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-info.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-info.svg",
          "subtitle" : "Some infos about data quality on this product",
          "title" : "Data Quality infos"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
index c8a8dad8a9473..5c262d57dd261 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
          "subtitle" : "We have detected some potential issues or potential improvements, could you check if some apply ?",
          "title" : "Potential issues"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json b/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
index 7fff6911186fc..99434029d585b 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
@@ -22,7 +22,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
+         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
          "subtitle" : "We have detected some potential issues or potential improvements, could you check if some apply ?",
          "title" : "Potential issues"
       },

From 89acf81f0c4011e364134f6a5c53f730bc1f4df9 Mon Sep 17 00:00:00 2001
From: Subinoy Dutta <subinoy.aiemd@gmail.com>
Date: Tue, 2 Jul 2024 21:57:08 +0530
Subject: [PATCH 4/5] Test results after executing update test results

---
 .../attributes/en-attributes.json             | 22 -------------------
 .../en-ecoscore-score-at-20-threshold.json    |  4 ----
 .../attributes/en-maybe-vegan.json            |  4 ----
 .../attributes/en-no-ingredients.json         |  4 ----
 .../attributes/en-nova-groups-markers.json    |  4 ----
 .../attributes/en-nutriscore.json             | 16 --------------
 .../attributes/en-unknown-ingredients.json    |  4 ----
 .../attributes/fr-palm-kernel-fat.json        |  4 ----
 .../attributes/fr-palm-oil-free.json          |  4 ----
 .../attributes/fr-palm-oil.json               |  4 ----
 .../attributes/fr-vegetable-oils.json         |  4 ----
 .../default_product_panel.json                |  2 +-
 .../errors_but_no_actions.json                |  2 +-
 .../many_error_many_actions.json              |  2 +-
 .../one_error_no_action.json                  |  2 +-
 .../one_error_one_action.json                 |  2 +-
 .../data_quality_tags_panel/one_info.json     |  2 +-
 .../one_warning_one_action.json               |  2 +-
 .../warnings_inherited_description.json       |  2 +-
 19 files changed, 8 insertions(+), 82 deletions(-)

diff --git a/tests/unit/expected_test_results/attributes/en-attributes.json b/tests/unit/expected_test_results/attributes/en-attributes.json
index 42a8b74e66212..2195ca82d7559 100644
--- a/tests/unit/expected_test_results/attributes/en-attributes.json
+++ b/tests/unit/expected_test_results/attributes/en-attributes.json
@@ -378,7 +378,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:packaging-data-incomplete",
@@ -401,7 +400,6 @@
       "en:ecoscore-packaging-unspecified-material",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-packaging-unspecified-material",
       "en:ecoscore-production-system-no-label"
@@ -850,8 +848,6 @@
          }
       ]
    },
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "9410",
@@ -1286,9 +1282,6 @@
                "negative" : [
                   {
                      "id" : "energy",
-                     "new_grade" : "d",
-                     "new_score" : 12,
-                     "new_value" : 670,
                      "points" : 2,
                      "points_max" : 10,
                      "unit" : "kJ",
@@ -1296,9 +1289,6 @@
                   },
                   {
                      "id" : "sugars",
-                     "new_grade" : "d",
-                     "new_score" : 12,
-                     "new_value" : 24,
                      "points" : 7,
                      "points_max" : 15,
                      "unit" : "g",
@@ -1306,9 +1296,6 @@
                   },
                   {
                      "id" : "saturated_fat",
-                     "new_grade" : "d",
-                     "new_score" : 12,
-                     "new_value" : 3,
                      "points" : 3,
                      "points_max" : 10,
                      "unit" : "g",
@@ -1316,9 +1303,6 @@
                   },
                   {
                      "id" : "salt",
-                     "new_grade" : "d",
-                     "new_score" : 12,
-                     "new_value" : 0.2,
                      "points" : 1,
                      "points_max" : 20,
                      "unit" : "g",
@@ -1328,9 +1312,6 @@
                "positive" : [
                   {
                      "id" : "fiber",
-                     "new_grade" : "d",
-                     "new_score" : 11,
-                     "new_value" : 4.2,
                      "points" : 0,
                      "points_max" : 5,
                      "unit" : "g",
@@ -1338,9 +1319,6 @@
                   },
                   {
                      "id" : "fruits_vegetables_legumes",
-                     "new_grade" : "d",
-                     "new_score" : 12,
-                     "new_value" : 41,
                      "points" : 0,
                      "points_max" : 5,
                      "unit" : "%",
diff --git a/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json b/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
index 9d92a09cc6989..e9c679078e28d 100644
--- a/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
+++ b/tests/unit/expected_test_results/attributes/en-ecoscore-score-at-20-threshold.json
@@ -353,7 +353,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -376,7 +375,6 @@
       "en:ecoscore-production-system-no-label",
       "en:ecoscore-threatened-species-ingredients-missing"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -783,8 +781,6 @@
       "d"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients_lc" : "en",
    "ingredients_text" : "",
    "languages" : {},
diff --git a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
index e283b9467437a..823575a1a0c9a 100644
--- a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
+++ b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
@@ -348,7 +348,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -372,7 +371,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -625,8 +623,6 @@
       "unknown"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "9510",
diff --git a/tests/unit/expected_test_results/attributes/en-no-ingredients.json b/tests/unit/expected_test_results/attributes/en-no-ingredients.json
index e9a108f519d45..9663c3f42cc58 100644
--- a/tests/unit/expected_test_results/attributes/en-no-ingredients.json
+++ b/tests/unit/expected_test_results/attributes/en-no-ingredients.json
@@ -350,7 +350,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -373,7 +372,6 @@
       "en:ecoscore-production-system-no-label",
       "en:ecoscore-threatened-species-ingredients-missing"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -784,8 +782,6 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients_lc" : "en",
    "languages" : {},
    "languages_codes" : {},
diff --git a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
index 7cf2a99deeade..3e56e4db45dc5 100644
--- a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
+++ b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
@@ -362,7 +362,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -386,7 +385,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -793,8 +791,6 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_proxy_food_code" : "19051",
diff --git a/tests/unit/expected_test_results/attributes/en-nutriscore.json b/tests/unit/expected_test_results/attributes/en-nutriscore.json
index 6ce2212629152..ae812be189a5f 100644
--- a/tests/unit/expected_test_results/attributes/en-nutriscore.json
+++ b/tests/unit/expected_test_results/attributes/en-nutriscore.json
@@ -356,7 +356,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -384,7 +383,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -787,8 +785,6 @@
       "c"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "id" : "en:fruit",
@@ -951,9 +947,6 @@
                "negative" : [
                   {
                      "id" : "energy",
-                     "new_grade" : "c",
-                     "new_score" : 8,
-                     "new_value" : 2345,
                      "points" : 7,
                      "points_max" : 10,
                      "unit" : "kJ",
@@ -961,9 +954,6 @@
                   },
                   {
                      "id" : "sugars",
-                     "new_grade" : "c",
-                     "new_score" : 8,
-                     "new_value" : 3.4,
                      "points" : 1,
                      "points_max" : 15,
                      "unit" : "g",
@@ -971,9 +961,6 @@
                   },
                   {
                      "id" : "saturated_fat",
-                     "new_grade" : "c",
-                     "new_score" : 8,
-                     "new_value" : 9,
                      "points" : 9,
                      "points_max" : 10,
                      "unit" : "g",
@@ -990,9 +977,6 @@
                "positive" : [
                   {
                      "id" : "fiber",
-                     "new_grade" : "c",
-                     "new_score" : 8,
-                     "new_value" : 6.4,
                      "points" : 3,
                      "points_max" : 5,
                      "unit" : "g",
diff --git a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
index 17ca59464a67c..1590ab85e67c4 100644
--- a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
+++ b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json
@@ -351,7 +351,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -379,7 +378,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ingredients-unknown-score-above-0",
       "en:ingredients-100-percent-unknown",
@@ -788,8 +786,6 @@
       "en:milk-and-dairy-products",
       "en:cheese"
    ],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "id" : "en:some-ingredient-that-we-do-not-recognize",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
index 02d9d34e55582..bdb5d9140701d 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json
@@ -344,7 +344,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -370,7 +369,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -623,8 +621,6 @@
       "unknown"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "from_palm_oil" : "yes",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
index 585e3e503bbd3..ba94731c1d53e 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
@@ -344,7 +344,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -368,7 +367,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -618,8 +616,6 @@
       "unknown"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "18066",
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil.json b/tests/unit/expected_test_results/attributes/fr-palm-oil.json
index 69b432ca2a015..8734bd30ba492 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-oil.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-oil.json
@@ -344,7 +344,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -368,7 +367,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -621,8 +619,6 @@
       "unknown"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "4003",
diff --git a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
index 8c7b11f859837..549368663e7db 100644
--- a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
+++ b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
@@ -344,7 +344,6 @@
       "en:code-missing",
       "en:created-missing"
    ],
-   "data_quality_errors_producers_tags" : [],
    "data_quality_errors_tags" : [],
    "data_quality_info_tags" : [
       "en:no-packaging-data",
@@ -368,7 +367,6 @@
       "en:ecoscore-packaging-packaging-data-missing",
       "en:ecoscore-production-system-no-label"
    ],
-   "data_quality_warnings_producers_tags" : [],
    "data_quality_warnings_tags" : [
       "en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
       "en:ecoscore-packaging-packaging-data-missing",
@@ -618,8 +616,6 @@
       "unknown"
    ],
    "food_groups_tags" : [],
-   "improvements_data" : {},
-   "improvements_tags" : [],
    "ingredients" : [
       {
          "ciqual_food_code" : "9545",
diff --git a/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json b/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
index 98b6fdff63e09..8b2d0ddf3f028 100644
--- a/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
+++ b/tests/unit/expected_test_results/contribution_knowledge_panels/default_product_panel.json
@@ -40,7 +40,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json b/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
index aa5491ba8a57a..260d1a504b608 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/errors_but_no_actions.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json b/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
index 39243773a2ccb..5aec9d39dd89a 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/many_error_many_actions.json
@@ -43,7 +43,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
index aa5491ba8a57a..260d1a504b608 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_no_action.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
index f37a8b3d7dabc..0186decef5e0b 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_error_one_action.json
@@ -22,7 +22,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-error.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-error.svg",
          "subtitle" : "Help us improve quality of our data by contributing fixes",
          "title" : "Detected Errors"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
index c4489c189e8db..7d4ad8f1f81ec 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_info.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-info.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-info.svg",
          "subtitle" : "Some infos about data quality on this product",
          "title" : "Data Quality infos"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json b/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
index 5c262d57dd261..c8a8dad8a9473 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/one_warning_one_action.json
@@ -13,7 +13,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
          "subtitle" : "We have detected some potential issues or potential improvements, could you check if some apply ?",
          "title" : "Potential issues"
       },
diff --git a/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json b/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
index 99434029d585b..7fff6911186fc 100644
--- a/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
+++ b/tests/unit/expected_test_results/data_quality_tags_panel/warnings_inherited_description.json
@@ -22,7 +22,7 @@
       "level" : "info",
       "title_element" : {
          "icon_color_from_evaluation" : true,
-         "icon_url" : "http://static.pro.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
+         "icon_url" : "http://static.openfoodfacts.localhost/images/icons/dist/data-warning.svg",
          "subtitle" : "We have detected some potential issues or potential improvements, could you check if some apply ?",
          "title" : "Potential issues"
       },

From 52c2ae937aa00450b5013e42ca6d4d2194a5ca8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Fri, 5 Jul 2024 12:34:02 +0200
Subject: [PATCH 5/5] update tests

---
 .../get-auth-bad-user-password.html           | 231 ++++++++++++-----
 .../post-product-auth-bad-user-password.html  | 233 +++++++++++++-----
 .../revert-product-good.json                  |  43 ++--
 .../revert-product-rev-does-not-exist.json    |   6 +-
 .../crawler-access-product-page.html          |   2 +
 .../normal-user-access-product-page.html      |   2 +
 .../product_read/get-existing-product.html    |   2 +
 .../web_html/fr-product-2.html                |   2 +
 .../web_html/fr-product.html                  |   2 +
 .../web_html/world-product.html               |   2 +
 10 files changed, 367 insertions(+), 158 deletions(-)

diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
index 9c0ab27d18573..3f23e1f087116 100644
--- a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
+++ b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
@@ -1,7 +1,7 @@
 <!-- start templates/web/common/site_layout.tt.html -->
 
 <!doctype html>
-<html class="no-js" lang="en" data-serverdomain="pro.openfoodfacts.localhost" dir="ltr">
+<html class="no-js" lang="en" data-serverdomain="openfoodfacts.localhost" dir="ltr">
 <head>
     <meta charset="utf-8">
     <title>Error</title>
@@ -10,7 +10,7 @@
 	<meta property="fb:app_id" content="219331381518041">
     <meta property="og:type" content="food">
     <meta property="og:title" content="">
-    <meta property="og:url" content="//world.pro.openfoodfacts.localhost">
+    <meta property="og:url" content="//world.openfoodfacts.localhost">
     
     <meta property="og:image" content="//static.openfoodfacts.org/images/logos/off-logo-vertical-white-social-media-preview.png">
     <meta property="og:description" content="">
@@ -27,11 +27,11 @@
 <meta name="apple-itunes-app" content="app-id=588797948">
 <meta name="flattr:id" content="dw637l">
 
-    <link rel="canonical" href="//world.pro.openfoodfacts.localhost">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/select2.min.css">
-    <link rel="search" href="//world.pro.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
+    <link rel="canonical" href="//world.openfoodfacts.localhost">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/select2.min.css">
+    <link rel="search" href="//world.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
 	
     <style media="all">
         
@@ -81,38 +81,12 @@
 							</a>
 							<ul class="dropdown">				
 								
-									<li><label>Import and export products</label></li>
-									<li><a href="/cgi/import_file_upload.pl">Import product data</a></li>
-									<li><a href="/cgi/import_photos_upload.pl">Import product photos</a></li>
-									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Add a product</a></li>
-									<li><a href="/cgi/export_products.pl">Export product data and photos to the public database</a></li>
-									<li><a href="/cgi/remove_products.pl">Remove all your products from the platform for producers</a></li>
-
+									<li><a href="/discover">Discover</a></li>
+									<li><a href="/contribute">Contribute</a></li>
 									<li class="divider"></li>
-
-									<li><label>Resources</label></li>
-									<ul>
-<li>
-    <a href="
-        //blog.openfoodfacts.org/en/EN-Pro-Plateform-User-Guide.pdf
-        ">
-        Pro platform user guide
-    </a>
-</li>
-<li>
-
-    <a href="//www.youtube.com/playlist?list=PLjAH-USadsF3xgSVfUUBS4we3XBr-1r55" target="_blank">
-        Video Tutorials
-    </a>
-</li>
-<li>
-
-    <a href="
-            //support.openfoodfacts.org/help/en-gb/3-producers
-            ">
-        FAQ for producers
-    </a>
-</li></ul>
+									<li><label>Add products</label></li>
+									<li><a href="/open-food-facts-mobile-app?utm_source=off&utf_medium=web&utm_campaign=pro_platform_install_the_app_to_add_products_en">Install the app to add products</a></li>
+									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Add a product</a></li>
 								
 
 								<li class="divider"></li>
@@ -135,7 +109,7 @@
 									</select>
 								</li>
 								<li class="has-dropdown">
-									<a href="//world.pro.openfoodfacts.localhost/">English</a>
+									<a href="//world.openfoodfacts.localhost/">English</a>
 
 									<ul class="dropdown">
 										
@@ -172,9 +146,7 @@
 						<li class="name">
 							<div style="position:relative;max-width:292px;">
 								<a href="/">
-								<img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
-								
-								<span id="professionals" style="position:absolute;bottom:2px;right:8px;line-height:1rem;font-size:1.2rem;">professionals</span>
+								<img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
 								
 							</a>
 							</div>
@@ -183,6 +155,35 @@
 
 					
 					
+					<section class="top-bar-section">
+					
+						<ul class="left small-4" style="margin-right:2rem;">
+							<li class="search-li">
+							
+								<form action="/cgi/search.pl">
+								<div class="row"><div class="small-12">
+								<div class="row collapse postfix-round">
+									<div class="columns">
+									<input type="text" placeholder="Search for a product" name="search_terms" value="" style="background-color:white">
+									<input name="search_simple" value="1" type="hidden">
+									<input name="action" value="process" type="hidden">
+									</div>
+									<div class="columns">
+									<button type="submit" title="Search" class="button postfix" style="line-height:normal"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></button>
+									</div>
+								</div>
+								</div></div>
+								</form>
+							</li>
+						</ul>
+					<ul class="search_and_links">
+						<li><a href="/discover" class="top-bar-links">Discover</a></li>
+						<li><a href="/contribute" class="top-bar-links">Contribute</a></li>
+						<li class="show-for-xlarge-up"><a href="//world.pro.openfoodfacts.org/" class="top-bar-links">Producers</a></li>
+						<li class="flex-grid getapp"><a href="/open-food-facts-mobile-app?utm_source=off&utf_medium=web&utm_campaign=search_and_links_promo_en" class="buttonbar button" style="top:0;"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M16 1H8C6.34 1 5 2.34 5 4v16c0 1.66 1.34 3 3 3h8c1.66 0 3-1.34 3-3V4c0-1.66-1.34-3-3-3zm-2 20h-4v-1h4v1zm3.25-3H6.75V4h10.5v14z"/><path d="M0 0h24v24H0z" fill="none"/></svg> <span class="bt-text">Get the app</span></a></li>
+					</ul>
+					</section>
+					
 				</nav>
 			</div>
 		</div>
@@ -226,6 +227,82 @@
 				<div class="main block_light">
 					<div id="main_column">
 						
+							
+							
+								
+          						<!-- start templates/web/common/includes/donate_banner.tt.html -->
+
+
+
+<!-- Donation banner @ footer -->
+
+
+<!-- end templates/web/common/includes/donate_banner.tt.html -->
+
+								
+
+<section id="donation-banner-top" class="donation-banner">
+  <span class="donation-banner__logo"></span>
+  <span class="donation-banner__hand"></span>
+  <div class="donation-banner__content">
+    <p class="donation-banner__main-text">
+        <span role="heading">Help us make food transparency the norm!</span>
+    </p>
+    <div class="donation-banner__aside">
+      <div>
+        <p class="donation-banner__secondary-text">As a non-profit organization, we depend on your donations to continue informing consumers around the world about what they eat.</p>
+        <p class="donation-banner__tertiary-text">The food revolution starts with you!</p>
+      </div>
+      <a class="donation-banner__donate" href="//world.openfoodfacts.org/donate-to-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Donate</a>
+    </div>
+  </div>
+  <div class="donation-banner__image" role="img" aria-label="Photo of the project team"></div>
+  <div class="donation-banner__close">
+    <button id="hide-donate-banner" class="material-icons modest" onclick="DonationButton();" onkeypress="DonationButton();">close</button>
+  </div>
+</section>
+
+<script>
+  let d = new Date();
+  let bannerID = document.getElementById('donation-banner-top');
+  let getDomain = window.location.origin.split('.');
+
+  function setBannerCookie(bcname, bcval, bcexdays) {
+    d.setTime(d.getTime() + (bcexdays*60*60*24*1000));
+    let expires = 'expires=' + d.toUTCString();
+    // Apply cookie for every domain contains open...facts
+    let domain = 'domain=.' + getDomain.slice(1).join('.');
+    document.cookie = bcname + '=' + bcval + ';' + expires + ';' + domain + ';SameSite=None;Secure;path=/';
+  }
+  
+  function getBannerCookie(bcname) {
+    const name = bcname + '=';
+    const decodedCookies = decodeURIComponent(document.cookie);
+    const cookies = decodedCookies.split(';');
+    for (const cookie of cookies) {
+      let c = cookie;
+      while (c.charAt(0) == ' ') { c = c.substring(1); }
+      if (c.indexOf(name) == 0) { return c.substring(name.length, c.length); }
+    }
+    
+    return '';
+  }
+
+  function DonationButton() {
+    setBannerCookie('off-donation-banner-2023-a', 1, 180);
+    bannerID.style.display = 'none';
+  }
+
+  if (getBannerCookie('off-donation-banner-2023-a') !== '') {
+    bannerID.style.display = 'none';
+  } else { 
+    bannerID.style.display = 'flex';
+  }
+</script>
+
+
+							
+						
             			
 						
 							<div class="row">
@@ -264,6 +341,37 @@ <h1 class="if-empty-dnone">Error</h1>
 			</div>
 
 			
+      			<!-- start templates/web/common/includes/donate_banner.tt.html -->
+
+
+
+<!-- Donation banner @ footer -->
+
+
+<!-- end templates/web/common/includes/donate_banner.tt.html -->
+
+				
+
+<section class="donation-banner-footer">
+  <span class="donation-banner-footer__logo"></span>
+  <span class="donation-banner-footer__hand"></span>
+  <div class="donation-banner-footer__content">
+    <p class="donation-banner-footer__main-text">
+      <span>Help us make food transparency the norm!</span>
+    </p>
+    <div class="donation-banner-footer__aside">
+      <div>
+        <p class="donation-banner-footer__secondary-text">As a non-profit organization, we depend on your donations to continue informing consumers around the world about what they eat.</p>
+        <p class="donation-banner-footer__tertiary-text">The food revolution starts with you!</p>
+      </div>
+      <a class="donation-banner-footer__donate" href="//world.openfoodfacts.org/donate-to-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Donate</a>
+    </div>
+  </div>
+  <div class="donation-banner-footer__image" role="img" aria-label="Photo of the project team"></div>
+</section>
+
+
+			
       		
 			<div class="block_light block_cappucino" id="contribute_and_discover_links_block">
 				<div class="row">
@@ -306,7 +414,7 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 						<div class="row">
 
 							<div class="small-12 text-center v-space-short h-space-large">
-								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
+								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
 
 								<p>A collaborative, free and open database of food products from around the world.</p>
 								
@@ -330,35 +438,26 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 
 	</div>
 
-<script src="//static.pro.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/display.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/stikelem.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/display.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/stikelem.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
 
 <script>
 $(function() {
 
 
-  new ZammadChat({
-    background: 'rgb(0, 102, 255)',
-    fontSize: '12px',
-    show: true,
-    chatId: 1
-  });
-
 });
 </script>
 
 
-<script src="//support.openfoodfacts.org/assets/chat/chat.min.js"></script>
-
 
-<script src="//static.pro.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/select2.min.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/select2.min.js"></script>
 
 <script>
 $(document).foundation({
@@ -378,10 +477,10 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 	"@context" : "//schema.org",
 	"@type" : "WebSite",
 	"name" : "Open Food Facts",
-	"url" : "//world.pro.openfoodfacts.localhost",
+	"url" : "//world.openfoodfacts.localhost",
 	"potentialAction": {
 		"@type": "SearchAction",
-		"target": "//world.pro.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
+		"target": "//world.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
 		"query-input": "required name=search_term_string"
 	}
 }
@@ -390,8 +489,8 @@ <h3 class="title-5 text-medium">Discover the project</h3>
 {
 	"@context": "//schema.org/",
 	"@type": "Organization",
-	"url": "//world.pro.openfoodfacts.localhost",
-	"logo": "//static.pro.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
+	"url": "//world.openfoodfacts.localhost",
+	"logo": "//static.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
 	"name": "Open Food Facts",
 	"sameAs" : ["//www.facebook.com/OpenFoodFacts", "//twitter.com/OpenFoodFacts"]
 }
diff --git a/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
index b7b707fddd48c..a4fbfd113456a 100644
--- a/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
+++ b/tests/integration/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
@@ -1,7 +1,7 @@
 <!-- start templates/web/common/site_layout.tt.html -->
 
 <!doctype html>
-<html class="no-js" lang="fr" data-serverdomain="pro.openfoodfacts.localhost" dir="ltr">
+<html class="no-js" lang="fr" data-serverdomain="openfoodfacts.localhost" dir="ltr">
 <head>
     <meta charset="utf-8">
     <title>Erreur</title>
@@ -10,7 +10,7 @@
 	<meta property="fb:app_id" content="219331381518041">
     <meta property="og:type" content="food">
     <meta property="og:title" content="">
-    <meta property="og:url" content="//world.pro.openfoodfacts.localhost">
+    <meta property="og:url" content="//world.openfoodfacts.localhost">
     
     <meta property="og:image" content="//static.openfoodfacts.org/images/logos/off-logo-vertical-white-social-media-preview.png">
     <meta property="og:description" content="">
@@ -27,11 +27,11 @@
 <meta name="apple-itunes-app" content="app-id=588797948">
 <meta name="flattr:id" content="dw637l">
 
-    <link rel="canonical" href="//world.pro.openfoodfacts.localhost">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
-    <link rel="stylesheet" href="//static.pro.openfoodfacts.localhost/css/dist/select2.min.css">
-    <link rel="search" href="//world.pro.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
+    <link rel="canonical" href="//world.openfoodfacts.localhost">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/app-ltr.css?v=--ignore--" data-base-layout="true">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/jqueryui/themes/base/jquery-ui.css" data-base-layout="true">
+    <link rel="stylesheet" href="//static.openfoodfacts.localhost/css/dist/select2.min.css">
+    <link rel="search" href="//world.openfoodfacts.localhost/cgi/opensearch.pl" type="application/opensearchdescription+xml" title="Open Food Facts">
 	
     <style media="all">
         
@@ -81,38 +81,12 @@
 							</a>
 							<ul class="dropdown">				
 								
-									<li><label>Importer et exporter des produits</label></li>
-									<li><a href="/cgi/import_file_upload.pl">Importer des données de produits</a></li>
-									<li><a href="/cgi/import_photos_upload.pl">Importer des photos de produits</a></li>
-									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Ajouter un produit</a></li>
-									<li><a href="/cgi/export_products.pl">Exporter les données et les photos des produits vers la base de données publique</a></li>
-									<li><a href="/cgi/remove_products.pl">Retirez tous vos produits de la plateforme pour les producteurs</a></li>
-
+									<li><a href="/decouvrir">Découvrir</a></li>
+									<li><a href="/contribuer">Contribuer</a></li>
 									<li class="divider"></li>
-
-									<li><label>Ressources</label></li>
-									<ul>
-<li>
-    <a href="
-        //blog.openfoodfacts.org/fr/Guide-dutilisation-Plateforme-Pro.pdf
-        ">
-        Guide d'utilisation de la plateforme pro
-    </a>
-</li>
-<li>
-
-    <a href="//www.youtube.com/playlist?list=PLjAH-USadsF3xgSVfUUBS4we3XBr-1r55" target="_blank">
-        Tutoriels vidéo
-    </a>
-</li>
-<li>
-
-    <a href="
-            //support.openfoodfacts.org/help/fr-fr/3-producers
-            ">
-        FAQ pour les Producteurs
-    </a>
-</li></ul>
+									<li><label>Ajouter des produits</label></li>
+									<li><a href="/application-mobile-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=pro_platform_install_the_app_to_add_products_fr">Installez l'application pour ajouter des produits</a></li>
+									<li><a href="/cgi/product.pl?type=search_or_add&action=display">Ajouter un produit</a></li>
 								
 
 								<li class="divider"></li>
@@ -135,10 +109,10 @@
 									</select>
 								</li>
 								<li class="has-dropdown">
-									<a href="//be-fr.pro.openfoodfacts.localhost/">Français</a>
+									<a href="//be-fr.openfoodfacts.localhost/">Français</a>
 
 									<ul class="dropdown">
-										<li><a href="//be.pro.openfoodfacts.localhost/">Nederlands</a></li><li><a href="//be-de.pro.openfoodfacts.localhost/">Deutsch</a></li><li><a href="//be-en.pro.openfoodfacts.localhost/">English</a></li>
+										<li><a href="//be.openfoodfacts.localhost/">Nederlands</a></li><li><a href="//be-de.openfoodfacts.localhost/">Deutsch</a></li><li><a href="//be-en.openfoodfacts.localhost/">English</a></li>
 									</ul>
 								</li>
 							</ul>
@@ -172,9 +146,7 @@
 						<li class="name">
 							<div style="position:relative;max-width:292px;">
 								<a href="/">
-								<img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
-								
-								<span id="professionals" style="position:absolute;bottom:2px;right:8px;line-height:1rem;font-size:1.2rem;">professionals</span>
+								<img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-light.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;">
 								
 							</a>
 							</div>
@@ -183,6 +155,35 @@
 
 					
 					
+					<section class="top-bar-section">
+					
+						<ul class="left small-4" style="margin-right:2rem;">
+							<li class="search-li">
+							
+								<form action="/cgi/search.pl">
+								<div class="row"><div class="small-12">
+								<div class="row collapse postfix-round">
+									<div class="columns">
+									<input type="text" placeholder="Chercher un produit" name="search_terms" value="" style="background-color:white">
+									<input name="search_simple" value="1" type="hidden">
+									<input name="action" value="process" type="hidden">
+									</div>
+									<div class="columns">
+									<button type="submit" title="Rechercher" class="button postfix" style="line-height:normal"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></button>
+									</div>
+								</div>
+								</div></div>
+								</form>
+							</li>
+						</ul>
+					<ul class="search_and_links">
+						<li><a href="/decouvrir" class="top-bar-links">Découvrir</a></li>
+						<li><a href="/contribuer" class="top-bar-links">Contribuer</a></li>
+						<li class="show-for-xlarge-up"><a href="//fr.pro.openfoodfacts.org/" class="top-bar-links">Producteurs</a></li>
+						<li class="flex-grid getapp"><a href="/application-mobile-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=search_and_links_promo_fr" class="buttonbar button" style="top:0;"><svg xmlns="//www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon" aria-hidden="true" focusable="false"><path d="M16 1H8C6.34 1 5 2.34 5 4v16c0 1.66 1.34 3 3 3h8c1.66 0 3-1.34 3-3V4c0-1.66-1.34-3-3-3zm-2 20h-4v-1h4v1zm3.25-3H6.75V4h10.5v14z"/><path d="M0 0h24v24H0z" fill="none"/></svg> <span class="bt-text">Installer l'app</span></a></li>
+					</ul>
+					</section>
+					
 				</nav>
 			</div>
 		</div>
@@ -226,6 +227,82 @@
 				<div class="main block_light">
 					<div id="main_column">
 						
+							
+							
+								
+          						<!-- start templates/web/common/includes/donate_banner.tt.html -->
+
+
+
+<!-- Donation banner @ footer -->
+
+
+<!-- end templates/web/common/includes/donate_banner.tt.html -->
+
+								
+
+<section id="donation-banner-top" class="donation-banner">
+  <span class="donation-banner__logo"></span>
+  <span class="donation-banner__hand"></span>
+  <div class="donation-banner__content">
+    <p class="donation-banner__main-text">
+        <span role="heading">Aidez-nous à faire de la transparence alimentaire la norme !</span>
+    </p>
+    <div class="donation-banner__aside">
+      <div>
+        <p class="donation-banner__secondary-text">En tant qu'organisation à but non lucratif, nous dépendons de vos dons pour continuer à informer les consommateurs du monde entier sur ce qu'ils mangent.</p>
+        <p class="donation-banner__tertiary-text">La révolution alimentaire commence avec vous !</p>
+      </div>
+      <a class="donation-banner__donate" href="//fr.openfoodfacts.org/faire-un-don-a-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Faire un don</a>
+    </div>
+  </div>
+  <div class="donation-banner__image" role="img" aria-label="Photo of the project team"></div>
+  <div class="donation-banner__close">
+    <button id="hide-donate-banner" class="material-icons modest" onclick="DonationButton();" onkeypress="DonationButton();">close</button>
+  </div>
+</section>
+
+<script>
+  let d = new Date();
+  let bannerID = document.getElementById('donation-banner-top');
+  let getDomain = window.location.origin.split('.');
+
+  function setBannerCookie(bcname, bcval, bcexdays) {
+    d.setTime(d.getTime() + (bcexdays*60*60*24*1000));
+    let expires = 'expires=' + d.toUTCString();
+    // Apply cookie for every domain contains open...facts
+    let domain = 'domain=.' + getDomain.slice(1).join('.');
+    document.cookie = bcname + '=' + bcval + ';' + expires + ';' + domain + ';SameSite=None;Secure;path=/';
+  }
+  
+  function getBannerCookie(bcname) {
+    const name = bcname + '=';
+    const decodedCookies = decodeURIComponent(document.cookie);
+    const cookies = decodedCookies.split(';');
+    for (const cookie of cookies) {
+      let c = cookie;
+      while (c.charAt(0) == ' ') { c = c.substring(1); }
+      if (c.indexOf(name) == 0) { return c.substring(name.length, c.length); }
+    }
+    
+    return '';
+  }
+
+  function DonationButton() {
+    setBannerCookie('off-donation-banner-2023-a', 1, 180);
+    bannerID.style.display = 'none';
+  }
+
+  if (getBannerCookie('off-donation-banner-2023-a') !== '') {
+    bannerID.style.display = 'none';
+  } else { 
+    bannerID.style.display = 'flex';
+  }
+</script>
+
+
+							
+						
             			
 						
 							<div class="row">
@@ -264,6 +341,37 @@ <h1 class="if-empty-dnone">Erreur</h1>
 			</div>
 
 			
+      			<!-- start templates/web/common/includes/donate_banner.tt.html -->
+
+
+
+<!-- Donation banner @ footer -->
+
+
+<!-- end templates/web/common/includes/donate_banner.tt.html -->
+
+				
+
+<section class="donation-banner-footer">
+  <span class="donation-banner-footer__logo"></span>
+  <span class="donation-banner-footer__hand"></span>
+  <div class="donation-banner-footer__content">
+    <p class="donation-banner-footer__main-text">
+      <span>Aidez-nous à faire de la transparence alimentaire la norme !</span>
+    </p>
+    <div class="donation-banner-footer__aside">
+      <div>
+        <p class="donation-banner-footer__secondary-text">En tant qu'organisation à but non lucratif, nous dépendons de vos dons pour continuer à informer les consommateurs du monde entier sur ce qu'ils mangent.</p>
+        <p class="donation-banner-footer__tertiary-text">La révolution alimentaire commence avec vous !</p>
+      </div>
+      <a class="donation-banner-footer__donate" href="//fr.openfoodfacts.org/faire-un-don-a-open-food-facts?utm_source=off&utf_medium=web&utm_campaign=donate-2023-a&utm_term=en-text-button">Faire un don</a>
+    </div>
+  </div>
+  <div class="donation-banner-footer__image" role="img" aria-label="Photo of the project team"></div>
+</section>
+
+
+			
       		
 			<div class="block_light block_cappucino" id="contribute_and_discover_links_block">
 				<div class="row">
@@ -306,7 +414,7 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 						<div class="row">
 
 							<div class="small-12 text-center v-space-short h-space-large">
-								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.pro.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
+								<a href="/" style="font-size:1rem;"><img id="logo" src="//static.openfoodfacts.localhost/images/logos/off-logo-horizontal-mono-white.svg" alt="Open Food Facts" style="margin:8px;height:48px;width:auto;"></a>
 
 								<p>Une base de données collaborative, libre et ouverte des produits alimentaires du monde entier.</p>
 								
@@ -330,35 +438,26 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 
 	</div>
 
-<script src="//static.pro.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/display.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/stikelem.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/modernizr.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery-ui.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/hc-sticky.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/display.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/stikelem.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/scrollNav.js"></script>
 
 <script>
 $(function() {
 
 
-  new ZammadChat({
-    background: 'rgb(0, 102, 255)',
-    fontSize: '12px',
-    show: true,
-    chatId: 1
-  });
-
 });
 </script>
 
 
-<script src="//support.openfoodfacts.org/assets/chat/chat.min.js"></script>
-
 
-<script src="//static.pro.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
-<script src="//static.pro.openfoodfacts.localhost/js/dist/select2.min.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/foundation.js" data-base-layout="true"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/jquery.cookie.js"></script>
+<script src="//static.openfoodfacts.localhost/js/dist/select2.min.js"></script>
 
 <script>
 $(document).foundation({
@@ -378,10 +477,10 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 	"@context" : "//schema.org",
 	"@type" : "WebSite",
 	"name" : "Open Food Facts",
-	"url" : "//world.pro.openfoodfacts.localhost",
+	"url" : "//world.openfoodfacts.localhost",
 	"potentialAction": {
 		"@type": "SearchAction",
-		"target": "//world.pro.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
+		"target": "//world.openfoodfacts.localhost/cgi/search.pl?search_terms=?{search_term_string}",
 		"query-input": "required name=search_term_string"
 	}
 }
@@ -390,8 +489,8 @@ <h3 class="title-5 text-medium">Découvrez le projet</h3>
 {
 	"@context": "//schema.org/",
 	"@type": "Organization",
-	"url": "//world.pro.openfoodfacts.localhost",
-	"logo": "//static.pro.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
+	"url": "//world.openfoodfacts.localhost",
+	"logo": "//static.openfoodfacts.localhost/images/logos/off-logo-vertical-light.svg",
 	"name": "Open Food Facts",
 	"sameAs" : ["//www.facebook.com/OpenFoodFacts.fr", "//twitter.com/OpenFoodFactsFr"]
 }
diff --git a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
index 4f6f86d346c3c..f8dcc840e244e 100644
--- a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
+++ b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-good.json
@@ -1,28 +1,27 @@
 {
    "code" : "1234567890100",
-   "errors" : [
-      {
-         "field" : {
-            "id" : "code",
-            "value" : "1234567890100"
-         },
-         "impact" : {
-            "id" : "failure",
-            "lc_name" : "Failure",
-            "name" : "Failure"
-         },
-         "message" : {
-            "id" : "product_not_found",
-            "lc_name" : "",
-            "name" : ""
-         }
-      }
-   ],
+   "errors" : [],
+   "product" : {
+      "brands_tags" : [
+         "test-brand"
+      ],
+      "categories_tags" : [
+         "en:beverages-and-beverages-preparations",
+         "en:plant-based-foods-and-beverages",
+         "en:beverages",
+         "en:hot-beverages",
+         "en:plant-based-beverages",
+         "en:teas"
+      ],
+      "code" : "1234567890100",
+      "product_name_en" : "Test product",
+      "rev" : 3
+   },
    "result" : {
-      "id" : "product_not_reverted",
-      "lc_name" : "Product not reverted to the specified revision",
-      "name" : "Product not reverted to the specified revision"
+      "id" : "product_reverted",
+      "lc_name" : "Product reverted to the specified revision",
+      "name" : "Product reverted to the specified revision"
    },
-   "status" : "failure",
+   "status" : "success",
    "warnings" : []
 }
diff --git a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
index 4f6f86d346c3c..d64715add5e48 100644
--- a/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
+++ b/tests/integration/expected_test_results/api_v3_product_revert/revert-product-rev-does-not-exist.json
@@ -3,8 +3,8 @@
    "errors" : [
       {
          "field" : {
-            "id" : "code",
-            "value" : "1234567890100"
+            "id" : "rev",
+            "value" : 5
          },
          "impact" : {
             "id" : "failure",
@@ -12,7 +12,7 @@
             "name" : "Failure"
          },
          "message" : {
-            "id" : "product_not_found",
+            "id" : "revision_not_found",
             "lc_name" : "",
             "name" : ""
          }
diff --git a/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html b/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
index 2efc478370402..6c015c835515e 100644
--- a/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
+++ b/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
@@ -384,7 +384,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Only-Product - Nutella
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Health</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environment</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Report a problem</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
diff --git a/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html b/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html
index 2efc478370402..6c015c835515e 100644
--- a/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html
+++ b/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html
@@ -384,7 +384,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Only-Product - Nutella
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Health</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environment</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Report a problem</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
diff --git a/tests/integration/expected_test_results/product_read/get-existing-product.html b/tests/integration/expected_test_results/product_read/get-existing-product.html
index 9a4c1da0d4fe4..817e1756bf25d 100644
--- a/tests/integration/expected_test_results/product_read/get-existing-product.html
+++ b/tests/integration/expected_test_results/product_read/get-existing-product.html
@@ -382,7 +382,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Some product - 100 g</
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Health</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environment</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Report a problem</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
diff --git a/tests/integration/expected_test_results/web_html/fr-product-2.html b/tests/integration/expected_test_results/web_html/fr-product-2.html
index 5d0e3e149188e..70ff988274dd8 100644
--- a/tests/integration/expected_test_results/web_html/fr-product-2.html
+++ b/tests/integration/expected_test_results/web_html/fr-product-2.html
@@ -384,7 +384,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Tarte aux pommes et aux
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Santé</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environnement</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Signaler un problème</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
diff --git a/tests/integration/expected_test_results/web_html/fr-product.html b/tests/integration/expected_test_results/web_html/fr-product.html
index 960a0b1ddcb6b..4ca545907bc31 100644
--- a/tests/integration/expected_test_results/web_html/fr-product.html
+++ b/tests/integration/expected_test_results/web_html/fr-product.html
@@ -384,7 +384,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Apple pie - Bob's pies
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Santé</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environnement</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Signaler un problème</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
diff --git a/tests/integration/expected_test_results/web_html/world-product.html b/tests/integration/expected_test_results/web_html/world-product.html
index 23528ef63e3e2..30c0c6225b1f4 100644
--- a/tests/integration/expected_test_results/web_html/world-product.html
+++ b/tests/integration/expected_test_results/web_html/world-product.html
@@ -384,7 +384,9 @@ <h1 class="title-3" property="food:name" itemprop="name">Apple pie - Bob's pies
                             <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#health"><span>Health</span></a></li>
                         
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#environment"><span>Environment</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#report_problem"><span>Report a problem</span></a></li>
+                        
                         <li class="product-section-button"><a class="nav-link scrollto button small round white-button" href="#contribution"><span>Contribution</span></a></li>
                     </ul>
                 </nav><!-- .navbar -->
