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

refactor(section-model): change model to be sorted to fix reorder 

Part of #3364

To make the drag and drop reorder work correctly on channels, we needed to change the model again so that it was sorted in the model itself.
That is because the drag and drop gives us the value of the position it is dropped to as a single list, so dragging the second item of the second category would mean from position 5 to position to position 4, but what the backend wants is moving the item 2 to position 1.
Sorting the model enables us to get the category that is the parent of that position and call the service with the right positions and id.
It also enables us to reorder the channel in and out of the category.
See the module code to see how the calculation is done with an explanatory comment.
The model needed some changes to support that. Some of the function where changed from dataChange calls to resetModel calls, since we need to re-sort the model.
I tried using beginMove, but it would crash. Maybe there is a bug in NimQML or I used it badly, I'm not sure.
This commit is contained in:
Jonathan Rainville 2023-04-13 15:19:00 -04:00
parent f507e33cba
commit 2aa759adcf
12 changed files with 201 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,12 +51,12 @@ proc newModule*(delegate: delegate_interface.AccessInterface, events: EventEmitt
result.view = view.newView(result)
result.viewVariant = newQVariant(result.view)
result.controller = controller.newController(result, events, sectionId, chatId, belongsToCommunity,
isUsersListAvailable, settingsService, nodeConfigurationService, contactService, chatService, communityService, messageService)
isUsersListAvailable, settingsService, nodeConfigurationService, contactService, chatService, communityService, messageService)
result.moduleLoaded = false
result.inputAreaModule = input_area_module.newModule(result, events, sectionId, chatId, belongsToCommunity, chatService, communityService, gifService)
result.messagesModule = messages_module.newModule(result, events, sectionId, chatId, belongsToCommunity,
contactService, communityService, chatService, messageService, mailserversService)
contactService, communityService, chatService, messageService, mailserversService)
result.usersModule =
if communityUsersModule == nil:
users_module.newModule( events, sectionId, chatId, belongsToCommunity,

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

@ -230,7 +230,7 @@ proc init*(self: Controller) =
self.delegate.onCommunityCategoryEdited(args.category, args.chats)
self.events.on(SIGNAL_COMMUNITY_CATEGORY_REORDERED) do(e:Args):
let args = CommunityChatOrderArgs(e)
let args = CommunityCategoryOrderArgs(e)
if (args.communityId == self.sectionId):
self.delegate.onReorderCategory(args.categoryId, args.position)
@ -242,12 +242,17 @@ proc init*(self: Controller) =
self.events.on(SIGNAL_COMMUNITY_CHANNEL_REORDERED) do(e:Args):
let args = CommunityChatOrderArgs(e)
if (args.communityId == self.sectionId):
self.delegate.onReorderChat(args.chatId, args.position, args.categoryId, args.prevCategoryId, false)
self.delegate.onReorderChat(args.chat)
self.events.on(SIGNAL_COMMUNITY_CHANNELS_REORDERED) do(e:Args):
let args = CommunityChatsOrderArgs(e)
if (args.communityId == self.sectionId):
self.delegate.onReorderChats(args.chats)
self.events.on(SIGNAL_COMMUNITY_CHANNEL_CATEGORY_CHANGED) do(e:Args):
let args = CommunityChatOrderArgs(e)
if (args.communityId == self.sectionId):
self.delegate.onReorderChat(args.chatId, args.position, args.categoryId, args.prevCategoryId, args.prevCategoryDeleted)
self.delegate.onReorderChat(args.chat)
self.events.on(SIGNAL_RELOAD_MESSAGES) do(e: Args):
let args = ReloadMessagesArgs(e)

5
src/app/modules/main/chat_section/io_interface.nim
View File

@ -141,7 +141,10 @@ method onGroupChatDetailsUpdated*(self: AccessInterface, chatId: string, newName
method onCommunityChannelEdited*(self: AccessInterface, chat: ChatDto) {.base.} =
raise newException(ValueError, "No implementation available")
method onReorderChat*(self: AccessInterface, chattId: string, position: int, newCategoryIdForChat: string, prevCategoryId: string, prevCategoryDeleted: bool) {.base.} =
method onReorderChat*(self: AccessInterface, updatedChat: ChatDto) {.base.} =
raise newException(ValueError, "No implementation available")
method onReorderChats*(self: AccessInterface, updatedChats: seq[ChatDto]) {.base.} =
raise newException(ValueError, "No implementation available")
method onReorderCategory*(self: AccessInterface, catId: string, position: int) {.base.} =

5
src/app/modules/main/chat_section/item.nim
View File

@ -273,4 +273,7 @@ proc loaderActive*(self: Item): bool =
self.loaderActive
proc `loaderActive=`*(self: var Item, value: bool) =
self.loaderActive = value
self.loaderActive = value
proc isCategory*(self: Item): bool =
self.`type` == CATEGORY_TYPE

144
src/app/modules/main/chat_section/model.nim
View File

@ -1,4 +1,4 @@
import NimQml, Tables, strutils, strformat, json, sequtils
import NimQml, Tables, strutils, strformat, json, sequtils, algorithm
import ../../../../app_service/common/types
import ../../../../app_service/service/chat/dto/chat
from ../../../../app_service/service/contacts/dto/contacts import TrustStatus
@ -159,28 +159,63 @@ QtObject:
of ModelRole.OnlineStatus:
result = newQVariant(item.onlineStatus.int)
of ModelRole.IsCategory:
result = newQVariant(item.`type` == CATEGORY_TYPE)
result = newQVariant(item.isCategory)
of ModelRole.LoaderActive:
result = newQVariant(item.loaderActive)
proc appendItem*(self: Model, item: Item) =
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
self.beginInsertRows(parentModelIndex, self.items.len, self.items.len)
self.items.add(item)
self.endInsertRows()
self.countChanged()
proc getItemIdxById*(self: Model, id: string): int =
proc getItemIdxById(items: seq[Item], id: string): int =
var idx = 0
for it in self.items:
for it in items:
if(it.id == id):
return idx
idx.inc
return -1
proc getItemIdxById*(self: Model, id: string): int =
return getItemIdxById(self.items, id)
proc getClosestCategoryAtIndex*(self: Model, index: int): tuple[categoryIem: Item, categoryIndex: int] =
if index > self.items.len:
return (Item(), -1)
# Count down from the index to 0 and find the first category
for i in countdown(index - 1, 0):
if self.items[i].isCategory:
return (self.items[i], i)
return (Item(), -1)
proc cmpChatsAndCats*(x, y: Item): int =
# Sort proc to compare chats and categories
# Compares first by categoryPosition, then by position
result = cmp(x.categoryPosition, y.categoryPosition)
if result == 0:
result = cmp(x.position, y.position)
# IMPORTANT: if you call this function for a chat with a category, make sure the category is appended first
proc appendItem*(self: Model, item: Item, ignoreCategory: bool = false) =
let parentModelIndex = newQModelIndex()
defer: parentModelIndex.delete
var indexToInsertTo = item.position
if item.categoryId != "" and not item.isCategory:
if ignoreCategory:
# We don't care about the category position, just position it at the end
indexToInsertTo = self.items.len
else:
let categoryIdx = self.getItemIdxById(item.categoryId)
if categoryIdx == -1:
return
indexToInsertTo = categoryIdx + item.position + 1
if indexToInsertTo < 0:
indexToInsertTo = 0
elif indexToInsertTo >= self.items.len + 1:
indexToInsertTo = self.items.len
self.beginInsertRows(parentModelIndex, indexToInsertTo, indexToInsertTo)
self.items.insert(item, indexToInsertTo)
self.items.sort(cmpChatsAndCats)
self.endInsertRows()
self.countChanged()
proc changeCategoryOpened*(self: Model, categoryId: string, opened: bool) {.slot.} =
for i in 0 ..< self.items.len:
if self.items[i].categoryId == categoryId:
@ -337,15 +372,15 @@ QtObject:
proc updateItemsWithCategoryDetailsById*(
self: Model,
chats: seq[ChatDto],
categoryId,
newCategoryName: string,
categoryId: string,
newCategoryPosition: int,
) =
self.beginResetModel()
for i in 0 ..< self.items.len:
var item = self.items[i]
if item.`type` == CATEGORY_TYPE:
continue
var hadCategory = item.categoryId == categoryId
var nowHasCategory = false
var found = false
for chat in chats:
@ -354,26 +389,14 @@ QtObject:
found = true
nowHasCategory = chat.categoryId == categoryId
item.position = chat.position
item.categoryId = categoryId
item.categoryPosition = newCategoryPosition
let modelIndex = self.createIndex(i, 0, nil)
self.dataChanged(modelIndex, modelIndex, @[
ModelRole.Position.int,
ModelRole.CategoryId.int,
ModelRole.CategoryPosition.int,
])
item.categoryId = chat.categoryId
item.categoryPosition = if nowHasCategory: newCategoryPosition else: -1
if not nowHasCategory:
item.categoryOpened = true
break
if (hadCategory and not found and not nowHasCategory) or (hadCategory and found and not nowHasCategory):
item.categoryId = ""
item.categoryPosition = -1
echo "category changed ", item.name
item.categoryOpened = true
let modelIndex = self.createIndex(i, 0, nil)
self.dataChanged(modelIndex, modelIndex, @[
ModelRole.CategoryId.int,
ModelRole.CategoryPosition.int,
ModelRole.CategoryOpened.int,
])
self.items.sort(cmpChatsAndCats)
self.endResetModel()
proc removeCategory*(
self: Model,
@ -382,6 +405,7 @@ QtObject:
) =
self.removeItemById(categoryId)
self.beginResetModel()
for i in 0 ..< self.items.len:
var item = self.items[i]
if item.categoryId != categoryId:
@ -403,6 +427,9 @@ QtObject:
ModelRole.CategoryOpened.int,
])
break
self.items.sort(cmpChatsAndCats)
self.endResetModel()
proc renameCategory*(self: Model, categoryId, newName: string) =
let index = self.getItemIdxById(categoryId)
@ -461,27 +488,34 @@ QtObject:
let modelIndex = self.createIndex(index, 0, nil)
self.dataChanged(modelIndex, modelIndex, @[ModelRole.LastMessageTimestamp.int])
proc reorderChatById*(
proc reorderChats*(
self: Model,
chatId: string,
position: int,
newCategoryId: string,
newCategoryPosition: int,
updatedChats: seq[ChatDto],
) =
let index = self.getItemIdxById(chatId)
if index == -1:
return
var roles = @[ModelRole.Position.int]
if(self.items[index].categoryId != newCategoryId):
self.items[index].categoryId = newCategoryId
self.items[index].categoryPosition = newCategoryPosition
roles = roles.concat(@[
ModelRole.CategoryId.int,
ModelRole.CategoryPosition.int,
])
self.items[index].position = position
let modelIndex = self.createIndex(index, 0, nil)
self.dataChanged(modelIndex, modelIndex, roles)
self.beginResetModel()
for updatedChat in updatedChats:
let index = self.getItemIdxById(updatedChat.id)
if index == -1:
continue
if(self.items[index].categoryId != updatedChat.categoryId):
if updatedChat.categoryId == "":
# Moved out of a category
self.items[index].categoryId = updatedChat.categoryId
self.items[index].categoryPosition = -1
else:
let category = self.getItemById(updatedChat.categoryId)
if category.id == "":
continue
self.items[index].categoryId = category.id
self.items[index].categoryPosition = category.categoryPosition
self.items[index].position = updatedChat.position
self.items.sort(cmpChatsAndCats)
self.endResetModel()
proc reorderCategoryById*(
self: Model,

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

@ -650,7 +650,6 @@ method onCommunityCategoryEdited*(self: Module, cat: Category, chats: seq[ChatDt
self.view.chatsModel().updateItemsWithCategoryDetailsById(
chats,
cat.id,
cat.name,
cat.position,
)
@ -664,7 +663,6 @@ method onCommunityCategoryCreated*(self: Module, cat: Category, chats: seq[ChatD
self.view.chatsModel().updateItemsWithCategoryDetailsById(
chats,
cat.id,
cat.name,
cat.position,
)
@ -682,13 +680,11 @@ method setFirstChannelAsActive*(self: Module) =
self.setActiveItem(chat_item.id)
break
method onReorderChat*(self: Module, chatId: string, position: int, newCategoryIdForChat: string, prevCategoryId: string, prevCategoryDeleted: bool) =
var newCategoryName = ""
var newCategoryPos = -1
if newCategoryIdForChat != "":
let newCategory = self.controller.getCommunityCategoryDetails(self.controller.getMySectionId(), newCategoryIdForChat)
newCategoryPos = newCategory.position
self.view.chatsModel().reorderChatById(chatId, position, newCategoryIdForChat, newCategoryPos)
method onReorderChat*(self: Module, updatedChat: ChatDto) =
self.view.chatsModel().reorderChats(@[updatedChat])
method onReorderChats*(self: Module, updatedChats: seq[ChatDto]) =
self.view.chatsModel().reorderChats(updatedChats)
method onReorderCategory*(self: Module, catId: string, position: int) =
self.view.chatsModel().reorderCategoryById(catId, position)
@ -1095,13 +1091,26 @@ method prepareEditCategoryModel*(self: Module, categoryId: string) =
c.position,
categoryId,
)
self.view.editCategoryChannelsModel().appendItem(chatItem)
self.view.editCategoryChannelsModel().appendItem(chatItem, ignoreCategory = true)
method reorderCommunityCategories*(self: Module, categoryId: string, position: int) =
self.controller.reorderCommunityCategories(categoryId, position)
method reorderCommunityChat*(self: Module, categoryId: string, chatId: string, position: int): string =
self.controller.reorderCommunityChat(categoryId, chatId, position)
method reorderCommunityChat*(self: Module, categoryId: string, chatId: string, toPosition: int): string =
# Calculate actual position, since the position coming from the UI is assuming a single list where categories are items
# eg: if we have 2 categories with 2 channels each, then it means 6 items (2 categories, 2 chats)
# if we move the 2nd channel of the 2nd category to the 1st position of the 2nd category, then the UI would say
# that we move the chat from position 5 to position 4
# We need to translate that to position 1 of category 2
let (category, categoryIndex) = self.view.chatsModel().getClosestCategoryAtIndex(toPosition + 1)
var categoryId = ""
var newPos = toPosition
if (categoryIndex > -1):
categoryId = category.id
newPos = toPosition - categoryIndex - 1 # position is 0 based
if newPos < 0:
newPos = 0
self.controller.reorderCommunityChat(categoryId, chatId, newPos)
method setLoadingHistoryMessagesInProgress*(self: Module, isLoading: bool) =
self.view.setLoadingHistoryMessagesInProgress(isLoading)

67
src/app_service/service/community/service.nim
View File

@ -45,11 +45,11 @@ type
CommunityChatOrderArgs* = ref object of Args
communityId*: string
chatId*: string
categoryId*: string
position*: int
prevCategoryId*: string
prevCategoryDeleted*: bool
chat*: ChatDto
CommunityChatsOrderArgs* = ref object of Args
communityId*: string
chats*: seq[ChatDto]
CommunityCategoryOrderArgs* = ref object of Args
communityId*: string
@ -126,6 +126,7 @@ const SIGNAL_COMMUNITIES_UPDATE* = "communityUpdated"
const SIGNAL_COMMUNITY_CHANNEL_CREATED* = "communityChannelCreated"
const SIGNAL_COMMUNITY_CHANNEL_EDITED* = "communityChannelEdited"
const SIGNAL_COMMUNITY_CHANNEL_REORDERED* = "communityChannelReordered"
const SIGNAL_COMMUNITY_CHANNELS_REORDERED* = "communityChannelsReordered"
const SIGNAL_COMMUNITY_CHANNEL_DELETED* = "communityChannelDeleted"
const SIGNAL_COMMUNITY_CATEGORY_CREATED* = "communityCategoryCreated"
const SIGNAL_COMMUNITY_CATEGORY_EDITED* = "communityCategoryEdited"
@ -406,7 +407,7 @@ QtObject:
if category.position != prev_category.position:
self.events.emit(SIGNAL_COMMUNITY_CATEGORY_REORDERED,
CommunityChatOrderArgs(
CommunityCategoryOrderArgs(
communityId: community.id,
categoryId: category.id,
position: category.position))
@ -471,8 +472,12 @@ QtObject:
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_CREATED, data)
# if the chat was created by the current user then it's already in the model and should be reordered if necessary
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_REORDERED, CommunityChatOrderArgs(communityId: community.id,
chatId: chat.id, categoryId: chat.categoryId, position: chat.position))
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_REORDERED,
CommunityChatOrderArgs(
communityId: community.id,
chat: chat,
)
)
# channel was removed
elif((community.chats.len-removedChats.len) < prev_community.chats.len):
@ -491,8 +496,12 @@ QtObject:
let prev_chat = prev_community.chats[index]
# Handle position changes
if chat.position != prev_chat.position:
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_REORDERED, CommunityChatOrderArgs(communityId: community.id,
chatId: chat.id, categoryId: chat.categoryId, position: chat.position))
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_REORDERED,
CommunityChatOrderArgs(
communityId: community.id,
chat: chat,
)
)
# Handle channel was added/removed to/from category
if chat.categoryId != prev_chat.categoryId:
@ -504,8 +513,12 @@ QtObject:
prevCategoryDeleted = true
break
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_CATEGORY_CHANGED, CommunityChatOrderArgs(communityId: community.id,
chatId: chat.id, categoryId: chat.categoryId, position: chat.position, prevCategoryId: prev_chat.categoryId, prevCategoryDeleted: prevCategoryDeleted))
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_CATEGORY_CHANGED,
CommunityChatOrderArgs(
communityId: community.id,
chat: chat,
)
)
# Handle name/description changes
if chat.name != prev_chat.name or chat.description != prev_chat.description or chat.color != prev_chat.color:
@ -1146,17 +1159,31 @@ QtObject:
let updatedCommunity = response.result["communities"][0].toCommunityDto()
var updatedChats: seq[ChatDto] = @[]
for chat in updatedCommunity.chats:
let prev_chat_idx = findIndexById(chat.id, self.communities[communityId].chats)
if prev_chat_idx > -1:
let prev_chat = self.communities[communityId].chats[prev_chat_idx]
if(chat.position != prev_chat.position and chat.categoryId == categoryId):
var chatDetails = self.chatService.getChatById(chat.id) # we are free to do this cause channel must be created before we add it to a category
self.communities[communityId].chats[prev_chat_idx].position = chat.position
chatDetails.updateMissingFields(self.communities[communityId].chats[prev_chat_idx])
self.chatService.updateOrAddChat(chatDetails) # we have to update chats stored in the chat service.
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_REORDERED, CommunityChatOrderArgs(communityId: updatedCommunity.id, chatId: chat.id, categoryId: chat.categoryId, position: chat.position))
if prev_chat_idx == -1:
continue
let prev_chat = self.communities[communityId].chats[prev_chat_idx]
# we are free to do this cause channel must be created before we add it to a category
var chatDetails = self.chatService.getChatById(chat.id)
if(chat.position != prev_chat.position and chat.categoryId == categoryId):
self.communities[communityId].chats[prev_chat_idx].position = chat.position
elif chat.categoryId != prev_chat.categoryId:
self.communities[communityId].chats[prev_chat_idx].categoryId = chat.categoryId
else:
continue
chatDetails.updateMissingFields(self.communities[communityId].chats[prev_chat_idx])
self.chatService.updateOrAddChat(chatDetails) # we have to update chats stored in the chat service.
updatedChats.add(chat)
self.events.emit(SIGNAL_COMMUNITY_CHANNELS_REORDERED,
CommunityChatsOrderArgs(communityId: updatedCommunity.id, chats: updatedChats))
self.communities[communityId] = updatedCommunity
except Exception as e:
error "Error reordering community channel", msg = e.msg, communityId, chatId, position, procName="reorderCommunityChat"

