status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): fix wrong model update when items are fetched

This commit is contained in:
Dario Gabriel Lipicar 2023-08-03 13:05:04 -03:00 committed by dlipicar
parent 9be2a8d799
commit 8410e36f24
4 changed files with 204 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/modules/main/wallet_section/collectibles/controller.nim
View File

@ -15,6 +15,7 @@ QtObject:
type
Controller* = ref object of QObject
model: Model
fetchFromStart: bool
eventsHandler: EventsHandler
@ -51,43 +52,48 @@ QtObject:
except Exception as e:
error "Error converting activity entries: ", e.msg
proc updateFilter*(self: Controller) {.slot.} =
self.model.resetModel(@[])
let response = backend_collectibles.filterOwnedCollectiblesAsync(self.chainIds, self.addresses, 0, FETCH_BATCH_COUNT_DEFAULT)
if response.error != nil:
self.model.setIsFetching(false)
self.model.setIsError(true)
error "error fetching collectibles entries: ", response.error
return
self.model.setIsFetching(true)
self.model.setIsError(false)
proc resetModel*(self: Controller) {.slot.} =
self.model.setItems(@[], 0, true)
self.fetchFromStart = true
proc loadMoreItems(self: Controller) {.slot.} =
if self.model.getIsFetching():
return
let response = backend_collectibles.filterOwnedCollectiblesAsync(self.chainIds, self.addresses, self.model.getCount(), FETCH_BATCH_COUNT_DEFAULT)
if response.error != nil:
self.model.setIsError(true)
error "error fetching collectibles entries: ", response.error
return
self.model.setIsFetching(true)
self.model.setIsError(false)
var offset = 0
if not self.fetchFromStart:
offset = self.model.getCollectiblesCount()
self.fetchFromStart = false
let response = backend_collectibles.filterOwnedCollectiblesAsync(self.chainIds, self.addresses, offset, FETCH_BATCH_COUNT_DEFAULT)
if response.error != nil:
self.model.setIsFetching(false)
self.model.setIsError(true)
self.fetchFromStart = true
error "error fetching collectibles entries: ", response.error
proc setupEventHandlers(self: Controller) =
self.eventsHandler.onOwnedCollectiblesFilteringDone(proc (jsonObj: JsonNode) =
self.processFilterOwnedCollectiblesResponse(jsonObj)
)
self.eventsHandler.onCollectiblesOwnershipUpdateStarted(proc () =
self.model.setIsUpdating(true)
)
self.eventsHandler.onCollectiblesOwnershipUpdateFinished(proc () =
self.updateFilter()
self.resetModel()
self.model.setIsUpdating(false)
)
proc newController*(events: EventEmitter): Controller =
new(result, delete)
result.model = newModel()
result.fetchFromStart = true
result.eventsHandler = newEventsHandler(events)
@ -105,4 +111,4 @@ QtObject:
return
self.chainIds = chainIds
self.addresses = addresses
self.updateFilter()
self.resetModel()

9
src/app/modules/main/wallet_section/collectibles/events_handler.nim
View File

@ -16,6 +16,7 @@ QtObject:
events: EventEmitter
eventHandlers: Table[string, EventCallbackProc]
walletEventHandlers: Table[string, WalletEventCallbackProc]
collectiblesOwnershipUpdateStartedFn: proc()
collectiblesOwnershipUpdateFinishedFn: proc()
proc setup(self: EventsHandler) =
@ -27,6 +28,9 @@ QtObject:
proc onOwnedCollectiblesFilteringDone*(self: EventsHandler, handler: EventCallbackProc) =
self.eventHandlers[backend_collectibles.eventOwnedCollectiblesFilteringDone] = handler
proc onCollectiblesOwnershipUpdateStarted*(self: EventsHandler, handler: proc()) =
self.collectiblesOwnershipUpdateStartedFn = handler
proc onCollectiblesOwnershipUpdateFinished*(self: EventsHandler, handler: proc()) =
self.collectiblesOwnershipUpdateFinishedFn = handler
@ -49,6 +53,11 @@ QtObject:
discard
proc setupWalletEventHandlers(self: EventsHandler) =
self.walletEventHandlers[backend_collectibles.eventCollectiblesOwnershipUpdateStarted] = proc (data: WalletSignal) =
if self.collectiblesOwnershipUpdateStartedFn == nil:
return
self.collectiblesOwnershipUpdateStartedFn()
self.walletEventHandlers[backend_collectibles.eventCollectiblesOwnershipUpdateFinished] = proc (data: WalletSignal) =
if self.collectiblesOwnershipUpdateFinishedFn == nil:
return

