From 31005352c8756f7540d2afe4301e4b6b446c4bc9 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 6 Sep 2024 11:55:44 -0400 Subject: [PATCH] feature: add remove from group option to group chats feature: add remove from group option to group chats refactor ProfileContextMenu to make it a functional component refactor ProfileContextMenu to make it a functional component This refactor ProfileContextMenu to make it a functional component by: refactored out direct calls to backend, and passing backend data structures and moved this logic to the callers, also refactored common calls between the callers common types of context menus have been extracted to their sub components which removes a lot of logic too and makes the behaviour very clear user verification workflow (which was already disabled) has been removed refactor: use signals and call singletons on the parent instead remove unused code for now from profile context menu refactor profile context menu into two components; add property to storybook extract blocked profile context menu and self profile context menu use profileType instead of individual bools refactor to pass trustStatus as an argument make contact type a parameter remove unnecessary method from RegularProfileContextMenu add ensVerified property to ProfileContextMenu components add onlineStatus property to ProfileContextMenu components move ProfileContextMenu storybook controls to the right sidebar move contactDetails logic up from the view add local nickname property to ProfileContextMenu components fix issue with missing signal; fix logs in storybook use constant for profileType instead of string refactor common code into a single method refactor getProfileContext remove references to contactDetails which are not longer needed remove unnecessary comments fix bridged constant refactor into a single ProfileContextMenu component refactor into a single ProfileContextMenu component refactor into a single ProfileContextMenu component simplify imports remove unused store field move methods from utils to contacts store remove onClosed signal remove unused param feature: add remove from group option to group chats feature: add remove from group option to group chats add isAdmin property move removeMemberFromGroupChat to root store hide remove from group option from message context menu --- storybook/pages/ProfileContextMenuPage.qml | 44 ++++++++++++++++++- .../AppLayouts/Chat/panels/UserListPanel.qml | 7 ++- ui/app/AppLayouts/Chat/stores/RootStore.qml | 5 +++ ui/imports/shared/views/chat/MessageView.qml | 9 +++- .../shared/views/chat/ProfileContextMenu.qml | 12 +++++ 5 files changed, 73 insertions(+), 4 deletions(-) diff --git a/storybook/pages/ProfileContextMenuPage.qml b/storybook/pages/ProfileContextMenuPage.qml index 5b02cbe91f6..64527ae88d3 100644 --- a/storybook/pages/ProfileContextMenuPage.qml +++ b/storybook/pages/ProfileContextMenuPage.qml @@ -62,6 +62,8 @@ SplitView { ensVerified: ensVerifiedCheckBox.checked onlineStatus: onlineStatusSelector.currentValue hasLocalNickname: hasLocalNicknameCheckBox.checked + chatType: chatTypeSelector.currentValue + isAdmin: isAdminCheckBox.checked publicKey: publicKeyInput.text onOpenProfileClicked: () => { @@ -97,6 +99,9 @@ SplitView { onBlockContact: () => { logs.logEvent("Block contact:", profileContextMenu.publicKey) } + onRemoveFromGroup: (publicKey) => { + logs.logEvent("Remove from group:", publicKey) + } onClosed: { destroy() } @@ -115,6 +120,8 @@ SplitView { ensVerified: ensVerifiedCheckBox.checked onlineStatus: onlineStatusSelector.currentValue hasLocalNickname: hasLocalNicknameCheckBox.checked + chatType: chatTypeSelector.currentValue + isAdmin: isAdminCheckBox.checked publicKey: publicKeyInput.text onOpenProfileClicked: () => { @@ -150,7 +157,9 @@ SplitView { onBlockContact: () => { logs.logEvent("Block contact:", profileContextMenu.publicKey) } - + onRemoveFromGroup: (publicKey) => { + logs.logEvent("Remove from group:", publicKey) + } onClosed: { destroy() } @@ -273,6 +282,39 @@ SplitView { Layout.fillWidth: true text: "Has Local Nickname: " + (hasLocalNicknameCheckBox.checked ? "Yes" : "No") } + + ComboBox { + id: chatTypeSelector + textRole: "text" + valueRole: "value" + model: [ + { text: "Unknown", value: Constants.chatType.unknown }, + { text: "Category", value: Constants.chatType.category }, + { text: "One-to-One", value: Constants.chatType.oneToOne }, + { text: "Public Chat", value: Constants.chatType.publicChat }, + { text: "Private Group Chat", value: Constants.chatType.privateGroupChat }, + { text: "Profile", value: Constants.chatType.profile }, + { text: "Community Chat", value: Constants.chatType.communityChat } + ] + currentIndex: 0 + } + + CheckBox { + id: isAdminCheckBox + text: "Is Admin" + checked: false + } + + Label { + Layout.fillWidth: true + text: "Is Admin: " + (isAdminCheckBox.checked ? "Yes" : "No") + } + + Label { + Layout.fillWidth: true + text: "Chat type: " + chatTypeSelector.currentText + } + } } } diff --git a/ui/app/AppLayouts/Chat/panels/UserListPanel.qml b/ui/app/AppLayouts/Chat/panels/UserListPanel.qml index 14c9227fcd3..18ac94fcc48 100644 --- a/ui/app/AppLayouts/Chat/panels/UserListPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/UserListPanel.qml @@ -128,9 +128,11 @@ Item { onClicked: { if (mouse.button === Qt.RightButton) { const { profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname } = root.store.contactsStore.getProfileContext(model.pubKey, userProfile.pubKey) + const chatType = chatContentModule.chatDetails.type + const isAdmin = chatContentModule.amIChatAdmin() Global.openMenu(profileContextMenuComponent, this, { - profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname, + profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname, chatType, isAdmin, publicKey: model.pubKey, displayName: nickName || userName, userIcon: model.icon, @@ -209,6 +211,9 @@ Item { const contactDetails = profileContextMenu.publicKey === "" ? {} : Utils.getContactDetailsAsJson(profileContextMenu.publicKey, true, true) Global.blockContactRequested(profileContextMenu.publicKey, contactDetails) } + onRemoveFromGroup: { + root.store.removeMemberFromGroupChat(profileContextMenu.publicKey) + } } } } diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml index 59454f3040b..e2261d638e2 100644 --- a/ui/app/AppLayouts/Chat/stores/RootStore.qml +++ b/ui/app/AppLayouts/Chat/stores/RootStore.qml @@ -761,4 +761,9 @@ QtObject { function updatePermissionsModel(communityId, sharedAddresses) { communitiesModuleInst.checkPermissions(communityId, JSON.stringify(sharedAddresses)) } + + function removeMemberFromGroupChat(publicKey) { + const chatId = chatCommunitySectionModule.activeItem.id + chatCommunitySectionModule.removeMemberFromGroupChat("", chatId, publicKey) + } } diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml index 414914a8204..070312eac4b 100644 --- a/ui/imports/shared/views/chat/MessageView.qml +++ b/ui/imports/shared/views/chat/MessageView.qml @@ -157,8 +157,11 @@ Loader { const publicKey = isReply ? quotedMessageFrom : root.senderId const isBridgedAccount = isReply ? (quotedMessageContentType === Constants.messageContentType.bridgeMessageType) : root.isBridgeMessage const { profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname } = root.contactsStore.getProfileContext(publicKey, root.rootStore.contactsStore.myPublicKey, isBridgedAccount) + const chatType = chatContentModule.chatDetails.type + // set false for now, because the remove from group option is still available after member is removed + const isAdmin = false // chatContentModule.amIChatAdmin() - const params = { profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname, + const params = { profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname, chatType, isAdmin, publicKey: isReply ? quotedMessageFrom : root.senderId, displayName: isReply ? quotedMessageAuthorDetailsDisplayName : root.senderDisplayName, userIcon: isReply ? quotedMessageAuthorDetailsThumbnailImage : root.senderIcon, @@ -1219,10 +1222,12 @@ Loader { const contactDetails = profileContextMenu.publicKey === "" ? {} : Utils.getContactDetailsAsJson(profileContextMenu.publicKey, true, true) Global.blockContactRequested(profileContextMenu.publicKey, contactDetails) } + onRemoveFromGroup: () => { + root.store.removeMemberFromGroupChat(profileContextMenu.publicKey) + } onOpened: root.setMessageActive(root.messageId, true) } } - Component { id: messageContextMenuComponent diff --git a/ui/imports/shared/views/chat/ProfileContextMenu.qml b/ui/imports/shared/views/chat/ProfileContextMenu.qml index e17e33fa3d7..090c731a5ed 100644 --- a/ui/imports/shared/views/chat/ProfileContextMenu.qml +++ b/ui/imports/shared/views/chat/ProfileContextMenu.qml @@ -21,6 +21,8 @@ StatusMenu { property int profileType: Constants.profileType.regular property bool ensVerified: false property bool hasLocalNickname: false + property int chatType: Constants.chatType.unknown + property bool isAdmin: false signal openProfileClicked signal createOneToOneChat @@ -33,6 +35,7 @@ StatusMenu { signal removeTrustStatus signal removeContact signal blockContact + signal removeFromGroup ProfileHeader { width: parent.width @@ -134,6 +137,15 @@ StatusMenu { onTriggered: root.unblockContact() } + StatusAction { + text: qsTr("Remove from group") + objectName: "removeFromGroup_StatusItem" + icon.name: "remove-contact" + type: StatusAction.Type.Danger + enabled: root.isAdmin && root.profileType !== Constants.profileType.self && root.chatType === Constants.chatType.privateGroupChat + onTriggered: root.removeFromGroup() + } + // Mark as Untrusted StatusAction { id: markUntrustworthyMenuItem