15
test/ui-test/src/screens/StatusCommunityScreen.py
View File

@ -29,12 +29,7 @@ class CommunityScreenComponents(Enum):
CHAT_LOG = "chatView_log"
COMMUNITY_HEADER_BUTTON = "mainWindow_communityHeader_StatusChatInfoButton"
COMMUNITY_HEADER_NAME_TEXT= "community_ChatInfo_Name_Text"
COMMUNITY_CREATE_CHANNEL_OR_CAT_BUTTON = "ma.
inWindow_createChannelOrCategoryBtn_StatusBaseText"
COMMUNITY_CREATE_CHANNEL_OR_CAT_BUTTON = "mainWindow_createChannelOrCategoryBtn_StatusBaseText"
COMMUNITY_CREATE_CHANNEL_MENU_ITEM = "create_channel_StatusMenuItem"
COMMUNITY_CREATE_CATEGORY_MENU_ITEM = "create_category_StatusMenuItem"
COMMUNITY_EDIT_CATEGORY_MENU_ITEM = "edit_сategory_StatusMenuItem"
@ -311,6 +306,14 @@ class StatusCommunityScreen:
chatListObj = get_obj(CommunityScreenComponents.NOT_CATEGORIZED_CHAT_LIST.value)
verify_equals(chatListObj.statusChatListItems.count, int(count_to_check))
def check_channel_is_uncategorized(self, channel_name: str):
chatListObj = get_obj(CommunityScreenComponents.NOT_CATEGORIZED_CHAT_LIST.value)
for i in range(chatListObj.statusChatListItems.count):
channelObj = chatListObj.statusChatListItems.itemAtIndex(i)
if channelObj.objectName == channel_name:
return
verify_failure("No channel matches " + channel_name)
def search_and_change_community_channel_emoji(self, emoji_description: str):
self._open_edit_channel_popup()

