Merge branch 'padms/2631' into staging

equinor · Nov 5, 2024 · a686530 · a686530
2 parents 0861454 + 9347ff1
commit a686530
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/search/IndexArchivedNews/mapper.test.ts b/search/IndexArchivedNews/mapper.test.ts
@@ -37,9 +37,7 @@ describe('fileStorage', () => {
         expect(res.topicTags).toEqual(['tag1', 'tag2', 'General news'])
         expect(res.countryTags).toEqual(['Norway'])
         expect(res.text).toEqual('A lot of \n content')
-        expect(res.thumbnailUrl).toEqual(
-          'https://envisstoragedev.blob.core.windows.net/equinor-archive-content/link/to/url/of/image.png',
-        )
+        expect(res.thumbnailUrl).toEqual('/link/to/url/of/image.png')
       })
     })
 

diff --git a/search/IndexArchivedNews/mapper.ts b/search/IndexArchivedNews/mapper.ts
@@ -33,6 +33,6 @@ export const mapData: MapDataType = (article) => {
     ],
     countryTags: [country.trim()].filter(identity),
     year,
-    thumbnailUrl: thumbnailURL ? `https://envisstoragedev.blob.core.windows.net/equinor-archive-content${thumbnailURL}` : null,
+    thumbnailUrl: thumbnailURL ? thumbnailURL : null,
   } as NewsIndex
 }
diff --git a/web/templates/newsroom/NewsSections/NewsHeadliner.tsx b/web/templates/newsroom/NewsSections/NewsHeadliner.tsx
@@ -26,16 +26,14 @@ const NewsHeadliner = forwardRef<HTMLLIElement, NewsHeadlinerProps>(function New
         {(heroImage?.image?.asset || fallbackImage || thumbnailUrl) && (
           <div className="aspect-video relative max-h-[324px] mb-2">
             {thumbnailUrl ? (
-              <div className="relative rounded-xs">
-                <Img
-                  src={thumbnailUrl}
-                  alt=""
-                  style={{ objectFit: 'cover' }}
-                  fill
-                  sizes="(max-width: 800px) 100vw, 800px"
-                  role={'presentation'}
-                />
-              </div>
+              <img
+                className="relative rounded-xs"
+                src={thumbnailUrl}
+                alt=""
+                style={{ objectFit: 'cover' }}
+                sizes="(max-width: 800px) 100vw, 800px"
+                role={'presentation'}
+              />
             ) : (
               (heroImage?.image?.asset || fallbackImage) && (
                 <Image

diff --git a/web/templates/newsroom/NewsSections/NewsItem.tsx b/web/templates/newsroom/NewsSections/NewsItem.tsx
@@ -37,16 +37,14 @@ const NewsItem = forwardRef<HTMLLIElement, NewsListItemProps>(function NewsItem(
           {(heroImage?.image?.asset || fallbackImage || thumbnailUrl) && (
             <>
               {thumbnailUrl ? (
-                <div className="relative rounded-xs">
-                  <Img
-                    src={thumbnailUrl}
-                    alt=""
-                    style={{ objectFit: 'cover' }}
-                    fill
-                    sizes="(max-width: 800px) 100vw, 800px"
-                    role={'presentation'}
-                  />
-                </div>
+                <img
+                  className="relative rounded-xs"
+                  src={thumbnailUrl}
+                  alt=""
+                  style={{ objectFit: 'cover' }}
+                  sizes="(max-width: 800px) 100vw, 800px"
+                  role={'presentation'}
+                />
               ) : (
                 (heroImage?.image?.asset || fallbackImage) && (
                   <Image