chore(CommunityPermissions): Adjust behavior of 'Hide permission' switch depending on selected permission

Closes: #9050

storybook/pages/CommunityNewPermissionViewPage.qml

@@ -4,8 +4,15 @@ import QtQuick.Controls 2.14
 import AppLayouts.Chat.views.communities 1.0
 import AppLayouts.Chat.stores 1.0
 
+import Storybook 1.0
 import Models 1.0
 
+SplitView {
+    orientation: Qt.Vertical
+    SplitView.fillWidth: true
+
+    Logs { id: logs }
+
     Pane {
         id: root
 
@@ -23,6 +30,8 @@ Pane {
 
                 }
 
+                readonly property bool isOwner: isOwnerCheckBox.checked
+
                 function editPermission(index, holdings, permissions, channels, isPrivate) {
                     logs.logEvent("CommunitiesStore::editPermission - index: " + index)
                 }
@@ -52,3 +61,19 @@ Pane {
             }
         }
     }
+
+    LogsAndControlsPanel {
+        id: logsAndControlsPanel
+
+        SplitView.minimumHeight: 100
+        SplitView.preferredHeight: 150
+
+        logsView.logText: logs.logText
+
+        CheckBox {
+            id: isOwnerCheckBox
+
+            text: "Is owner"
+        }
+    }
+}

storybook/pages/CommunityPermissionsSettingsPanelPage.qml

@@ -8,13 +8,13 @@ import StatusQ.Core.Theme 0.1
 import Storybook 1.0
 import Models 1.0
 
-SplitView {
-    Logs { id: logs }
 
 SplitView {
     orientation: Qt.Vertical
     SplitView.fillWidth: true
 
+    Logs { id: logs }
+
     Rectangle {
         SplitView.fillWidth: true
         SplitView.fillHeight: true
@@ -90,4 +90,3 @@ SplitView {
         }
     }
 }
-}

ui/app/AppLayouts/Chat/controls/community/PermissionsDropdown.qml

@@ -15,7 +15,7 @@ StatusDropdown {
     property int mode: PermissionsDropdown.Mode.Add
     property int initialPermissionType: PermissionTypes.Type.None
 
-    property bool disableAdminPermission: false
+    property bool enableAdminPermission: true
 
     enum Mode {
         Add, Update
@@ -95,7 +95,7 @@ StatusDropdown {
             checked: d.initialPermissionType === permissionType
             buttonGroup: group
 
-            enabled: !root.disableAdminPermission
+            enabled: root.enableAdminPermission
 
             Layout.fillWidth: true
         }
@@ -160,7 +160,7 @@ StatusDropdown {
             readonly property string description:
                 qsTr("Members who meet the requirements will be allowed to read the selected channels")
 
-            title: qsTr("Read")
+            title: qsTr("View only")
             asset.name: "show"
             checked: d.initialPermissionType === permissionType
             buttonGroup: group

ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml

@@ -81,6 +81,18 @@ StatusScrollView {
             permissionType === PermissionTypes.Type.Admin ||
             permissionType === PermissionTypes.Type.Member
 
+        onPermissionTypeChanged: {
+            if (permissionType === PermissionTypes.Type.Admin) {
+                d.dirtyValues.isPrivateDirty = (root.isPrivate === false)
+            } else {
+                if (permissionType === PermissionTypes.Type.Moderator) {
+                    d.dirtyValues.isPrivateDirty = (root.isPrivate === false)
+                } else {
+                    d.dirtyValues.isPrivateDirty = (root.isPrivate === true)
+                }
+            }
+        }
+
         onIsCommunityPermissionChanged: {
             if (isCommunityPermission) {
                 inModelChannels.clear()
@@ -431,7 +443,7 @@ StatusScrollView {
                 id: permissionsDropdown
 
                 initialPermissionType: d.permissionType
-                disableAdminPermission: !root.store.isOwner
+                enableAdminPermission: root.store.isOwner
 
                 onDone: {
                     if (d.permissionType === permissionType) {
@@ -594,14 +606,14 @@ StatusScrollView {
             ColumnLayout {
                 Layout.fillWidth: true
                 StatusBaseText {
-                    text: qsTr("Private")
+                    text: qsTr("Hide permission")
                     color: Theme.palette.directColor1
                     font.pixelSize: 15
                 }
                 StatusBaseText {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    text: qsTr("Make this permission private to hide it from members who don’t meet it’s requirements")
+                    text: qsTr("Make this permission hidden from members who don’t meet it’s requirements")
                     color: Theme.palette.baseColor1
                     font.pixelSize: 15
                     lineHeight: 1.2
@@ -611,6 +623,7 @@ StatusScrollView {
                 }
             }
             StatusSwitch {
+                enabled: d.permissionType !== PermissionTypes.Type.Admin
                 checked: d.dirtyValues.isPrivateDirty ? !root.isPrivate : root.isPrivate
                 onToggled: d.dirtyValues.isPrivateDirty = (root.isPrivate !== checked)
             }