Skip to content

Commit

Permalink
fix: LW review view not showing wearables to review correctly (#3223)
Browse files Browse the repository at this point in the history
* fix: LW review view not showing wearables to review correctly

* fix: PR review

* fix: Update typescript version

* fix: Add new line
  • Loading branch information
LautaroPetaccio authored Nov 27, 2024
1 parent ab893d3 commit a6c2b88
Show file tree
Hide file tree
Showing 15 changed files with 242 additions and 185 deletions.
118 changes: 66 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"prettier": "^2.7.1",
"rollup-plugin-polyfill-node": "^0.13.0",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"typescript": "^5.7.2",
"vite": "^5.4.0",
"vite-bundle-visualizer": "^1.0.0",
"vite-plugin-node-polyfills": "^0.19.0"
Expand Down
20 changes: 17 additions & 3 deletions src/components/ItemEditorPage/ItemEditorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ export default class ItemEditorPage extends React.PureComponent<Props, State> {
state: State = {
reviewedItems: []
}

handleOnSetReviewedItems = (items: Item[]) => {
this.setState(prevState => ({
reviewedItems: [
...prevState.reviewedItems,
...items.filter(item => !prevState.reviewedItems.some(prevStateItem => prevStateItem.id === item.id))
]
}))
}

handleResetReviewedItems = () => {
this.setState({ reviewedItems: [] })
}

render() {
const { reviewedItems } = this.state
return (
Expand All @@ -19,9 +33,9 @@ export default class ItemEditorPage extends React.PureComponent<Props, State> {
<TopPanel reviewedItems={reviewedItems} />
<div className="content">
<LeftPanel
onSetReviewedItems={(items: Item[]) =>
this.setState(prevState => ({ reviewedItems: [...prevState.reviewedItems, ...items] }))
}
reviewedItems={reviewedItems}
onResetReviewedItems={this.handleResetReviewedItems}
onSetReviewedItems={this.handleOnSetReviewedItems}
/>
<CenterPanel />
<RightPanel />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react'
import { t } from 'decentraland-dapps/dist/modules/translation'
import { Loader, Pagination, PaginationProps, Section } from 'decentraland-ui'
import { LEFT_PANEL_PAGE_SIZE } from 'components/ItemEditorPage/constants'
import SidebarCollection from './SidebarCollection'
Expand All @@ -22,9 +23,12 @@ export default class Collections extends React.PureComponent<Props, State> {
if (collections.length === 0) return null

const totalPages = Math.ceil(totalCollections / LEFT_PANEL_PAGE_SIZE)

return isLoading ? (
<Loader size="small" active />
) : !isLoading && items.length === 0 && collections.length === 0 ? (
<div className="empty">
<div className="subtitle">{t('collections_page.empty_description')}</div>
</div>
) : (
<>
<Section className="Collections">
Expand Down
15 changes: 15 additions & 0 deletions src/components/ItemEditorPage/LeftPanel/Items/Items.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,18 @@
.Items > .Collapsable .label > .Icon {
margin-right: 8px;
}

.Items > .empty {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
padding: 32px;
}

.Items > .empty .subtitle {
color: var(--secondary-text);
}
Loading

0 comments on commit a6c2b88

Please sign in to comment.