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/permissions): Hide permissions list in sharing addresses dialog if only base permissions are set 

Fix #12884
This commit is contained in:
Michal Iskierko 2024-01-18 15:06:25 +01:00 committed by Michał Iskierko
parent edf7e82932
commit 46c69cf0a8
6 changed files with 70 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/modules/main/communities/module.nim
View File

@ -60,7 +60,7 @@ type
type
JoiningCommunityDetails = object
communityId: string
communityIdForChannelsPermisisons: string
communityIdForPermissions: string
communityIdForRevealedAccounts: string
ensName: string
addressesToShare: OrderedTable[string, AddressToShareDetails] ## [address, AddressToShareDetails]
@ -818,9 +818,14 @@ method getCommunityPublicKeyFromPrivateKey*(self: Module, communityPrivateKey: s
result = self.controller.getCommunityPublicKeyFromPrivateKey(communityPrivateKey)
method checkPermissions*(self: Module, communityId: string, sharedAddresses: seq[string]) =
self.joiningCommunityDetails.communityIdForChannelsPermisisons = communityId
self.joiningCommunityDetails.communityIdForPermissions = communityId
self.controller.asyncCheckPermissionsToJoin(communityId, sharedAddresses)
self.checkingPermissionToJoinInProgress = true
self.controller.asyncCheckAllChannelsPermissions(communityId, sharedAddresses)
self.checkingAllChannelPermissionsInProgress = true
self.view.setCheckingPermissionsInProgress(inProgress = true)
method prepareTokenModelForCommunity*(self: Module, communityId: string) =
@ -898,7 +903,8 @@ method onCommunityCheckAllChannelPermissionsFailed*(self: Module, communityId: s
method onCommunityCheckPermissionsToJoinResponse*(self: Module, communityId: string,
checkPermissionsToJoinResponse: CheckPermissionsToJoinResponseDto) =
if self.joiningCommunityDetails.communityId != communityId:
if not self.checkingPermissionToJoinInProgress and
self.joiningCommunityDetails.communityIdForPermissions != communityId:
return
self.applyPermissionResponse(communityId, checkPermissionsToJoinResponse.permissions)
self.checkingPermissionToJoinInProgress = false
@ -906,7 +912,8 @@ method onCommunityCheckPermissionsToJoinResponse*(self: Module, communityId: str
method onCommunityCheckAllChannelsPermissionsResponse*(self: Module, communityId: string,
checkChannelPermissionsResponse: CheckAllChannelsPermissionsResponseDto) =
if self.joiningCommunityDetails.communityIdForChannelsPermisisons != communityId:
if not self.checkingAllChannelPermissionsInProgress and
self.joiningCommunityDetails.communityIdForPermissions != communityId:
return
self.checkingAllChannelPermissionsInProgress = false
self.updateCheckingPermissionsInProgressIfNeeded(inProgress = false)

5
src/app/modules/shared_models/token_permission_item.nim
View File

@ -20,7 +20,10 @@ proc `$`*(self: TokenPermissionItem): string =
result = fmt"""TokenPermissionItem(
id: {self.id},
type: {self.type},
]"""
isPrivate: {self.isPrivate},
tokenCriteriaMet: {self.tokenCriteriaMet},
state: {self.state}
)"""
proc initTokenPermissionItem*(
id: string,

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

@ -1550,7 +1550,6 @@ QtObject:
raise newException(RpcException, error.message)
let checkPermissionsToJoinResponse = rpcResponseObj["response"]["result"].toCheckPermissionsToJoinResponseDto
self.events.emit(SIGNAL_CHECK_PERMISSIONS_TO_JOIN_RESPONSE, CheckPermissionsToJoinResponseArgs(
communityId: communityId,
checkPermissionsToJoinResponse: checkPermissionsToJoinResponse

4
ui/app/AppLayouts/Communities/panels/SharedAddressesPanel.qml
View File

@ -215,7 +215,7 @@ Control {
radius: Style.current.padding
border.width: 1
border.color: Theme.palette.baseColor3
visible: d.hasPermissions
visible: permissionsView.hasAnyVisiblePermission
layer.enabled: true
layer.effect: DropShadow {
@ -240,7 +240,7 @@ Control {
Layout.fillHeight: true
Layout.fillWidth: true
Layout.topMargin: -Style.current.padding // compensate for the half-rounded divider above
visible: d.hasPermissions
visible: permissionsView.hasAnyVisiblePermission
}
}
}

54
ui/app/AppLayouts/Communities/panels/SharedAddressesPermissionsPanel.qml
View File

@ -33,6 +33,10 @@ Rectangle {
implicitHeight: permissionsScrollView.contentHeight - permissionsScrollView.anchors.topMargin
color: Theme.palette.baseColor2
readonly property bool hasAnyVisiblePermission: root.permissionsModel && root.permissionsModel.count &&
(d.tokenMasterPermissionsModel.count > 0 || d.adminPermissionsModel.count > 0 ||
d.joinPermissionsModel.count > 0 || d.channelsPermissionsModel.count > 0)
QtObject {
id: d
@ -62,12 +66,23 @@ Rectangle {
readonly property bool lostChannelPermissions: root.isEditMode && d.uniquePermissionChannels.length > 0 && channelPermissionsPanel.anyPermissionLost
// models
readonly property var tokenMasterPermissionsModel: SortFilterProxyModel {
id: tokenMasterPermissionsModel
sourceModel: root.permissionsModel
function filterPredicate(modelData) {
return (modelData.permissionType === Constants.permissionType.becomeTokenMaster)
&& modelData.tokenCriteriaMet
}
filters: ExpressionFilter {
expression: tokenMasterPermissionsModel.filterPredicate(model)
}
}
readonly property var adminPermissionsModel: SortFilterProxyModel {
id: adminPermissionsModel
sourceModel: root.permissionsModel
function filterPredicate(modelData) {
return (modelData.permissionType === Constants.permissionType.admin) &&
(modelData.tokenCriteriaMet && !modelData.isPrivate) // admin privs are hidden if criteria not met
(!modelData.isPrivate || (modelData.tokenCriteriaMet && modelData.isPrivate)) // visible or (hidden & met)
}
filters: ExpressionFilter {
expression: adminPermissionsModel.filterPredicate(model)
@ -78,12 +93,25 @@ Rectangle {
sourceModel: root.permissionsModel
function filterPredicate(modelData) {
return (modelData.permissionType === Constants.permissionType.member) &&
(modelData.tokenCriteriaMet || !modelData.isPrivate)
(!modelData.isPrivate || (modelData.tokenCriteriaMet && modelData.isPrivate)) // visible or (hidden & met)
}
filters: ExpressionFilter {
expression: joinPermissionsModel.filterPredicate(model)
}
}
// used to check if there are any visible channel permissions
readonly property var channelsPermissionsModel: SortFilterProxyModel {
id: channelsPermissionsModel
sourceModel: root.permissionsModel
function filterPredicate(modelData) {
return (modelData.permissionType === Constants.permissionType.read || modelData.permissionType === Constants.permissionType.viewAndPost) &&
(!modelData.isPrivate || (modelData.tokenCriteriaMet && modelData.isPrivate)) // visible or (hidden & met)
}
filters: ExpressionFilter {
expression: channelsPermissionsModel.filterPredicate(model)
}
}
}
Component.onCompleted: {
@ -118,6 +146,11 @@ Rectangle {
}
// permission types
PermissionPanel {
id: tokenMasterPermissionPanel
permissionType: PermissionTypes.Type.TokenMaster
permissionsModel: d.tokenMasterPermissionsModel
}
PermissionPanel {
id: joinPermissionPanel
permissionType: PermissionTypes.Type.Member
@ -178,6 +211,8 @@ Rectangle {
return qsTr("Become an admin")
case PermissionTypes.Type.Member:
return qsTr("Join %1").arg(root.communityName)
case PermissionTypes.Type.TokenMaster:
return qsTr("Become a TokenMaster")
default:
return d.uniquePermissionChannels[index][1]
}
@ -326,6 +361,8 @@ Rectangle {
return qsTr("View only")
case PermissionTypes.Type.ViewAndPost:
return qsTr("View & post")
case PermissionTypes.Type.TokenMaster:
return qsTr("TokenMaster")
default:
return "???"
}
@ -354,6 +391,15 @@ Rectangle {
padding: d.absLeftMargin
background: PanelBg {}
visible: {
for (var i = 0; i < channelPermsRepeater.count; i++) {
var chanPermissionItem = channelPermsRepeater.itemAt(i);
if (chanPermissionItem.channelPermissionsModel.count > 0)
return true
}
return false
}
readonly property string channelKey: modelData[0]
readonly property bool readPermissionMet: channelPermsRepeater.count > 0 ? channelPermsRepeater.itemAt(0).tokenCriteriaMet : false
readonly property bool viewAndPostPermissionMet: channelPermsRepeater.count > 1 ? channelPermsRepeater.itemAt(1).tokenCriteriaMet : false
@ -377,6 +423,7 @@ Rectangle {
readonly property int permissionType: modelData
readonly property alias tokenCriteriaMet: overallPermissionRow2.tokenCriteriaMet
readonly property bool permissionLost: d.initialChannelPermissions[channelPermsPanel.channelKey][index] && !tokenCriteriaMet
readonly property alias channelPermissionsModel: permissionsRepeater2.model
Layout.fillWidth: true
Layout.preferredHeight: grid2.implicitHeight + grid2.anchors.margins*2
@ -384,6 +431,7 @@ Rectangle {
border.color: d.tableBorderColor
radius: Style.current.radius
color: "transparent"
visible: permissionsRepeater2.model.count > 0
GridLayout {
id: grid2
@ -405,7 +453,7 @@ Rectangle {
sourceModel: root.permissionsModel
function filterPredicate(modelData) {
return modelData.permissionType === channelPermsSubPanel.permissionType &&
!modelData.isPrivate &&
(!modelData.isPrivate || (modelData.tokenCriteriaMet && modelData.isPrivate)) &&
ModelUtils.contains(modelData.channelsListModel, "key", channelPermsPanel.channelKey) // filter and group by channel "key"
}
filters: ExpressionFilter {

2
ui/imports/utils/Constants.qml
View File

@ -436,6 +436,8 @@ QtObject {
readonly property int member: 2
readonly property int read: 3
readonly property int viewAndPost: 4
readonly property int becomeTokenMaster: 5
readonly property int becomeTokenOwner: 6
}
readonly property QtObject messageContentType: QtObject {