Merge pull request #1011 from ibrahim-mamdouh-ft/sync-with-main

Sync with main
Financial-Times · Oct 11, 2023 · f2c08f3 · f2c08f3
2 parents 45cedcf + 4bde27e
commit f2c08f3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/examples/express-with-jsx/views/Layout.jsx b/examples/express-with-jsx/views/Layout.jsx
@@ -7,7 +7,7 @@ export default ({ siteName, pageTitle, children }) => (
     <head>
       <meta charSet="utf-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1" />
-      <title>{pageTitle ? `${pageTitle} | ${siteName}` : siteName}</title>
+      <title>{pageTitle ? `${pageTitle}` : siteName}</title>
       <link rel="stylesheet" href="public/styles.css" />
     </head>
     <body>

diff --git a/packages/dotcom-server-handlebars/src/helpers/slice.ts b/packages/dotcom-server-handlebars/src/helpers/slice.ts
@@ -10,6 +10,10 @@ export default function slice(...args) {
   const offset = parseInt(options.hash.offset, 10) || 0
   const limit = parseInt(options.hash.limit, 10) || 1
 
+  if (!args[0]) {
+    return ''
+  }
+
   const slicedItems = Array.from(args[0]).slice(offset, offset + limit)
 
   let contents = ''

diff --git a/packages/dotcom-ui-footer/src/components/partials.tsx b/packages/dotcom-ui-footer/src/components/partials.tsx
@@ -65,7 +65,8 @@ const FooterContents = ({ footerData }: TFooterContentsProps) => (
         return (
           <div
             key={`group-${index}`}
-            className={`o-footer__matrix-group o-footer__matrix-group--${submenu.length}`}>
+            className={`o-footer__matrix-group o-footer__matrix-group--${submenu.length}`}
+          >
             <SectionTitle label={item.label} index={index} />
             <SectionLinks submenu={submenu} index={index} />
           </div>
@@ -76,7 +77,8 @@ const FooterContents = ({ footerData }: TFooterContentsProps) => (
           <a
             className="o-footer__matrix-link o-footer__matrix-link--more"
             id={`o-footer-${footerData.length}`}
-            href="https://ft.com/more-from-ft-group">
+            href="https://ft.com/more-from-ft-group"
+          >
             <span className="o-footer__matrix-link__copy">More from the FT Group</span>
           </a>
         </h3>
@@ -97,7 +99,7 @@ const CopyrightNotice = ({ withoutMarketsData = false }) => {
         and ‘Financial Times’ are trademarks of The Financial Times Ltd.
         <br />
         The Financial Times and its journalism are subject to a self-regulation regime under the{' '}
-        <a href="http://aboutus.ft.com/en-gb/ft-editorial-code/" aria-label="F T Editorial Code of Practice">
+        <a href="https://aboutus.ft.com/en-gb/ft-editorial-code/" aria-label="F T Editorial Code of Practice">
           FT Editorial Code of Practice
         </a>
         .

diff --git a/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/DocumentHead.test.tsx.snap b/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/DocumentHead.test.tsx.snap
@@ -14,7 +14,7 @@ Array [
     name="viewport"
   />,
   <title>
-    Page title | Website title
+    Page title
   </title>,
   <meta
     content="Website description."

diff --git a/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/Shell.test.tsx.snap b/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/Shell.test.tsx.snap
@@ -26,12 +26,8 @@ exports[`dotcom-ui-shell/src/components/Shell renders the GTM script when the en
       name="viewport"
     />
     <title>
-      Foo | Financial Times
+      Foo
     </title>
-    <meta
-      content="News, analysis and comment from the Financial Times, the worldʼs leading global business publication"
-      name="description"
-    />
     <meta
       content="index,follow,max-snippet:200,max-image-preview:large"
       name="robots"

diff --git a/packages/dotcom-ui-shell/src/components/DocumentHead.tsx b/packages/dotcom-ui-shell/src/components/DocumentHead.tsx
@@ -25,7 +25,7 @@ const DocumentHead = (props: TDocumentHeadProps) => (
     <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <title>{props.pageTitle ? `${props.pageTitle} | ${props.siteTitle}` : props.siteTitle}</title>
+    <title>{props.pageTitle ? `${props.pageTitle}` : props.siteTitle}</title>
 
     {props.description && <meta name="description" content={props.description} />}
 
@@ -45,7 +45,7 @@ const DocumentHead = (props: TDocumentHeadProps) => (
     <OpenGraph openGraph={props.openGraph} />
 
     {/* native apps */}
-    {props.showSmartBanner && 
+    {props.showSmartBanner &&
       (
         <meta
           name="apple-itunes-app"
@@ -86,8 +86,6 @@ const DocumentHead = (props: TDocumentHeadProps) => (
 )
 
 DocumentHead.defaultProps = {
-  description:
-    'News, analysis and comment from the Financial Times, the worldʼs leading global business publication',
   facebookPage: '8860325749',
   googleSiteVerification: '4-t8sFaPvpO5FH_Gnw1dkM28CQepjzo8UjjAkdDflTw',
   metaTags: [],