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: continue showing loading indicator when store fetching failed 

Fixes #4733
This commit is contained in:
Richard Ramos 2022-02-07 17:55:14 -04:00
parent ea5b5716e5
commit fc24f16525
13 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/modules/main/chat_section/chat_content/messages/controller.nim
View File

@ -134,15 +134,6 @@ method init*(self: Controller) =
return
self.delegate.onHistoryCleared()
self.events.on(SignalType.HistoryRequestStarted.event) do(e: Args):
self.delegate.setLoadingHistoryMessagesInProgress(true)
self.events.on(SignalType.HistoryRequestCompleted.event) do(e:Args):
self.delegate.setLoadingHistoryMessagesInProgress(false)
self.events.on(SignalType.HistoryRequestFailed.event) do(e:Args):
self.delegate.setLoadingHistoryMessagesInProgress(false)
self.events.on(SIGNAL_MESSAGE_LINK_PREVIEW_DATA_LOADED) do(e: Args):
let args = LinkPreviewDataArgs(e)
self.delegate.onPreviewDataLoaded(args.response)

3
src/app/modules/main/chat_section/chat_content/messages/controller_interface.nim
View File

@ -108,3 +108,6 @@ method joinGroupChat*(self: AccessInterface) {.base.} =
method leaveChat*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method setLoadingHistoryMessagesInProgress*(self: AccessInterface, isLoading: bool) {.base.} =
raise newException(ValueError, "No implementation available")

6
src/app/modules/main/chat_section/chat_content/messages/module.nim
View File

@ -225,8 +225,6 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
if(not self.view.getInitialMessagesLoaded()):
self.view.initialMessagesAreLoaded()
self.setLoadingHistoryMessagesInProgress(false)
# check if this loading was caused by the click on a messages from the app search result
discard self.checkIfMessageLoadedAndScrollToItIfItIs()
@ -286,7 +284,6 @@ method onSendingMessageError*(self: Module) =
self.view.emitSendingMessageErrorSignal()
method loadMoreMessages*(self: Module) =
self.setLoadingHistoryMessagesInProgress(true)
self.controller.loadMoreMessages()
method toggleReaction*(self: Module, messageId: string, emojiId: int) =
@ -408,9 +405,6 @@ method updateChatIdentifier*(self: Module) =
# Add new loaded messages
self.view.model().appendItem(self.createChatIdentifierItem())
method setLoadingHistoryMessagesInProgress*(self: Module, isLoading: bool) =
self.view.setLoadingHistoryMessagesInProgress(isLoading)
method getLinkPreviewData*(self: Module, link: string, uuid: string): string =
return self.controller.getLinkPreviewData(link, uuid)

3
src/app/modules/main/chat_section/chat_content/messages/private_interfaces/module_controller_delegate_interface.nim
View File

@ -35,9 +35,6 @@ method updateContactDetails*(self: AccessInterface, contactId: string) {.base.}
method onMessageEdited*(self: AccessInterface, message: MessageDto) {.base.} =
raise newException(ValueError, "No implementation available")
method setLoadingHistoryMessagesInProgress*(self: AccessInterface, isLoading: bool) {.base.} =
raise newException(ValueError, "No implementation available")
method scrollToMessage*(self: AccessInterface, messageId: string) {.base.} =
raise newException(ValueError, "No implementation available")

1
src/app/modules/main/chat_section/chat_content/messages/view.nim
View File

@ -23,7 +23,6 @@ QtObject:
result.model = newModel()
result.modelVariant = newQVariant(result.model)
result.initialMessagesLoaded = false
result.loadingHistoryMessagesInProgress = false
proc load*(self: View) =
self.delegate.viewDidLoad()

10
src/app/modules/main/chat_section/controller.nim
View File

@ -11,6 +11,7 @@ import ../../../../app_service/service/message/service as message_service
import ../../../../app_service/service/gif/service as gif_service
import ../../../../app_service/service/mailservers/service as mailservers_service
import ../../../core/signals/types
import ../../../core/eventemitter
export controller_interface
@ -158,6 +159,15 @@ method init*(self: Controller) =
return
self.delegate.makeChatWithIdActive(args.chatId)
self.events.on(SignalType.HistoryRequestStarted.event) do(e: Args):
self.delegate.setLoadingHistoryMessagesInProgress(true)
self.events.on(SignalType.HistoryRequestCompleted.event) do(e:Args):
self.delegate.setLoadingHistoryMessagesInProgress(false)
self.events.on(SignalType.HistoryRequestFailed.event) do(e:Args):
discard
method getMySectionId*(self: Controller): string =
return self.sectionId