4
test/ui-test/testSuites/suite_communities/shared/steps/communitySteps.py
View File

@ -230,6 +230,10 @@ def step(context, color: str):
@Then("\"|any|\" should be an available option in Community Settings")
def step(context, manage_community_option:str):
_statusCommunityScreen.verify_option_exists(manage_community_option)
@Then("\"|any|\" should be in the list of uncategorized channels")
def step(context, chat_name:str):
_statusCommunityScreen.check_channel_is_uncategorized(chat_name)
###########################################################################

5
test/ui-test/testSuites/suite_communities/tst_communityFlows/test.feature
View File

@ -28,11 +28,12 @@ Feature: Status Desktop community
Scenario Outline: The admin creates a community channel
When the admin creates a community channel named "<community_channel_name>", with description "<community_channel_description>", with the method "<method>"
Then the channel named "<community_channel_name>" is open
Then "<community_channel_name>" should be in the list of uncategorized channels
And the channel named "<community_channel_name>" is open
Examples:
| community_channel_name | community_channel_description | method |
| test-channel | Community channel description tested 1 | bottom_menu |
| test-channel2 | Community channel description tested 2 | right_click_menu |
# | test-channel2 | Community channel description tested 2 | right_click_menu |
Scenario Outline: The admin edits a community channel
Given the admin creates a community channel named "<community_channel_name>", with description "<community_channel_description>", with the method "bottom_menu"

