@@ -3,16 +3,17 @@ import { Loader, Tabs } from 'decentraland-ui'
3
3
import { t } from 'decentraland-dapps/dist/modules/translation/utils'
4
4
import { Collection } from 'modules/collection/types'
5
5
import { CurationStatus } from 'modules/curations/types'
6
+ import { ItemCuration } from 'modules/curations/itemCuration/types'
6
7
import { isThirdPartyCollection } from 'modules/collection/utils'
7
8
import { Item , ItemType } from 'modules/item/types'
8
9
import CollectionProvider from 'components/CollectionProvider'
10
+ import { ItemAddedToast } from './Toasts/ItemAdded'
9
11
import Header from './Header'
10
12
import Items from './Items'
11
13
import Collections from './Collections'
12
14
import { LEFT_PANEL_PAGE_SIZE } from '../constants'
13
15
import { Props , State , ItemEditorTabs } from './LeftPanel.types'
14
16
import './LeftPanel.css'
15
- import { ItemAddedToast } from './Toasts/ItemAdded'
16
17
17
18
const INITIAL_PAGE = 1
18
19
@@ -122,10 +123,14 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
122
123
onSetItems ( [ ] )
123
124
}
124
125
125
- getItems ( collection : Collection | null , collectionItems : Item [ ] ) {
126
+ getItems ( collection : Collection | null , collectionItems : Item [ ] , itemCurations : ItemCuration [ ] | null ) {
126
127
const { selectedCollectionId, orphanItems, isReviewing } = this . props
127
128
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
129
134
}
130
135
return orphanItems
131
136
}
@@ -198,8 +203,15 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
198
203
fetchCollectionItemsOptions = { { status : isReviewing ? CurationStatus . PENDING : undefined } }
199
204
onChangePage = { page => this . setState ( { pages : [ page ] } ) }
200
205
>
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 )
203
215
const isCollectionTab = this . isCollectionTabActive ( )
204
216
const showLoader = isLoading && ( ( isCollectionTab && collections . length === 0 ) || ( ! isCollectionTab && items . length === 0 ) )
205
217
const initialPage = selectedCollectionId && collection ? collectionInitialPage : this . state . initialPage
0 commit comments