3
src/app/modules/main/chat_section/module.nim
View File

@ -688,3 +688,6 @@ method reorderCommunityCategories*(self: Module, categoryId: string, position: i
method reorderCommunityChat*(self: Module, categoryId: string, chatId: string, position: int): string =
self.controller.reorderCommunityChat(categoryId, chatId, position)
method setLoadingHistoryMessagesInProgress*(self: Module, isLoading: bool) =
self.view.setLoadingHistoryMessagesInProgress(isLoading)

3
src/app/modules/main/chat_section/private_interfaces/module_controller_delegate_interface.nim
View File

@ -59,3 +59,6 @@ method onCommunityCategoryDeleted*(self: AccessInterface, category: Category) {.
method onCommunityCategoryEdited*(self: AccessInterface, category: Category, chats: seq[ChatDto]) {.base.} =
raise newException(ValueError, "No implementation available")
method setLoadingHistoryMessagesInProgress*(self: AccessInterface, isLoading: bool) {.base.} =
raise newException(ValueError, "No implementation available")

17
src/app/modules/main/chat_section/view.nim
View File

@ -19,6 +19,7 @@ QtObject:
listOfMyContactsVariant: QVariant
editCategoryChannelsModel: chats_model.Model
editCategoryChannelsVariant: QVariant
loadingHistoryMessagesInProgress: bool
proc delete*(self: View) =
self.model.delete
@ -47,6 +48,7 @@ QtObject:
result.contactRequestsModelVariant = newQVariant(result.contactRequestsModel)
result.listOfMyContacts = contacts_model.newModel()
result.listOfMyContactsVariant = newQVariant(result.listOfMyContacts)
result.loadingHistoryMessagesInProgress = false
proc load*(self: View) =
self.delegate.viewDidLoad()
@ -256,3 +258,18 @@ QtObject:
proc reorderCommunityChat*(self: View, categoryId: string, chatId: string, position: int): string {.slot} =
self.delegate.reorderCommunityChat(categoryId, chatId, position)
proc loadingHistoryMessagesInProgressChanged*(self: View) {.signal.}
proc getLoadingHistoryMessagesInProgress*(self: View): bool {.slot.} =
return self.loadingHistoryMessagesInProgress
QtProperty[bool] loadingHistoryMessagesInProgress:
read = getLoadingHistoryMessagesInProgress
notify = loadingHistoryMessagesInProgressChanged
proc setLoadingHistoryMessagesInProgress*(self: View, value: bool) = # this is not a slot
if (value == self.loadingHistoryMessagesInProgress):
return
self.loadingHistoryMessagesInProgress = value
self.loadingHistoryMessagesInProgressChanged()

3
ui/app/AppLayouts/Chat/stores/MessageStore.qml
View File

@ -16,7 +16,8 @@ QtObject {
function loadMoreMessages () {
if(!messageModule)
return
if(!messageModule.initialMessagesLoaded || messageModule.loadingHistoryMessagesInProgress)
if(!messageModule.initialMessagesLoaded || chatCommunitySectionModule.loadingHistoryMessagesInProgress)
return
messageModule.loadMoreMessages()

2
ui/app/AppLayouts/Chat/stores/RootStore.qml
View File

@ -26,6 +26,8 @@ QtObject {
// Contact requests related part
property var contactRequestsModel: chatCommunitySectionModule.contactRequestsModel
property var loadingHistoryMessagesInProgress: chatCommunitySectionModule.loadingHistoryMessagesInProgress
function setActiveCommunity(communityId) {
mainModule.setActiveSectionById(communityId);
}

2
ui/app/AppLayouts/Chat/views/ChatContentView.qml
View File

@ -372,7 +372,7 @@ ColumnLayout {
Loader {
id: loadingMessagesIndicator
active: messageStore.messageModule? messageStore.messageModule.loadingHistoryMessagesInProgress : false
active: chatContentRoot.rootStore.loadingHistoryMessagesInProgress
sourceComponent: LoadingAnimation { }
anchors {
right: parent.right

4
ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View File

@ -68,14 +68,14 @@ Item {
Item {
id: loadingMessagesIndicator
visible: messageStore.messageModule? messageStore.messageModule.loadingHistoryMessagesInProgress : false
visible: root.store.loadingHistoryMessagesInProgress
anchors.top: parent.top
anchors.left: parent.left
height: visible? 20 : 0
width: parent.width
Loader {
active: messageStore.messageModule? messageStore.messageModule.loadingHistoryMessagesInProgress : false
active: root.store.loadingHistoryMessagesInProgress
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
sourceComponent: Component {