fix: Update review TP items (#3228)

* fix: Update review TP items * refactor: Items validation * fix: Items review trigger * fix: get random page
decentraland · Dec 5, 2024 · 71aa6c3 · 71aa6c3
1 parent 5c3bc90
commit 71aa6c3
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 15 deletions.
diff --git a/src/components/ItemEditorPage/LeftPanel/Items/Items.tsx b/src/components/ItemEditorPage/LeftPanel/Items/Items.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import equal from 'fast-deep-equal'
 import { T, t } from 'decentraland-dapps/dist/modules/translation/utils'
 import { getAnalytics } from 'decentraland-dapps/dist/modules/analytics/utils'
 import {
@@ -42,6 +43,23 @@ export default class Items extends React.PureComponent<Props, State> {
 
   analytics = getAnalytics()
 
+  componentDidMount() {
+    this.handleReviewItemsTrigger()
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    this.handleReviewItemsTrigger(prevProps)
+  }
+
+  handleReviewItemsTrigger = (prevProps?: Props) => {
+    const { items, onReviewItems } = this.props
+    const { currentTab } = this.state
+
+    if (this.getIsReviewingTPItems() && currentTab === ItemPanelTabs.TO_REVIEW && !equal(items, prevProps?.items)) {
+      onReviewItems()
+    }
+  }
+
   isVisible = (item: Item) => {
     const { visibleItems } = this.props
     return visibleItems.some(_item => _item.id === item.id)
@@ -81,30 +99,32 @@ export default class Items extends React.PureComponent<Props, State> {
   }
 
   handleTabChange = (targetTab: ItemPanelTabs) => {
-    const { onLoadPage, onResetReviewedItems } = this.props
-    const { currentPages, currentTab } = this.state
+    const { onLoadPage, onReviewItems, onResetReviewedItems } = this.props
+    const { currentPages } = this.state
 
     if (targetTab === ItemPanelTabs.ALL_ITEMS) {
-      this.setState({ showAllItemsTabChangeModal: false }, () => onLoadPage(currentPages[ItemPanelTabs.ALL_ITEMS]))
-    } else if (targetTab === ItemPanelTabs.TO_REVIEW && currentTab === ItemPanelTabs.ALL_ITEMS) {
-      onResetReviewedItems()
-      onLoadPage(1)
+      this.setState({ showAllItemsTabChangeModal: false }, () => {
+        onResetReviewedItems()
+        onLoadPage(currentPages[ItemPanelTabs.ALL_ITEMS])
+      })
+    } else if (targetTab === ItemPanelTabs.TO_REVIEW) {
+      onReviewItems()
     }
     this.setState({ currentTab: targetTab })
   }
 
   handleGetRandomSampleClick = () => {
-    const { showSamplesModalAgain, onReviewItems } = this.props
+    const { showSamplesModalAgain, onLoadRandomPage } = this.props
     if (!showSamplesModalAgain) {
-      onReviewItems()
+      onLoadRandomPage()
     } else {
       this.setState({ showGetMoreSamplesModal: true })
     }
   }
 
   handleModalProceed = () => {
-    const { onReviewItems } = this.props
-    onReviewItems()
+    const { onLoadRandomPage } = this.props
+    onLoadRandomPage()
     this.setState({ showGetMoreSamplesModal: false })
   }
 

diff --git a/src/components/ItemEditorPage/LeftPanel/Items/Items.types.ts b/src/components/ItemEditorPage/LeftPanel/Items/Items.types.ts
@@ -37,5 +37,5 @@ export type Props = {
   onSetItems: typeof setItems
   onReviewItems: () => void
   onLoadPage: (page: number) => void
-  onSetReviewedItems: (itemIds: Item[]) => void
+  onLoadRandomPage: () => void
 }
diff --git a/src/components/ItemEditorPage/LeftPanel/LeftPanel.tsx b/src/components/ItemEditorPage/LeftPanel/LeftPanel.tsx
@@ -155,15 +155,15 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
     const totalPages = Math.ceil(totalResources! / LEFT_PANEL_PAGE_SIZE)
     if (pages.length !== totalPages) {
       let randomPage: number | undefined
-      while (randomPage !== undefined) {
+      while (randomPage === undefined) {
         randomPage = this.getRandomPage(1, totalPages)
         if (pages.includes(randomPage)) {
           randomPage = undefined
         }
       }
       onSetReviewedItems(currentItems)
       if (randomPage !== undefined) {
-        this.setState(prevState => ({ pages: [...prevState.pages, randomPage] }), this.fetchResource)
+        this.setState(prevState => ({ pages: [...prevState.pages, randomPage as number] }), this.fetchResource)
       }
     } else {
       onSetReviewedItems(currentItems)
@@ -273,9 +273,9 @@ export default class LeftPanel extends React.PureComponent<Props, State> {
                         isLoading={isLoadingCollectionItems || isLoadingOrphanItems}
                         onToggleShowSamplesModalAgain={this.handleToggleShowSamplesModalAgain}
                         showSamplesModalAgain={showSamplesModalAgain}
-                        onReviewItems={() => this.loadRandomPage(items)}
+                        onReviewItems={() => onSetReviewedItems(items)}
+                        onLoadRandomPage={() => this.loadRandomPage(items)}
                         onLoadPage={this.loadPage}
-                        onSetReviewedItems={onSetReviewedItems}
                       />
                       <ItemAddedToast collectionId={selectedCollectionId} />
                     </>