206
src/app/modules/shared_models/collectibles_model.nim
View File

@ -18,7 +18,7 @@ type
IsLoading
IsPinned
const loadingItemsCount = 50
const loadingItemsCount = 10
QtObject:
type
@ -26,11 +26,13 @@ QtObject:
items: seq[Item]
hasMore: bool
isFetching: bool
isUpdating: bool
isError: bool
loadingItemsStartIdx: int
hasLoadingItems: bool
proc appendLoadingItems(self: Model)
proc removeLoadingItems(self: Model)
proc checkLoadingItems(self: Model)
proc delete(self: Model) =
self.items = @[]
@ -44,17 +46,25 @@ QtObject:
result.setup
result.items = @[]
result.hasMore = true
result.isUpdating = false
result.isFetching = false
result.isError = false
result.loadingItemsStartIdx = -1
result.hasLoadingItems = true
proc `$`*(self: Model): string =
for i in 0 ..< self.items.len:
result &= fmt"""[{i}]:({$self.items[i]})"""
proc getCollectiblesCount*(self: Model): int =
return self.items.len
proc countChanged(self: Model) {.signal.}
proc getCount*(self: Model): int {.slot.} =
self.items.len
var count = self.items.len
if self.hasLoadingItems:
count += loadingItemsCount
return count
QtProperty[int] count:
read = getCount
notify = countChanged
@ -68,12 +78,22 @@ QtObject:
proc setIsFetching*(self: Model, value: bool) =
if value == self.isFetching:
return
if value:
self.appendLoadingItems()
else:
self.removeLoadingItems()
self.isFetching = value
self.isFetchingChanged()
self.checkLoadingItems()
proc isUpdatingChanged(self: Model) {.signal.}
proc getIsUpdating*(self: Model): bool {.slot.} =
self.isUpdating
QtProperty[bool] isUpdating:
read = getIsUpdating
notify = isUpdatingChanged
proc setIsUpdating*(self: Model, isUpdating: bool) =
if isUpdating == self.isUpdating:
return
self.isUpdating = isUpdating
self.isUpdatingChanged()
self.checkLoadingItems()
proc isErrorChanged(self: Model) {.signal.}
proc getIsError*(self: Model): bool {.slot.} =
@ -93,22 +113,26 @@ QtObject:
QtProperty[bool] hasMore:
read = getHasMore
notify = hasMoreChanged
proc setHasMore(self: Model, hasMore: bool) {.slot.} =
proc setHasMore(self: Model, hasMore: bool) =
if hasMore == self.hasMore:
return
self.hasMore = hasMore
self.hasMoreChanged()
self.checkLoadingItems()
method canFetchMore*(self: Model, parent: QModelIndex): bool =
return self.hasMore
proc loadMoreItems(self: Model) {.signal.}
method fetchMore*(self: Model, parent: QModelIndex) =
proc loadMore*(self: Model) {.slot.} =
self.loadMoreItems()
method fetchMore*(self: Model, parent: QModelIndex) =
self.loadMore()
method rowCount*(self: Model, index: QModelIndex = nil): int =
return self.items.len
return self.getCount()
method roleNames(self: Model): Table[int, string] =
{
@ -130,93 +154,133 @@ QtObject:
if (not index.isValid):
return
if (index.row < 0 or index.row >= self.items.len):
if (index.row < 0 or index.row >= self.getCount()):
return
let item = self.items[index.row]
let enumRole = role.CollectibleRole
case enumRole:
of CollectibleRole.Uid:
result = newQVariant(item.getId())
of CollectibleRole.ChainId:
result = newQVariant(item.getChainId())
of CollectibleRole.ContractAddress:
result = newQVariant(item.getContractAddress())
of CollectibleRole.TokenId:
result = newQVariant(item.getTokenId().toString())
of CollectibleRole.Name:
result = newQVariant(item.getName())
of CollectibleRole.MediaUrl:
result = newQVariant(item.getMediaUrl())
of CollectibleRole.MediaType:
result = newQVariant(item.getMediaType())
of CollectibleRole.ImageUrl:
result = newQVariant(item.getImageUrl())
of CollectibleRole.BackgroundColor:
result = newQVariant(item.getBackgroundColor())
of CollectibleRole.CollectionName:
result = newQVariant(item.getCollectionName())
of CollectibleRole.IsLoading:
result = newQVariant(item.getIsLoading())
of CollectibleRole.IsPinned:
result = newQVariant(item.getIsPinned())
if index.row < self.items.len:
let item = self.items[index.row]
case enumRole:
of CollectibleRole.Uid:
result = newQVariant(item.getId())
of CollectibleRole.ChainId:
result = newQVariant(item.getChainId())
of CollectibleRole.ContractAddress:
result = newQVariant(item.getContractAddress())
of CollectibleRole.TokenId:
result = newQVariant(item.getTokenId().toString())
of CollectibleRole.Name:
result = newQVariant(item.getName())
of CollectibleRole.MediaUrl:
result = newQVariant(item.getMediaUrl())
of CollectibleRole.MediaType:
result = newQVariant(item.getMediaType())
of CollectibleRole.ImageUrl:
result = newQVariant(item.getImageUrl())
of CollectibleRole.BackgroundColor:
result = newQVariant(item.getBackgroundColor())
of CollectibleRole.CollectionName:
result = newQVariant(item.getCollectionName())
of CollectibleRole.IsLoading:
result = newQVariant(false)
of CollectibleRole.IsPinned:
result = newQVariant(item.getIsPinned())
else:
# Loading item
case enumRole:
of CollectibleRole.IsLoading:
result = newQVariant(true)
else:
error "Invalid role for loading item"
result = newQVariant()
proc appendLoadingItems(self: Model) =
if not self.loadingItemsStartIdx < 0:
proc appendCollectibleItems(self: Model, newItems: seq[Item]) =
if len(newItems) == 0:
return
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
let loadingItem = initLoadingItem()
self.loadingItemsStartIdx = self.items.len
self.beginInsertRows(parentModelIndex, self.loadingItemsStartIdx, self.loadingItemsStartIdx + loadingItemsCount - 1)
for i in 1..loadingItemsCount:
self.items.add(loadingItem)
# Start after the current last real item
let startIdx = self.items.len
# End at the new last real item
let endIdx = startIdx + newItems.len - 1
self.beginInsertRows(parentModelIndex, startIdx, endIdx)
self.items.insert(newItems, startIdx)
self.endInsertRows()
self.countChanged()
proc removeLoadingItems(self: Model) =
if self.loadingItemsStartIdx < 0:
proc removeCollectibleItems(self: Model) =
if self.items.len <= 0:
return
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
self.beginRemoveRows(parentModelIndex, self.loadingItemsStartIdx, self.loadingItemsStartIdx + loadingItemsCount - 1)
self.items.delete(self.loadingItemsStartIdx, self.loadingItemsStartIdx + loadingItemsCount - 1)
self.loadingItemsStartIdx = -1
# Start from the beginning
let startIdx = 0
# End at the last real item
let endIdx = startIdx + self.items.len - 1
self.beginRemoveRows(parentModelIndex, startIdx, endIdx)
self.items = @[]
self.endRemoveRows()
self.countChanged()
proc resetModel*(self: Model, newItems: seq[Item]) =
self.beginResetModel()
self.items = newItems
self.endResetModel()
proc appendLoadingItems(self: Model) =
if self.hasLoadingItems:
return
proc setItems*(self: Model, newItems: seq[Item], offset: int, hasMore: bool) =
if self.isFetching:
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
# Start after the last real item
let startIdx = self.items.len
# End after loadingItemsCount
let endIdx = startIdx + loadingItemsCount - 1
self.beginInsertRows(parentModelIndex, startIdx, endIdx)
self.hasLoadingItems = true
self.endInsertRows()
self.countChanged()
proc removeLoadingItems(self: Model) =
if not self.hasLoadingItems:
return
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
# Start after the last real item
let startIdx = self.items.len
# End after loadingItemsCount
let endIdx = startIdx + loadingItemsCount - 1
self.beginRemoveRows(parentModelIndex, startIdx, endIdx)
self.hasLoadingItems = false
self.endRemoveRows()
self.countChanged()
proc checkLoadingItems(self: Model) =
# If fetch is in progress or we have more items in the DB, show loading items
let showLoadingItems = self.isUpdating or self.isFetching or self.hasMore
if showLoadingItems:
self.appendLoadingItems()
else:
self.removeLoadingItems()
proc setItems*(self: Model, newItems: seq[Item], offset: int, hasMore: bool) =
if offset == 0:
self.resetModel(newItems)
else:
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
self.removeCollectibleItems()
elif offset != self.getCollectiblesCount():
error "invalid offset"
return
if offset != self.items.len:
error "offset != self.items.len"
return
self.beginInsertRows(parentModelIndex, self.items.len, self.items.len + newItems.len - 1)
self.items.add(newItems)
self.endInsertRows()
self.countChanged()
self.appendCollectibleItems(newItems)
self.setHasMore(hasMore)
if self.isFetching:
self.appendLoadingItems()
proc getImageUrl*(self: Model, id: string): string {.slot.} =
for item in self.items:
if(cmpIgnoreCase(item.getId(), id) == 0):

41
ui/app/AppLayouts/Wallet/views/CollectiblesView.qml
View File

@ -57,17 +57,48 @@ Item {
height: gridView.cellHeight
width: gridView.cellWidth
title: model.name ? model.name : "..."
subTitle: model.collectionName ? model.collectionName : ""
mediaUrl: model.mediaUrl ? model.mediaUrl : ""
mediaType: model.mediaType ? model.mediaType : ""
fallbackImageUrl: model.imageUrl
subTitle: model.collectionName ?? ""
mediaUrl: model.mediaUrl ?? ""
mediaType: model.mediaType ?? ""
fallbackImageUrl: model.imageUrl ?? ""
backgroundColor: model.backgroundColor ? model.backgroundColor : "transparent"
isLoading: model.isLoading
isLoading: !!model.isLoading
onClicked: root.collectibleClicked(model.chainId, model.contractAddress, model.tokenId)
}
ScrollBar.vertical: StatusScrollBar {}
// For some reason fetchMore is not working properly.
// Adding some logic here as a workaround.
visibleArea.onYPositionChanged: checkLoadMore()
visibleArea.onHeightRatioChanged: checkLoadMore()
Connections {
target: gridView
function onVisibleChanged() {
checkLoadMore()
}
}
Connections {
target: root.collectiblesModel
function onHasMoreChanged() {
checkLoadMore()
}
function onIsFetchingChanged() {
checkLoadMore()
}
}
function checkLoadMore() {
// If there is no more items to load or we're already fetching, return
if (!gridView.visible || !root.collectiblesModel.hasMore || root.collectiblesModel.isFetching)
return
// Only trigger if close to the bottom of the list
if (visibleArea.yPosition + visibleArea.heightRatio > 0.9)
root.collectiblesModel.loadMore()
}
}
}
}