Merge pull request #868 from VirtualFlyBrain/alpha-sync-8302

sync: alpha with alpha-sync-8302
VirtualFlyBrain · Jan 1, 2021 · bdb2804 · bdb2804
2 parents af94877 + 0849f06
commit bdb2804
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM metacell/java-virgo-maven:development
 
-MAINTAINER Robert Court "rcourt@ed.ac.uk"
+LABEL maintainer="rcourt@ed.ac.uk"
 
 ARG targetBranch=development
 ARG originBranch=development

diff --git a/components/VFBMain.js b/components/VFBMain.js
@@ -1273,6 +1273,11 @@ class VFBMain extends React.Component {
           link.setAttribute('rel', 'amphtml');
           link.setAttribute('href', 'https://virtualflybrain.org/data/VFB/json/' + this.idFromURL + '.html');
           document.head.appendChild(link);
+          var conlink = !!document.querySelector("link[rel='canonical']");
+          conlink = conlink ? document.querySelector("link[rel='canonical']") : document.createElement('link');
+          conlink.setAttribute('rel', 'canonical');
+          conlink.setAttribute('href', 'https://virtualflybrain.org/reports/' + this.idFromURL);
+          document.head.appendChild(conlink);
         } catch (err) {
           console.error(err);
         }