Client - Seo: first the resource title, then site name (#259)

GeoNode · Jun 24, 2021 · 05a99d1 · 05a99d1
1 parent dff11d2
commit 05a99d1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/geonode_mapstore_client/client/js/components/MetaTags/Meta.jsx b/geonode_mapstore_client/client/js/components/MetaTags/Meta.jsx
@@ -1,19 +1,19 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
 
-export const MetaTags = ({siteName, content, logo, contentURL =  window.location.href}) => {
+export const MetaTags = ({siteName, title, content, logo, contentURL =  window.location.href}) => {
     return (<Helmet>
-        <title>{siteName}</title>
+        <title>{title}</title>
         <meta name="description" content={content} />
-        <meta property="og:title" content={siteName + " " +  content} />
+        <meta property="og:title" content={title} />
         <meta property="og:site_name" content={siteName} />
         <meta property="og:url" content={contentURL} />
         <meta property="og:description" content={content} />
         <meta property="og:image" content={logo} />
 
         <meta name="twitter:site" content={siteName} />
         <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:title" content={siteName} />
+        <meta name="twitter:title" content={title} />
         <meta name="twitter:description" content={content} />
         <meta name="twitter:image:src" content={logo}/>
     </Helmet>);

diff --git a/geonode_mapstore_client/client/js/components/MetaTags/__tests__/Meta-test.jsx b/geonode_mapstore_client/client/js/components/MetaTags/__tests__/Meta-test.jsx
@@ -18,6 +18,7 @@ describe('MetaTags', () => {
     it('should render by default', () => {
         render(<Meta
             logo={'http://example.com'}
+            title={"Test Title"}
             siteName={"Test Site"}
             content={"Test Content"}
         />, document.getElementById("container"));
@@ -29,6 +30,10 @@ describe('MetaTags', () => {
                 expect(tag.content).toEqual("Test Site");
             }
 
+            if (tag.property === "title") {
+                expect(tag.content).toEqual("Test Title");
+            }
+
             if (tag.name === "decription" || tag.name === "twitter:description") {
                 expect(tag.content).toEqual("Test Content");
             }

diff --git a/geonode_mapstore_client/client/js/routes/DocumentViewer.jsx b/geonode_mapstore_client/client/js/routes/DocumentViewer.jsx
@@ -60,10 +60,11 @@ function DocumentViewerRoute({
     return (
         <>
             {resource &&   <MetaTags
-                logo={resource.thumbnail_url}
-                siteName={siteName + " " + resource.title}
-                contentURL={resource.detail_url}
-                content={resource.abstract}
+                logo={resource?.thumbnail_url}
+                title={(resource?.title) ? resource?.title + " - " + siteName : siteName }
+                siteName={siteName}
+                contentURL={resource?.detail_url}
+                content={resource?.abstract}
             />}
             <ConnectedPluginsContainer
                 key="page-document-viewer"

diff --git a/geonode_mapstore_client/client/js/routes/GeoStoryViewer.jsx b/geonode_mapstore_client/client/js/routes/GeoStoryViewer.jsx
@@ -69,7 +69,8 @@ function GeoStoryViewerRoute({
         <>
             {resource &&  <MetaTags
                 logo={resource.thumbnail_url}
-                siteName={siteName + " " + resource.title}
+                title={(resource?.title) ? resource?.title + " - " + siteName : siteName }
+                siteName={siteName}
                 contentURL={resource.detail_url}
                 content={resource.abstract}
             />}

diff --git a/geonode_mapstore_client/client/js/routes/Home.jsx b/geonode_mapstore_client/client/js/routes/Home.jsx
@@ -381,7 +381,8 @@ function Home({
         <div className={`gn-home`}>
             <MetaTags
                 logo={resource ? resource.thumbnail_url : window.location.origin + config?.navbar?.logo[0]?.src}
-                siteName={siteName + " " + (resource ? resource.title : "")}
+                title={(resource?.title) ? resource?.title + " - " + siteName : siteName }
+                siteName={siteName}
                 contentURL={resource?.detail_url}
                 content={resource?.abstract}
             />

diff --git a/geonode_mapstore_client/client/js/routes/LayerViewer.jsx b/geonode_mapstore_client/client/js/routes/LayerViewer.jsx
@@ -61,10 +61,11 @@ function LayerViewerRoute({
     return (
         <>
             {resource &&  <MetaTags
-                logo={resource.thumbnail_url}
-                siteName={siteName + " " + resource.title}
-                contentURL={resource.detail_url}
-                content={resource.abstract}
+                logo={resource?.thumbnail_url}
+                title={(resource?.title) ? resource?.title + " - " + siteName : siteName }
+                siteName={siteName}
+                contentURL={resource?.detail_url}
+                content={resource?.abstract}
             />}
             <ConnectedPluginsContainer
                 key="page-layer-viewer"

diff --git a/geonode_mapstore_client/client/js/routes/MapViewer.jsx b/geonode_mapstore_client/client/js/routes/MapViewer.jsx
@@ -64,9 +64,10 @@ function MapViewerRoute({
         <>
             {resource &&  <MetaTags
                 logo={resource.thumbnail_url}
-                siteName={siteName + " " + resource.title}
-                contentURL={resource.detail_url}
-                content={resource.abstract}
+                title={(resource?.title) ? resource?.title + " - " + siteName : siteName }
+                siteName={siteName}
+                contentURL={resource?.detail_url}
+                content={resource?.abstract}
             />}
             <ConnectedPluginsContainer
                 key="page-map-viewer"