update getpicturelist function for filtering

superdesk · Feb 27, 2024 · 8def5be · 8def5be
1 parent 0e26d21
commit 8def5be
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/assets/wire/components/ItemDetails.tsx b/assets/wire/components/ItemDetails.tsx
@@ -14,7 +14,6 @@ import {
     DISPLAY_ABSTRACT,
     isPreformatted,
     getPictureList,
-    getBodyPictureList
 } from 'wire/utils';
 import types from 'wire/types';
 import Content from 'ui/components/Content';
@@ -51,8 +50,8 @@ function ItemDetails({
     const featureMedia = getFeatureMedia(item);
     const media = getOtherMedia(item);
     const itemType = isPreformatted(item) ? 'preformatted' : 'text';
-    const allMedia = getPictureList(item);
-    const bodyImages = getBodyPictureList(item);
+    const allMedia = getPictureList(item, {includeFeatured:false, includeEditor: false});
+
     return (
         <Content type="item-detail">
             <ContentHeader>
@@ -77,7 +76,6 @@ function ItemDetails({
                     )}
                     {allMedia && (
                         allMedia
-                            .filter((mediaItem) => mediaItem.guid !== featureMedia?.guid && bodyImages.includes(mediaItem))
                             .map((data) => (
                                 <MediaPreview
                                     key={data?.guid}

diff --git a/assets/wire/components/WirePreview.tsx b/assets/wire/components/WirePreview.tsx
@@ -10,7 +10,6 @@ import {
     isKilled,
     DISPLAY_ABSTRACT,
     getPictureList,
-    getBodyPictureList
 } from 'wire/utils';
 import types from 'wire/types';
 
@@ -51,9 +50,9 @@ class WirePreview extends React.PureComponent<any, any> {
         const {item, user, actions, followStory, topics, previewConfig, downloadMedia, listConfig, filterGroupLabels} = this.props;
         const featureMedia = getFeatureMedia(item);
         const media = getOtherMedia(item);
-        const allMedia = getPictureList(item);
+        const allMedia = getPictureList(item, {includeFeatured:false, includeEditor: false});
         const previousVersions = 'preview_versions';
-        const bodyImages = getBodyPictureList(item);
+
         return (
             <Preview onCloseClick={this.props.closePreview} published={item.versioncreated}>
                 <div className='wire-column__preview__top-bar'>
@@ -88,7 +87,6 @@ class WirePreview extends React.PureComponent<any, any> {
                     )}
                     {allMedia && (
                         allMedia
-                            .filter((mediaItem) => mediaItem.guid !== featureMedia?.guid && bodyImages.includes(mediaItem))
                             .map((data) => (
                                 <MediaPreview
                                     key={data.guid}

diff --git a/assets/wire/utils.ts b/assets/wire/utils.ts
@@ -108,10 +108,25 @@ function getBodyPicture(item: IArticle): IArticle | null {
     return pictures.length ? pictures[0] : null;
 }
 
-export function getPictureList(item: IArticle): Array<IArticle> {
+export function getPictureList(item: IArticle, options: {includeFeatured?: boolean, includeEditor?: boolean} = {}): IArticle[] {
     const pictures = Object.values(item.associations ?? {})
         .filter((association) => association?.type === 'picture') as IArticle[];
-    return pictures.length ? pictures : [];
+
+    const {includeFeatured = true, includeEditor = true} = options;
+
+    let filteredPictures = pictures;
+
+    if (!includeFeatured) {
+        const featureMedia = getFeatureMedia(item);
+        filteredPictures = featureMedia ? filteredPictures.filter((mediaItem) => mediaItem.guid !== featureMedia.guid) : filteredPictures;
+    }
+
+    if (!includeEditor) {
+        const bodyMedia = getBodyPictureList(item);
+        filteredPictures = filteredPictures.filter((mediaItem) => bodyMedia.includes(mediaItem));
+    }
+
+    return filteredPictures;
 }
 
 export function getBodyPictureList(item: IArticle): Array<IArticle> {