14
ui/StatusQ/src/StatusQ/Components/StatusChatList.qml
View File

@ -69,7 +69,7 @@ Item {
const to = chatListDelegate.visualIndex;
if (to === from)
return;
if (!model.isCategory) {
if (!drop.source.isCategory) {
root.chatItemReordered(statusChatListItems.itemAtIndex(from).categoryId, statusChatListItems.itemAtIndex(from).chatId, to);
} else {
root.categoryReordered(statusChatListItems.itemAtIndex(from).categoryId, to);
@ -77,6 +77,8 @@ Item {
}
StatusDraggableListItem {
readonly property bool isCategory: model.isCategory
id: draggableItem
width: parent.width
height: visible ? implicitHeight : 0
@ -93,7 +95,7 @@ Item {
customizable: true
Drag.keys: chatListDelegate.keys
onClicked: {
if (model.isCategory) {
if (draggableItem.isCategory) {
statusChatListCategoryItem.clicked(mouse);
} else {
statusChatListItem.clicked(mouse);
@ -104,7 +106,7 @@ Item {
StatusChatListCategoryItem {
id: statusChatListCategoryItem
objectName: "categoryItem"
visible: model.isCategory
visible: draggableItem.isCategory
function setupPopup() {
categoryPopupMenuSlot.item.categoryItem = model
@ -129,10 +131,10 @@ Item {
highlighted = true;
categoryPopupMenuSlot.item.popup()
} else if (mouse.button === Qt.LeftButton) {
root.model.sourceModel.changeCategoryOpened(model.categoryId, !statusChatListCategoryItem.opened)
root.model.changeCategoryOpened(model.categoryId, !statusChatListCategoryItem.opened)
}
}
onToggleButtonClicked: root.model.sourceModel.changeCategoryOpened(model.categoryId, !statusChatListCategoryItem.opened)
onToggleButtonClicked: root.model.changeCategoryOpened(model.categoryId, !statusChatListCategoryItem.opened)
onMenuButtonClicked: {
statusChatListCategoryItem.setupPopup()
highlighted = true
@ -148,7 +150,7 @@ Item {
objectName: model.name
width: root.width
height: visible ? (statusChatListItem.implicitHeight + 4) /*spacing between non-collapsed items*/ : 0
visible: (!model.isCategory && model.categoryOpened)
visible: (!draggableItem.isCategory && model.categoryOpened)
originalOrder: model.position
chatId: model.itemId
categoryId: model.categoryId

16
ui/StatusQ/src/StatusQ/Components/StatusChatListAndCategories.qml
View File

@ -7,8 +7,6 @@ import StatusQ.Components 0.1
import StatusQ.Popups 0.1
import StatusQ.Core 0.1
import SortFilterProxyModel 0.2
Item {
id: root
@ -83,19 +81,7 @@ Item {
root.categoryAddButtonClicked(id)
}
model: SortFilterProxyModel {
sourceModel: root.model
sorters: [
RoleSorter {
roleName: "categoryPosition"
priority: 2 // Higher number === higher priority
},
RoleSorter {
roleName: "position"
priority: 1
}
]
}
model: root.model
popupMenu: root.chatListPopupMenu
categoryPopupMenu: root.categoryPopupMenu