Merge branch 'bose/3459' into staging

Author: BorghildSelle

web/common/helpers/redirects.ts

@@ -99,4 +99,8 @@ const dnsRedirects = [
     from: 'morgendagenshelter.no',
     to: '/no/om-oss/sponsing-og-stotte',
   },
+  {
+    from: "data.equinor.com",
+    to:"/energy/data-sharing"
+  }
 ]

web/core/Promotion/Promotion.tsx

@@ -41,7 +41,7 @@ export const Promotion = forwardRef<HTMLAnchorElement, PromotionProps>(function
     layoutDirection === 'col' ? 'line-clamp-2' : 'line-clamp-3'
   }`
 
-  return (
+  return href ? (
     <BaseLink
       ref={ref}
       type={variant === 'externalLink' ? 'externalUrl' : 'internalUrl'}
@@ -100,5 +100,5 @@ export const Promotion = forwardRef<HTMLAnchorElement, PromotionProps>(function
         </div>
       </div>
     </BaseLink>
-  )
+  ) : null
 })

web/middleware.ts

@@ -10,6 +10,7 @@ const PERMANENT_REDIRECT = 301
 const PUBLIC_FILE = /\.(.*)$/
 const DOT_HTML = '.html'
 const IS_ARCHIVED_NEWS_DOWNLOADS = /(.*)\/news\/archive\/[0-9]{4}\/[0-9]{2}\/[0-9]{2}\/downloads\/(.*)\.(.*)$/
+const wwwExcludedDomains = ['localhost:3000',process.env.RADIX_PUBLIC_DOMAIN_NAME,process.env.RADIX_CANONICAL_DOMAIN_NAME,'data.equinor.com']
 
 export async function middleware(request: NextRequest) {
   const { origin, locale } = request.nextUrl
@@ -41,9 +42,7 @@ export async function middleware(request: NextRequest) {
 
   // Skip WWW redirect for Radix URLs and localhost
   if (
-    host !== process.env.RADIX_PUBLIC_DOMAIN_NAME &&
-    host !== process.env.RADIX_CANONICAL_DOMAIN_NAME &&
-    host !== 'localhost:3000'
+    !wwwExcludedDomains.includes(host)
   ) {
     const wwwRedirect = getWWWRedirect(host, pathname)
     if (wwwRedirect) {