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

chore(CommunityPermissions): refactor access to stores in CP components 

So far CP components (views, panels) were accessing stores directly.
Now `CommunitySettingsView` is a single place where stores are accessed.
Other components no longer depend on stores.

Moreover:
- dedicated store `PermissionsStore` created for handling permissions
  in a single, separated place
- storybook pages fixed

Closes: #9784
This commit is contained in:
Michał Cieślak 2023-03-07 09:47:04 +01:00 committed by Michał
parent 6f03a89685
commit d813cc12b8
12 changed files with 339 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
storybook/pages/CommunityNewPermissionViewPage.qml
View File

@ -3,7 +3,6 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import AppLayouts.Chat.views.communities 1.0
import AppLayouts.Chat.stores 1.0
import Storybook 1.0
import Models 1.0
@ -15,8 +14,6 @@ SplitView {
Logs { id: logs }
Pane {
id: root
SplitView.fillWidth: true
SplitView.fillHeight: true
@ -27,48 +24,21 @@ SplitView {
isEditState: isEditStateCheckBox.checked
isPrivate: isPrivateCheckBox.checked
isOwner: isOwnerCheckBox.checked
duplicationWarningVisible: isDuplicationWarningVisibleCheckBox.checked
store: CommunitiesStore {
readonly property var assetsModel: AssetsModel {}
readonly property var collectiblesModel: CollectiblesModel {}
readonly property var channelsModel: ChannelsModel {}
readonly property var permissionConflict: QtObject {
property bool exists: true
property string holdings: "1 ETH"
property string permissions: "View and Post"
property string channels: "#general"
assetsModel: AssetsModel {}
collectiblesModel: CollectiblesModel {}
channelsModel: ChannelsModel {}
}
readonly property bool isOwner: isOwnerCheckBox.checked
function createPermission(holdings, permissions, isPrivate, channels) {
logs.logEvent("CommunitiesStore::creatPermission")
}
function editPermission(key, holdings, permissions, channels, isPrivate) {
logs.logEvent("CommunitiesStore::editPermission - key: " + key)
}
function removePermission(key) {
logs.logEvent("CommunitiesStore::removePermission - key: " + key)
}
communityDetails: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
rootStore: QtObject {
readonly property QtObject chatCommunitySectionModule: QtObject {
readonly property var model: ChannelsModel {}
}
readonly property QtObject mainModuleInst: QtObject {
readonly property QtObject activeSection: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
}
onCreatePermissionClicked: {
logs.logEvent("CommunityNewPermissionView::onCreatePermissionClicked")
}
}
}
@ -81,9 +51,7 @@ SplitView {
logsView.logText: logs.logText
ColumnLayout {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right

146
storybook/pages/CommunityPermissionsSettingsPanelPage.qml
View File

@ -3,7 +3,6 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import AppLayouts.Chat.panels.communities 1.0
import AppLayouts.Chat.stores 1.0
import StatusQ.Core.Theme 0.1
import StatusQ.Core.Utils 0.1
@ -17,6 +16,51 @@ SplitView {
Logs { id: logs }
QtObject {
id: permissionsStoreMock
readonly property ListModel permissionsModel: ListModel {}
readonly property QtObject _d: QtObject {
id: d
property int keyCounter: 0
function createPermissionEntry(holdings, permissionType, isPrivate,
channels) {
const permission = {
holdingsListModel: holdings,
channelsListModel: channels,
permissionType,
isPrivate
}
return permission
}
}
function createPermission(holdings, permissionType, isPrivate, channels) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
permissionEntry.key = "" + d.keyCounter++
permissionsModel.append(permissionEntry)
}
function editPermission(key, holdings, permissionType, channels, isPrivate) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
const index = ModelUtils.indexOf(permissionsModel, "key", key)
permissionsModel.set(index, permissionEntry)
}
function removePermission(key) {
const index = ModelUtils.indexOf(permissionsModel, "key", key)
permissionsModel.remove(index)
}
}
Rectangle {
SplitView.fillWidth: true
SplitView.fillHeight: true
@ -25,92 +69,32 @@ SplitView {
CommunityPermissionsSettingsPanel {
id: communityPermissionsSettingsPanel
anchors {
fill: parent
topMargin: 50
}
store: CommunitiesStore {
readonly property bool isOwner: isOwnerCheckBox.checked
anchors.fill: parent
anchors.topMargin: 50
property var permissionConflict: QtObject { // Backend conflicts object model assignment. Now mocked data.
property bool exists: false
property string holdings: qsTr("1 ETH")
property string permissions: qsTr("View and Post")
property string channels: qsTr("#general")
permissionsModel: permissionsStoreMock.permissionsModel
assetsModel: AssetsModel {}
collectiblesModel: CollectiblesModel {}
channelsModel: ChannelsModel {}
}
isOwner: isOwnerCheckBox.checked
readonly property var permissionsModel: ListModel {}
readonly property var assetsModel: AssetsModel {}
readonly property var collectiblesModel: CollectiblesModel {}
readonly property var channelsModel: ListModel {
Component.onCompleted: {
append([
{
key: "welcome",
iconSource: ModelsData.assets.inch,
name: "#welcome"
},
{
key: "general",
iconSource: ModelsData.assets.inch,
name: "#general"
}
])
}
}
readonly property QtObject _d: QtObject {
id: d
property int keyCounter: 0
function createPermissionEntry(holdings, permissionType, isPrivate, channels) {
const permission = {
holdingsListModel: holdings,
channelsListModel: channels,
permissionType,
isPrivate
}
return permission
}
}
function createPermission(holdings, permissionType, isPrivate, channels, index = null) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
permissionEntry.key = "" + d.keyCounter++
permissionsModel.append(permissionEntry)
}
function editPermission(key, holdings, permissionType, channels, isPrivate) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
const index = ModelUtils.indexOf(permissionsModel, "key", key)
permissionsModel.set(index, permissionEntry)
}
function removePermission(key) {
const index = ModelUtils.indexOf(permissionsModel, "key", key)
permissionsModel.remove(index)
}
onCreatePermissionRequested: {
permissionsStoreMock.createPermission(holdings, permissionType,
isPrivate, channels)
}
rootStore: QtObject {
readonly property QtObject chatCommunitySectionModule: QtObject {
readonly property var model: ChannelsModel {}
}
onUpdatePermissionRequested:
permissionsStoreMock.editPermission(key, holdings, permissionType,
channels, isPrivate)
readonly property QtObject mainModuleInst: QtObject {
readonly property QtObject activeSection: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
}
onRemovePermissionRequested:
permissionsStoreMock.removePermission(key)
communityDetails: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
}
}

75
storybook/pages/CommunityPermissionsViewPage.qml
View File

@ -1,14 +1,14 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick 2.15
import QtQuick.Controls 2.15
import AppLayouts.Chat.views.communities 1.0
import AppLayouts.Chat.stores 1.0
import Storybook 1.0
import Models 1.0
import StatusQ.Core.Theme 0.1
import StatusQ.Core.Utils 0.1
import AppLayouts.Chat.views.communities 1.0
import Models 1.0
import Storybook 1.0
SplitView {
Logs { id: logs }
@ -28,44 +28,37 @@ SplitView {
margins: 50
}
store: CommunitiesStore {
id: mockedCommunity
permissionsModel: ListModel {
id: permissionsModel
readonly property ListModel permissionsModel: ListModel {
Component.onCompleted: append(PermissionsModel.permissionsModelData)
}
readonly property AssetsModel assetsModel: AssetsModel {
id: assetsModel
}
readonly property CollectiblesModel collectiblesModel: CollectiblesModel {
id: collectiblesModel
}
Component.onCompleted: append(PermissionsModel.permissionsModelData)
}
rootStore: QtObject {
readonly property QtObject chatCommunitySectionModule: QtObject {
readonly property var model: ChannelsModel {
id: channelsModel
}
}
readonly property QtObject mainModuleInst: QtObject {
readonly property QtObject activeSection: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
}
assetsModel: AssetsModel {
id: assetsModel
}
onEditPermissionRequested:
logs.logEvent("CommunityPermissionsView::editPermissionRequested - index: " + index)
onRemovePermissionRequested:
logs.logEvent("CommunityPermissionsView::removePermissionRequested - index: " + index)
onDuplicatePermissionRequested:
logs.logEvent("CommunityPermissionsView::duplicatePermissionRequested - index: " + index)
collectiblesModel: CollectiblesModel {
id: collectiblesModel
}
channelsModel: ChannelsModel {
id: channelsModel
}
communityDetails: QtObject {
readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks
readonly property string color: "red"
}
function log(method, index) {
logs.logEvent(`CommunityPermissionsView::${method} - index: ${index}`)
}
onEditPermissionRequested: log("editPermissionRequested", index)
onRemovePermissionRequested: log("removePermissionRequested", index)
onDuplicatePermissionRequested: log("duplicatePermissionRequested", index)
}
}
@ -85,7 +78,7 @@ SplitView {
CommunityPermissionsSettingsPanelEditor {
anchors.fill: parent
model: mockedCommunity.permissionsModel
model: permissionsModel
assetKeys: assetsModel.data.map(asset => asset.key)
collectibleKeys: collectiblesModel.data.map(collectible => collectible.key)

2
ui/app/AppLayouts/Chat/controls/community/InDropdown.qml
View File

@ -18,7 +18,7 @@ StatusDropdown {
property string communityName
property string communityImage
property color communityColor
property string communityColor
property var model

83
ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml
View File

@ -11,10 +11,26 @@ import utils 1.0
SettingsPageLayout {
id: root
property var rootStore
required property CommunitiesStore store
required property var permissionsModel
required property var assetsModel
required property var collectiblesModel
required property var channelsModel
// name, image, color properties expected
required property var communityDetails
property bool isOwner: false
property int viewWidth: 560 // by design
signal createPermissionRequested(
int permissionType, var holdings, var channels, bool isPrivate)
signal updatePermissionRequested(
string key, int permissionType, var holdings, var channels, bool isPrivate)
signal removePermissionRequested(string key)
function navigateBack() {
if (root.state === d.newPermissionViewState) {
root.state = d.initialState
@ -55,7 +71,7 @@ SettingsPageLayout {
}
}
readonly property string initialState: root.rootStore.permissionsModel.count > 0
readonly property string initialState: root.permissionsModel.count > 0
? d.permissionsViewState : d.welcomeViewState
function initializeData() {
@ -152,13 +168,16 @@ SettingsPageLayout {
viewWidth: root.viewWidth
rootStore: root.rootStore
store: root.store
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
channelsModel: root.channelsModel
communityDetails: root.communityDetails
isOwner: root.isOwner
isEditState: root.state === d.editPermissionViewState
holdingsModel: d.holdingsToEditModel
channelsModel: d.channelsToEditModel
selectedHoldingsModel: d.holdingsToEditModel
selectedChannelsModel: d.channelsToEditModel
permissionType: d.permissionTypeToEdit
isPrivate: d.isPrivateToEditValue
@ -169,7 +188,7 @@ SettingsPageLayout {
channelsTracker.revision
communityNewPermissionView.dirtyValues.permissionType
communityNewPermissionView.dirtyValues.isPrivate
const model = root.rootStore.permissionsModel
const model = root.permissionsModel
const count = model.rowCount()
for (let i = 0; i < count; i++) {
@ -185,8 +204,8 @@ SettingsPageLayout {
const same = (a, b) => ModelUtils.checkEqualitySet(a, b, ["key"])
if (same(dirtyValues.holdingsModel, holdings)
&& same(dirtyValues.channelsModel, channels)
if (same(dirtyValues.selectedHoldingsModel, holdings)
&& same(dirtyValues.selectedChannelsModel, channels)
&& dirtyValues.permissionType === permissionType)
return true
}
@ -196,16 +215,15 @@ SettingsPageLayout {
onCreatePermissionClicked: {
const holdings = ModelUtils.modelToArray(
dirtyValues.holdingsModel,
dirtyValues.selectedHoldingsModel,
["key", "type", "amount"])
const channels = ModelUtils.modelToArray(
dirtyValues.channelsModel, ["key"])
dirtyValues.selectedChannelsModel, ["key"])
root.store.createPermission(holdings,
dirtyValues.permissionType,
dirtyValues.isPrivate,
channels)
root.createPermissionRequested(
dirtyValues.permissionType, holdings, channels,
dirtyValues.isPrivate)
root.state = d.permissionsViewState
}
@ -215,18 +233,15 @@ SettingsPageLayout {
function onSaveChanges() {
const holdings = ModelUtils.modelToArray(
dirtyValues.holdingsModel,
dirtyValues.selectedHoldingsModel,
["key", "type", "amount"])
const channels = ModelUtils.modelToArray(
dirtyValues.channelsModel, ["key"])
dirtyValues.selectedChannelsModel, ["key"])
root.store.editPermission(
d.permissionKeyToEdit,
holdings,
dirtyValues.permissionType,
channels,
dirtyValues.isPrivate)
root.updatePermissionRequested(
d.permissionKeyToEdit, dirtyValues.permissionType,
holdings, channels, dirtyValues.isPrivate)
}
function onResetChanges() {
@ -243,13 +258,13 @@ SettingsPageLayout {
ModelChangeTracker {
id: holdingsTracker
model: communityNewPermissionView.dirtyValues.holdingsModel
model: communityNewPermissionView.dirtyValues.selectedHoldingsModel
}
ModelChangeTracker {
id: channelsTracker
model: communityNewPermissionView.dirtyValues.channelsModel
model: communityNewPermissionView.dirtyValues.selectedChannelsModel
}
Binding {
@ -265,13 +280,17 @@ SettingsPageLayout {
id: permissionsView
CommunityPermissionsView {
permissionsModel: root.permissionsModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
channelsModel: root.channelsModel
communityDetails: root.communityDetails
viewWidth: root.viewWidth
height: root.height
rootStore: root.rootStore
store: root.store
function setInitialValuesFromIndex(index) {
const item = ModelUtils.get(root.rootStore.permissionsModel, index)
const item = ModelUtils.get(root.permissionsModel, index)
d.holdingsToEditModel = item.holdingsListModel
d.channelsToEditModel = item.channelsListModel
@ -282,7 +301,7 @@ SettingsPageLayout {
onEditPermissionRequested: {
setInitialValuesFromIndex(index)
d.permissionKeyToEdit = ModelUtils.get(
root.rootStore.permissionsModel, index, "key")
root.permissionsModel, index, "key")
root.state = d.editPermissionViewState
}
@ -292,8 +311,8 @@ SettingsPageLayout {
}
onRemovePermissionRequested: {
const key = ModelUtils.get(root.rootStore.permissionsModel, index, "key")
root.store.removePermission(key)
const key = ModelUtils.get(root.permissionsModel, index, "key")
root.removePermissionRequested(key)
}
}
}

57
ui/app/AppLayouts/Chat/stores/CommunitiesStore.qml
View File

@ -1,68 +1,11 @@
import QtQuick 2.15
import AppLayouts.Chat.controls.community 1.0
import StatusQ.Core.Utils 0.1
QtObject {
id: root
property var mainModuleInst: mainModule
property var communitiesModuleInst: communitiesModule
readonly property bool isOwner: false
property var mintingModuleInst: mintingModule ?? null
property var permissionConflict: QtObject { // Backend conflicts object model assignment. Now mocked data.
property bool exists: false
property string holdings: qsTr("1 ETH")
property string permissions: qsTr("View and Post")
property string channels: qsTr("#general")
}
property var assetsModel: chatCommunitySectionModule.tokenList
property var collectiblesModel: chatCommunitySectionModule.collectiblesModel
// TODO: Replace to real data, now dummy model
property var channelsModel: ListModel {
ListElement { key: "welcome"; iconSource: "qrc:imports/assets/png/tokens/CUSTOM-TOKEN.png"; name: "#welcome"}
ListElement { key: "general"; iconSource: "qrc:imports/assets/png/tokens/CUSTOM-TOKEN.png"; name: "#general"}
}
readonly property QtObject _d: QtObject {
id: d
property int keyCounter: 0
function createPermissionEntry(holdings, permissionType, isPrivate, channels) {
const permission = {
holdingsListModel: holdings,
channelsListModel: channels,
permissionType,
isPrivate
}
return permission
}
}
function createPermission(holdings, permissionType, isPrivate, channels, index = null) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
chatCommunitySectionModule.createOrEditCommunityTokenPermission(root.mainModuleInst.activeSection.id, "", permissionEntry.permissionType, JSON.stringify(permissionEntry.holdingsListModel), permissionEntry.isPrivate)
}
function editPermission(key, holdings, permissionType, channels, isPrivate) {
const permissionEntry = d.createPermissionEntry(
holdings, permissionType, isPrivate, channels)
chatCommunitySectionModule.createOrEditCommunityTokenPermission(root.mainModuleInst.activeSection.id, key, permissionEntry.permissionType, JSON.stringify(permissionEntry.holdingsListModel), permissionEntry.isPrivate)
}
function removePermission(key) {
chatCommunitySectionModule.deleteCommunityTokenPermission(root.mainModuleInst.activeSection.id, key)
}
// Minting tokens:
function mintCollectible(communityId, address, name, symbol, description, supply,
infiniteSupply, transferable, selfDestruct, chainId, artworkSource)

50
ui/app/AppLayouts/Chat/stores/PermissionsStore.qml Normal file
View File

@ -0,0 +1,50 @@
import QtQml 2.15
QtObject {
id: root
required property string activeSectionId
required property var chatCommunitySectionModuleInst
readonly property var permissionsModel:
chatCommunitySectionModuleInst.permissionsModel
readonly property bool isOwner: false
readonly property QtObject _d: QtObject {
id: d
function createPermissionEntry(holdings, permissionType, isPrivate,
channels) {
return {
holdingsListModel: holdings,
channelsListModel: channels,
permissionType,
isPrivate
}
}
function createOrEdit(key, holdings, permissionType, isPrivate,
channels) {
root.chatCommunitySectionModuleInst.createOrEditCommunityTokenPermission(
root.activeSectionId, key,
permissionType,
JSON.stringify(holdings),
isPrivate)
}
}
function createPermission(holdings, permissionType, isPrivate, channels) {
d.createOrEdit("", holdings, permissionType, isPrivate, channels)
}
function editPermission(key, holdings, permissionType, channels, isPrivate) {
d.createOrEdit(key, holdings, permissionType, isPrivate, channels)
}
function removePermission(key) {
root.chatCommunitySectionModuleInst.deleteCommunityTokenPermission(
root.activeSectionId, key)
}
}

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

@ -9,6 +9,11 @@ QtObject {
property var contactsStore
readonly property PermissionsStore permissionsStore: PermissionsStore {
activeSectionId: mainModuleInst.activeSection.id
chatCommunitySectionModuleInst: chatCommunitySectionModule
}
property bool openCreateChat: false
property string createChatInitMessage: ""
property var createChatFileUrls: []
@ -165,7 +170,6 @@ QtObject {
stickersModule: stickersModuleInst
}
property var permissionsModel: chatCommunitySectionModule.permissionsModel
property var assetsModel: chatCommunitySectionModule.tokenList
property var collectiblesModel: chatCommunitySectionModule.collectiblesModel

5
ui/app/AppLayouts/Chat/stores/qmldir
View File

@ -1,5 +1,6 @@
CommunitiesStore 1.0 CommunitiesStore.qml
PermissionsStore 1.0 PermissionsStore.qml
RootStore 1.0 RootStore.qml
StickerData 1.0 StickerData.qml
StickerPackData 1.0 StickerPackData.qml
StickersStore 1.0 StickersStore.qml
CommunitiesStore 1.0 CommunitiesStore.qml
RootStore 1.0 RootStore.qml

29
ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
View File

@ -246,8 +246,33 @@ StatusSectionLayout {
}
CommunityPermissionsSettingsPanel {
rootStore: root.rootStore
store: root.communityStore
readonly property PermissionsStore permissionsStore:
rootStore.permissionsStore
permissionsModel: permissionsStore.permissionsModel
assetsModel: rootStore.assetsModel
collectiblesModel: rootStore.collectiblesModel
channelsModel: rootStore.chatCommunitySectionModule.model
communityDetails: QtObject {
readonly property var _activeSection:
rootStore.mainModuleInst.activeSection
readonly property string name: _activeSection.name
readonly property string image: _activeSection.image
readonly property string color: _activeSection.color
}
onCreatePermissionRequested:
permissionsStore.createPermission(holdings, permissionType,
isPrivate, channels)
onUpdatePermissionRequested:
permissionsStore.editPermission(
key, holdings, permissionType, channels, isPrivate)
onRemovePermissionRequested:
permissionsStore.removePermission(key)
onPreviousPageNameChanged: root.backButtonName = previousPageName
}

157
ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml
View File

@ -13,15 +13,20 @@ import shared.panels 1.0
import AppLayouts.Chat.helpers 1.0
import AppLayouts.Chat.panels.communities 1.0
import AppLayouts.Chat.stores 1.0
import "../../../Chat/controls/community"
StatusScrollView {
id: root
property var rootStore
required property CommunitiesStore store
required property var assetsModel
required property var collectiblesModel
required property var channelsModel
// name, image, color properties expected
required property var communityDetails
property bool isOwner: false
property int viewWidth: 560 // by design
property bool isEditState: false
@ -35,18 +40,18 @@ StatusScrollView {
readonly property alias dirtyValues: d.dirtyValues
readonly property bool isFullyFilled:
dirtyValues.holdingsModel.count > 0 &&
dirtyValues.selectedHoldingsModel.count > 0 &&
dirtyValues.permissionType !== PermissionTypes.Type.None &&
(d.isCommunityPermission || dirtyValues.channelsModel.count > 0)
(d.isCommunityPermission || dirtyValues.selectedChannelsModel.count > 0)
property int permissionType: PermissionTypes.Type.None
property bool isPrivate: false
// roles: type, key, name, amount, imageSource
property var holdingsModel: ListModel {}
property var selectedHoldingsModel: ListModel {}
// roles: itemId, text, icon, emoji, color, colorId
property var channelsModel: ListModel {}
property var selectedChannelsModel: ListModel {}
property alias duplicationWarningVisible: duplicationPanel.visible
@ -59,8 +64,8 @@ StatusScrollView {
ModelsComparator {
id: holdingsModelComparator
modelA: root.dirtyValues.holdingsModel
modelB: root.holdingsModel
modelA: root.dirtyValues.selectedHoldingsModel
modelB: root.selectedHoldingsModel
roles: ["key", "amount"]
mode: ModelsComparator.CompareMode.Set
@ -69,8 +74,8 @@ StatusScrollView {
ModelsComparator {
id: channelsModelComparator
modelA: root.dirtyValues.channelsModel
modelB: root.channelsModel
modelA: root.dirtyValues.selectedChannelsModel
modelB: root.selectedChannelsModel
roles: ["itemId"]
mode: ModelsComparator.CompareMode.Set
@ -89,7 +94,7 @@ StatusScrollView {
onIsCommunityPermissionChanged: {
if (isCommunityPermission) {
d.dirtyValues.channelsModel.clear()
d.dirtyValues.selectedChannelsModel.clear()
inSelector.wholeCommunitySelected = true
inSelector.itemsModel = inModelCommunity
} else {
@ -100,8 +105,8 @@ StatusScrollView {
}
readonly property QtObject dirtyValues: QtObject {
readonly property ListModel holdingsModel: ListModel {}
readonly property ListModel channelsModel: ListModel {}
readonly property ListModel selectedHoldingsModel: ListModel {}
readonly property ListModel selectedChannelsModel: ListModel {}
property int permissionType: PermissionTypes.Type.None
property bool isPrivate: false
@ -112,17 +117,17 @@ StatusScrollView {
}
function getHoldingIndex(key) {
return ModelUtils.indexOf(holdingsModel, "key", key)
return ModelUtils.indexOf(selectedHoldingsModel, "key", key)
}
function getTokenKeysAndAmounts() {
return ModelUtils.modelToArray(holdingsModel, ["type", "key", "amount"])
return ModelUtils.modelToArray(selectedHoldingsModel, ["type", "key", "amount"])
.filter(item => item.type !== HoldingTypes.Type.Ens)
.map(item => ({ key: item.key, amount: item.amount }))
}
function getEnsNames() {
return ModelUtils.modelToArray(holdingsModel, ["type", "name"])
return ModelUtils.modelToArray(selectedHoldingsModel, ["type", "name"])
.filter(item => item.type === HoldingTypes.Type.Ens)
.map(item => item.name)
}
@ -130,20 +135,22 @@ StatusScrollView {
function loadInitValues() {
// Holdings:
d.dirtyValues.holdingsModel.clear()
d.dirtyValues.holdingsModel.append(
ModelUtils.modelToArray(root.holdingsModel, ["type", "key", "amount"]))
d.dirtyValues.selectedHoldingsModel.clear()
d.dirtyValues.selectedHoldingsModel.append(
ModelUtils.modelToArray(root.selectedHoldingsModel,
["type", "key", "amount"]))
// Permissions:
d.dirtyValues.permissionType = root.permissionType
// Channels
d.dirtyValues.channelsModel.clear()
d.dirtyValues.selectedChannelsModel.clear()
d.dirtyValues.selectedChannelsModel.append(
ModelUtils.modelToArray(root.selectedChannelsModel, ["key"]))
d.dirtyValues.channelsModel.append(
ModelUtils.modelToArray(root.channelsModel, ["key"]))
if (root.channelsModel && (root.channelsModel.count || d.dirtyValues.permissionType === PermissionTypes.Type.None)) {
if (root.selectedChannelsModel &&
(root.selectedChannelsModel.rowCount()
|| d.dirtyValues.permissionType === PermissionTypes.Type.None)) {
inSelector.wholeCommunitySelected = false
inSelector.itemsModel = channelsSelectionModel
} else {
@ -187,22 +194,23 @@ StatusScrollView {
addButton.visible: itemsModel.count < d.maxHoldingsItems
itemsModel: HoldingsSelectionModel {
sourceModel: d.dirtyValues.holdingsModel
sourceModel: d.dirtyValues.selectedHoldingsModel
assetsModel: root.store.assetsModel
collectiblesModel: root.store.collectiblesModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
}
HoldingsDropdown {
id: dropdown
assetsModel: store.assetsModel
collectiblesModel: store.collectiblesModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
function addItem(type, item, amount) {
const key = item.key
d.dirtyValues.holdingsModel.append({ type, key, amount })
d.dirtyValues.selectedHoldingsModel.append(
{ type, key, amount })
}
function prepareUpdateIndex(key) {
@ -210,8 +218,8 @@ StatusScrollView {
const existingIndex = d.dirtyValues.getHoldingIndex(key)
if (itemIndex !== -1 && existingIndex !== -1 && itemIndex !== existingIndex) {
const previousKey = d.dirtyValues.holdingsModel.get(itemIndex).key
d.dirtyValues.holdingsModel.remove(existingIndex)
const previousKey = d.dirtyValues.selectedHoldingsModel.get(itemIndex).key
d.dirtyValues.selectedHoldingsModel.remove(existingIndex)
return d.dirtyValues.getHoldingIndex(previousKey)
}
@ -228,49 +236,54 @@ StatusScrollView {
}
onAddAsset: {
const modelItem = CommunityPermissionsHelpers.getTokenByKey(store.assetsModel, key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(
root.assetsModel, key)
addItem(HoldingTypes.Type.Asset, modelItem, amount)
dropdown.close()
}
onAddCollectible: {
const modelItem = CommunityPermissionsHelpers.getTokenByKey(store.collectiblesModel, key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(
root.collectiblesModel, key)
addItem(HoldingTypes.Type.Collectible, modelItem, amount)
dropdown.close()
}
onAddEns: {
d.dirtyValues.holdingsModel.append(
d.dirtyValues.selectedHoldingsModel.append(
{ type: HoldingTypes.Type.Ens, key: domain, amount: 1 })
dropdown.close()
}
onUpdateAsset: {
const itemIndex = prepareUpdateIndex(key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(store.assetsModel, key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(root.assetsModel, key)
d.dirtyValues.holdingsModel.set(itemIndex,
{ type: HoldingTypes.Type.Asset, key, amount })
d.dirtyValues.selectedHoldingsModel.set(
itemIndex, { type: HoldingTypes.Type.Asset, key, amount })
dropdown.close()
}
onUpdateCollectible: {
const itemIndex = prepareUpdateIndex(key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(store.collectiblesModel, key)
const modelItem = CommunityPermissionsHelpers.getTokenByKey(
root.collectiblesModel, key)
d.dirtyValues.holdingsModel.set(itemIndex,
{ type: HoldingTypes.Type.Collectible, key, amount })
d.dirtyValues.selectedHoldingsModel.set(
itemIndex,
{ type: HoldingTypes.Type.Collectible, key, amount })
dropdown.close()
}
onUpdateEns: {
d.dirtyValues.holdingsModel.set(tokensSelector.editedIndex,
{ type: HoldingTypes.Type.Ens, key: domain, amount: 1 })
d.dirtyValues.selectedHoldingsModel.set(
tokensSelector.editedIndex,
{ type: HoldingTypes.Type.Ens, key: domain, amount: 1 })
dropdown.close()
}
onRemoveClicked: {
d.dirtyValues.holdingsModel.remove(tokensSelector.editedIndex)
d.dirtyValues.selectedHoldingsModel.remove(tokensSelector.editedIndex)
dropdown.close()
}
}
@ -349,7 +362,7 @@ StatusScrollView {
id: permissionsDropdown
initialPermissionType: d.dirtyValues.permissionType
enableAdminPermission: root.store.isOwner
enableAdminPermission: root.isOwner
onDone: {
if (d.dirtyValues.permissionType === permissionType) {
@ -417,9 +430,13 @@ StatusScrollView {
const selectedChannels = []
if (!inSelector.wholeCommunitySelected)
for (let i = 0; i < d.dirtyValues.channelsModel.count; i++)
selectedChannels.push(d.dirtyValues.channelsModel.get(i).key)
if (!inSelector.wholeCommunitySelected) {
const model = d.dirtyValues.selectedChannelsModel
const count = model.count
for (let i = 0; i < count; i++)
selectedChannels.push(model.get(i).key)
}
inDropdown.setSelectedChannels(selectedChannels)
inDropdown.open()
@ -430,10 +447,10 @@ StatusScrollView {
Component.onCompleted: {
append({
imageSource: inDropdown.communityData.image,
text: inDropdown.communityData.name,
imageSource: inDropdown.communityImage,
text: inDropdown.communityName,
operator: OperatorsUtils.Operators.None,
color: inDropdown.communityData.color
color: inDropdown.communityColor
})
}
}
@ -441,36 +458,34 @@ StatusScrollView {
ChannelsSelectionModel {
id: channelsSelectionModel
sourceModel: d.dirtyValues.channelsModel
sourceModel: d.dirtyValues.selectedChannelsModel
channelsModel: root.rootStore.chatCommunitySectionModule.model
channelsModel: root.channelsModel
}
InDropdown {
id: inDropdown
model: root.rootStore.chatCommunitySectionModule.model
model: root.channelsModel
readonly property var communityData: rootStore.mainModuleInst.activeSection
communityName: communityData.name
communityImage: communityData.image
communityColor: communityData.color
communityName: root.communityDetails.name
communityImage: root.communityDetails.image
communityColor: root.communityDetails.color
onChannelsSelected: {
d.dirtyValues.channelsModel.clear()
d.dirtyValues.selectedChannelsModel.clear()
inSelector.itemsModel = 0
inSelector.wholeCommunitySelected = false
const modelData = channels.map(key => ({ key }))
d.dirtyValues.channelsModel.append(modelData)
d.dirtyValues.selectedChannelsModel.append(modelData)
inSelector.itemsModel = channelsSelectionModel
close()
}
onCommunitySelected: {
d.dirtyValues.channelsModel.clear()
d.dirtyValues.selectedChannelsModel.clear()
inSelector.wholeCommunitySelected = true
inSelector.itemsModel = inModelCommunity
close()
@ -507,18 +522,6 @@ StatusScrollView {
onToggled: d.dirtyValues.isPrivate = checked
}
PermissionConflictWarningPanel {
id: conflictPanel
Layout.fillWidth: true
Layout.topMargin: 50 // by desing
visible: store.permissionConflict.exists
holdings: store.permissionConflict.holdings
permissions: store.permissionConflict.permissions
channels: store.permissionConflict.channels
}
PermissionDuplicationWarningPanel {
id: duplicationPanel
@ -532,9 +535,7 @@ StatusScrollView {
Layout.preferredHeight: 44
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.topMargin: conflictPanel.visible
? conflictPanel.Layout.topMargin
: Style.current.bigPadding
Layout.topMargin: Style.current.bigPadding
visible: !root.isEditState
text: qsTr("Create permission")

29
ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml
View File

@ -2,21 +2,22 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1
import SortFilterProxyModel 0.2
import shared.popups 1.0
import AppLayouts.Chat.controls.community 1.0
import AppLayouts.Chat.helpers 1.0
import AppLayouts.Chat.stores 1.0
StatusScrollView {
id: root
property var rootStore
required property CommunitiesStore store
required property var permissionsModel
required property var assetsModel
required property var collectiblesModel
required property var channelsModel
// name, image, color properties expected
required property var communityDetails
property int viewWidth: 560 // by design
@ -41,27 +42,25 @@ StatusScrollView {
ListModel {
id: communityItemModel
readonly property var communityData: rootStore.mainModuleInst.activeSection
Component.onCompleted: {
append({
text: communityData.name,
imageSource: communityData.image,
color: communityData.color
text: root.communityDetails.name,
imageSource: root.communityDetails.image,
color: root.communityDetails.color
})
}
}
Repeater {
model: root.rootStore.permissionsModel
model: root.permissionsModel
delegate: PermissionItem {
Layout.preferredWidth: root.viewWidth
holdingsListModel: HoldingsSelectionModel {
sourceModel: model.holdingsListModel
assetsModel: store.assetsModel
collectiblesModel: store.collectiblesModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
}
permissionType: model.permissionType
@ -70,7 +69,7 @@ StatusScrollView {
id: channelsSelectionModel
sourceModel: model.channelsListModel
channelsModel: rootStore.chatCommunitySectionModule.model
channelsModel: root.channelsModel
}
channelsListModel: channelsSelectionModel.count