Skip to content

Commit 220d9fc

Browse files
fix: Only show TP items that require curation (#3175)
1 parent 9c3aa7b commit 220d9fc

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/components/ItemEditorPage/LeftPanel/LeftPanel.tsx

+17-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ import { Loader, Tabs } from 'decentraland-ui'
33
import { t } from 'decentraland-dapps/dist/modules/translation/utils'
44
import { Collection } from 'modules/collection/types'
55
import { CurationStatus } from 'modules/curations/types'
6+
import { ItemCuration } from 'modules/curations/itemCuration/types'
67
import { isThirdPartyCollection } from 'modules/collection/utils'
78
import { Item, ItemType } from 'modules/item/types'
89
import CollectionProvider from 'components/CollectionProvider'
10+
import { ItemAddedToast } from './Toasts/ItemAdded'
911
import Header from './Header'
1012
import Items from './Items'
1113
import Collections from './Collections'
1214
import { LEFT_PANEL_PAGE_SIZE } from '../constants'
1315
import { Props, State, ItemEditorTabs } from './LeftPanel.types'
1416
import './LeftPanel.css'
15-
import { ItemAddedToast } from './Toasts/ItemAdded'
1617

1718
const INITIAL_PAGE = 1
1819

@@ -122,10 +123,14 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
122123
onSetItems([])
123124
}
124125

125-
getItems(collection: Collection | null, collectionItems: Item[]) {
126+
getItems(collection: Collection | null, collectionItems: Item[], itemCurations: ItemCuration[] | null) {
126127
const { selectedCollectionId, orphanItems, isReviewing } = this.props
127128
if (selectedCollectionId && collection) {
128-
return isThirdPartyCollection(collection) && isReviewing ? collectionItems.filter(item => item.isPublished) : collectionItems
129+
return isThirdPartyCollection(collection) && isReviewing
130+
? collectionItems.filter(
131+
item => !!itemCurations?.find(curation => curation.itemId === item.id && curation.status === CurationStatus.PENDING)
132+
)
133+
: collectionItems
129134
}
130135
return orphanItems
131136
}
@@ -198,8 +203,15 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
198203
fetchCollectionItemsOptions={{ status: isReviewing ? CurationStatus.PENDING : undefined }}
199204
onChangePage={page => this.setState({ pages: [page] })}
200205
>
201-
{({ paginatedCollections, collection, paginatedItems: collectionItems, initialPage: collectionInitialPage, isLoading }) => {
202-
const items = this.getItems(collection, collectionItems)
206+
{({
207+
paginatedCollections,
208+
collection,
209+
paginatedItems: collectionItems,
210+
initialPage: collectionInitialPage,
211+
isLoading,
212+
itemCurations
213+
}) => {
214+
const items = this.getItems(collection, collectionItems, itemCurations)
203215
const isCollectionTab = this.isCollectionTabActive()
204216
const showLoader = isLoading && ((isCollectionTab && collections.length === 0) || (!isCollectionTab && items.length === 0))
205217
const initialPage = selectedCollectionId && collection ? collectionInitialPage : this.state.initialPage

0 commit comments

Comments
 (0)