From 53c79f96e82215f6e9941b2e1f4420511b4509cb Mon Sep 17 00:00:00 2001
From: Anthony Rimet <anthony.rimet03@gmail.com>
Date: Mon, 13 Nov 2023 15:21:36 +0100
Subject: [PATCH] Feat(breadcrumb): Set relative link for breadcrumbs

---
 src/api/controller/front.js                    | 2 +-
 src/app/js/public/breadcrumb/BreadcrumbItem.js | 5 +++--
 src/app/webpack.config.babel.js                | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api/controller/front.js b/src/api/controller/front.js
index 5c0a41f11..eb9f0729a 100644
--- a/src/api/controller/front.js
+++ b/src/api/controller/front.js
@@ -201,7 +201,7 @@ const handleRender = async (ctx, next) => {
     const { url, headers } = ctx.request;
     if (
         (url.match(/[^\\]*\.(\w+)$/) &&
-            !url.match(/[^\\]*\.html$/) &&
+            !url.match(/^(?!.*\/instance\/).*\.html$/) &&
             !url.match(/\/uid:\//)) ||
         url.match('/admin') ||
         url.match('__webpack_hmr')
diff --git a/src/app/js/public/breadcrumb/BreadcrumbItem.js b/src/app/js/public/breadcrumb/BreadcrumbItem.js
index 53b97499b..d6e0d82cd 100644
--- a/src/app/js/public/breadcrumb/BreadcrumbItem.js
+++ b/src/app/js/public/breadcrumb/BreadcrumbItem.js
@@ -5,6 +5,7 @@ import translate from 'redux-polyglot/translate';
 import { polyglot as polyglotPropTypes } from '../../propTypes';
 import stylesToClassname from '../../lib/stylesToClassName';
 import customTheme from '../../../custom/customTheme';
+import Link from '../../lib/components/Link';
 
 const styles = stylesToClassname(
     {
@@ -35,9 +36,9 @@ const BreadcrumbItem = ({ value, p: polyglot }) => {
     const label = value.label[polyglot.currentLocale];
 
     return (
-        <a href={value.url} className={styles.link}>
+        <Link to={value.url} className={styles.link}>
             {label}
-        </a>
+        </Link>
     );
 };
 
diff --git a/src/app/webpack.config.babel.js b/src/app/webpack.config.babel.js
index 6e0d86fc5..f767c9d12 100644
--- a/src/app/webpack.config.babel.js
+++ b/src/app/webpack.config.babel.js
@@ -24,6 +24,11 @@ module.exports = {
             module: /d3/,
         },
     ],
+    devServer: {
+        client: {
+            overlay: false,
+        },
+    },
     entry: {
         index: resolve(__dirname, './js/public/index.js'),
         'admin/index': resolve(__dirname, './js/admin/index.js'),