fix(ui): keep anchor in url on refresh (#7013)

* fix(ui): keep anchor in url on refresh * fix(front): fix fullscreen with anchor
centreon · Dec 6, 2018 · 3f4c5b3 · 3f4c5b3
1 parent 8d08320
commit 3f4c5b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/www/front_src/src/App.js b/www/front_src/src/App.js
@@ -34,18 +34,19 @@ class App extends Component {
   }
 
   goFull = () => {
-    window['fullscreenParams'] = window.location.search.split('?')[1] || '';
-    setTimeout(()=>{
+    const { search, hash } = history.location
+    window['fullscreenParams'] = (search.split('?')[1] || '') + (hash || '')
+    setTimeout(() => {
       this.setState({ isFullscreenEnabled: true });
-    },200)  
+    }, 200)
   }
 
   removeFullscreenParams = () => {
-    if(history.location.pathname == '/centreon/main.php'){
+    if (history.location.pathname == '/centreon/main.php') {
       history.push({
-          pathname: '/centreon/main.php',
-          search: window['fullscreenParams']
-        })
+        pathname: '/centreon/main.php',
+        search: window['fullscreenParams']
+      })
     }
     delete window['fullscreenParams'];
   }

diff --git a/www/front_src/src/route-components/module/index.js b/www/front_src/src/route-components/module/index.js
@@ -70,14 +70,14 @@ class ModuleRoute extends Component {
   render() {
     const { contentHeight, loading } = this.state;
     const { history } = this.props,
-          { search } = history.location;
-          let params;
-          if(window['fullscreenParams']){
-            params = '?';
-            params += window['fullscreenParams'] || ''; 
-          }else{
-            params = search || '';
-          }
+          { search, hash } = history.location;
+    let params;
+    if (window['fullscreenParams']) {
+      params = '?';
+      params += window['fullscreenParams'] || ''; 
+    } else {
+      params = (search || '') + (hash || '');
+    }
     return (
       <>
         {loading &&