feat(MintToken): Add `delete` and `retry mint` options when deploy fails

- It refactors `SettingsPageLayout`. - It adds `retry mint` and `delete` options when deploy process fails. - It renames `RemotelyDestructAlertPopup` to generic name `AlertPopup`.
2023-05-30 17:18:45 +02:00 · 2023-05-30 17:18:45 +02:00 · d4d3a6d669
parent 8ae2d29a1c
commit d4d3a6d669
13 changed files with 171 additions and 63 deletions
--- a/storybook/PagesModel.qml
+++ b/storybook/PagesModel.qml
@ -194,7 +194,7 @@ ListModel {
         section: "Popups"
    }
    ListElement {
-         title: "RemotelyDestructAlertPopup"
+         title: "AlertPopup"
         section: "Popups"
    }
    ListElement {
--- a/storybook/pages/RemotelyDestructAlertPopupPage.qml
+++ b/storybook/pages/RemotelyDestructAlertPopupPage.qml
@ -29,14 +29,16 @@ SplitView {
                onClicked: dialog.open()
            }

-            RemotelyDestructAlertPopup {
+            AlertPopup {
                id: dialog

                anchors.centerIn: parent
-                tokenCount: 12
+                title: qsTr("Remotely destruct %n token(s)", "", 12)
+                acceptBtnText: qsTr("Remotely destruct")
+                alertText: qsTr("Continuing will destroy tokens held by members and revoke any perissions they given. To undo you will have to issue them new tokens.")

-                onRemotelyDestructClicked: logs.logEvent("RemotelyDestructAlertPopup::onRemotelyDestructClicked")
-                onCancelClicked: logs.logEvent("RemotelyDestructAlertPopup::onCancelClicked")
+                onAcceptClicked: logs.logEvent("AlertPopup::onAcceptClicked")
+                onCancelClicked: logs.logEvent("AlertPopup::onCancelClicked")

            }
        }
--- a/storybook/pages/CommunityMintTokensSettingsPanelPage.qml
+++ b/storybook/pages/CommunityMintTokensSettingsPanelPage.qml
@ -37,6 +37,8 @@ SplitView {
            accounts: WalletAccountsModel {}

            onMintCollectible: logs.logEvent("CommunityMintTokensSettingsPanel::mintCollectible")
+            onMintAsset: logs.logEvent("CommunityMintTokensSettingsPanel::mintAssets")
+            onDeleteToken: logs.logEvent("CommunityMintTokensSettingsPanel::deleteToken: " + key)
        }
    }

--- a/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
+++ b/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
@ -92,4 +92,4 @@ community_welcome_screen_subtitle = {"container": statusDesktop_mainWindow, "obj
 community_welcome_screen_checkList_element1 = {"container": statusDesktop_mainWindow, "objectName": "checkListText_0", "type": "StatusBaseText", "visible": True}
 community_welcome_screen_checkList_element2 = {"container": statusDesktop_mainWindow, "objectName": "checkListText_1", "type": "StatusBaseText", "visible": True}
 community_welcome_screen_checkList_element3 = {"container": statusDesktop_mainWindow, "objectName": "checkListText_2", "type": "StatusBaseText", "visible": True}
-community_welcome_screen_add_new_item = {"container": statusDesktop_mainWindow, "objectName": "addNewItemActionButton", "type": "StatusButton", "visible": True}
+community_welcome_screen_add_new_item = {"container": statusDesktop_mainWindow, "objectName": "primaryHeaderButton", "type": "StatusButton", "visible": True}
--- a/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml
+++ b/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml
@ -16,16 +16,15 @@ Item {
    property alias title: itemHeader.text
    property Component content

-
    // optional
    property Component footer
    property bool dirty: false
    property bool editable: false
-    property bool headerButtonVisible: false
-    property string headerButtonText: ""
-    property int headerWidth: 0
+    property int headerWidth: d.defaultContentWidth
    property string previousPageName: ""
    property bool saveChangesButtonEnabled: !!root.contentItem && !!root.contentItem.saveChangesButtonEnabled
+    property alias primaryHeaderButton: primaryHeaderBtn
+    property alias secondaryHeaderButton: secondaryHeaderBtn
    property alias saveChangesText: settingsDirtyToastMessage.saveChangesText
    property alias cancelChangesText: settingsDirtyToastMessage.cancelChangesText
    property alias changesDetectedText: settingsDirtyToastMessage.changesDetectedText
@ -38,7 +37,15 @@ Item {

    signal saveChangesClicked
    signal resetChangesClicked
-    signal headerButtonClicked
+    signal primaryHeaderButtonClicked
+    signal secondaryHeaderButtonClicked
+
+    QtObject {
+        id: d
+
+        readonly property int leftMargin: 64
+        readonly property int defaultContentWidth: 560
+    }

    function reloadContent() {
        contentLoader.active = false
@ -49,28 +56,29 @@ Item {
        settingsDirtyToastMessage.notifyDirty()
    }

-    implicitWidth: layout.implicitWidth
    implicitHeight: layout.implicitHeight
+    implicitWidth: layout.implicitWidth

    ColumnLayout {
        id: layout

        anchors.fill: parent
+        anchors.bottomMargin: 24
        spacing: 16

        RowLayout {
-            Layout.maximumWidth: root.headerWidth === 0 ? parent.width : (root.headerWidth + itemHeader.Layout.leftMargin)
-            Layout.preferredHeight: 56
+            Layout.leftMargin: d.leftMargin
+            Layout.maximumWidth: root.headerWidth
+            Layout.maximumHeight: 44
+
+            spacing: 9

            RowLayout {
                Layout.alignment: Qt.AlignVCenter
-                Layout.fillWidth: true

                StatusBaseText {
                    id: itemHeader

-                    Layout.leftMargin: 64
-
                    color: Theme.palette.directColor1
                    font.pixelSize: 26
                    font.bold: true
@ -87,22 +95,40 @@ Item {
                }
            }

+            // Filler
+            Item {
+                Layout.fillWidth: true
+            }
+
            StatusButton {
-                objectName: "addNewItemActionButton"
-                visible: root.headerButtonVisible
-                text: root.headerButtonText
-                Layout.preferredHeight: 44
-                Layout.alignment: Qt.AlignHCenter
-                onClicked: root.headerButtonClicked()
+                id: secondaryHeaderBtn
+
+                Layout.fillHeight: true
+
+                objectName: "secondaryHeaderButton"
+                visible: false
+
+                onClicked: root.secondaryHeaderButtonClicked()
+            }
+
+            StatusButton {
+                id: primaryHeaderBtn
+
+                Layout.fillHeight: true
+
+                objectName: "primaryHeaderButton"
+                visible: false
+
+                onClicked: root.primaryHeaderButtonClicked()
            }
        }

        Loader {
            id: contentLoader
+
            Layout.fillWidth: true
            Layout.fillHeight: true
-            Layout.topMargin: 16
-            Layout.leftMargin: 64
+            Layout.leftMargin: d.leftMargin
            Layout.rightMargin: 24

            sourceComponent: root.content
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml
@ -58,20 +58,18 @@ SettingsPageLayout {
            name: d.welcomeViewState
            PropertyChanges {target: root; title: d.welcomePageTitle}
            PropertyChanges {target: root; previousPageName: ""}
-            PropertyChanges {target: root; headerButtonVisible: true}
-            PropertyChanges {target: root; headerButtonText: qsTr("New Airdrop")}
-            PropertyChanges {target: root; headerWidth: root.viewWidth}
+            PropertyChanges {target: root; primaryHeaderButton.visible: true}
+            PropertyChanges {target: root; primaryHeaderButton.text: qsTr("New Airdrop")}
        },
        State {
            name: d.newAirdropViewState
            PropertyChanges {target: root; title: d.newAirdropViewPageTitle}
            PropertyChanges {target: root; previousPageName: d.welcomePageTitle}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
        }
    ]

-    onHeaderButtonClicked: stackManager.push(d.newAirdropViewState, newAirdropView, null, StackView.Immediate)
+    onPrimaryHeaderButtonClicked: stackManager.push(d.newAirdropViewState, newAirdropView, null, StackView.Immediate)

    StackViewStates {
        id: stackManager
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
@ -80,6 +80,10 @@ SettingsPageLayout {

    signal airdropCollectible(string tokenKey)

+    signal deleteToken(string tokenKey)
+
+    signal retryMintToken(string tokenKey)
+
    function setFeeLoading() {
        root.isFeeLoading = true
        root.feeText = ""
@ -124,6 +128,8 @@ SettingsPageLayout {

        signal airdropClicked()

+        signal retryMintClicked()
+
        function updateInitialStackView() {
            if(stackManager.stackView) {
                if(initialItem === welcomeView)
@ -134,6 +140,8 @@ SettingsPageLayout {
        }
    }

+    secondaryHeaderButton.type: StatusBaseButton.Type.Danger
+
    content: StackView {
        anchors.fill: parent
        initialItem: d.initialItem
@ -148,33 +156,42 @@ SettingsPageLayout {
            PropertyChanges {target: root; title: d.welcomePageTitle}
            PropertyChanges {target: root; subTitle: ""}
            PropertyChanges {target: root; previousPageName: ""}
-            PropertyChanges {target: root; headerButtonVisible: true}
-            PropertyChanges {target: root; headerButtonText: d.newTokenButtonText}
-            PropertyChanges {target: root; headerWidth: root.viewWidth}
+            PropertyChanges {target: root; primaryHeaderButton.visible: true}
+            PropertyChanges {target: root; primaryHeaderButton.text: d.newTokenButtonText}
+            PropertyChanges {target: root; secondaryHeaderButton.visible: false}
        },
        State {
            name: d.newTokenViewState
            PropertyChanges {target: root; subTitle: ""}
            PropertyChanges {target: root; previousPageName: d.backButtonText}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
+            PropertyChanges {target: root; secondaryHeaderButton.visible: false}
        },
        State {
            name: d.previewTokenViewState
            PropertyChanges {target: root; previousPageName: d.backButtonText}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
+            PropertyChanges {target: root; secondaryHeaderButton.visible: false}
        },
        State {
            name: d.tokenViewState
            PropertyChanges {target: root; previousPageName: d.backButtonText}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
            PropertyChanges {target: root; footer: mintTokenFooter}
        }
    ]

-    onHeaderButtonClicked: stackManager.push(d.newTokenViewState, newTokenView, null, StackView.Immediate)
+    onPrimaryHeaderButtonClicked: {
+        if(root.state == d.initialViewState)
+            stackManager.push(d.newTokenViewState, newTokenView, null, StackView.Immediate)
+        if(root.state == d.tokenViewState)
+            d.retryMintClicked()
+    }
+
+    onSecondaryHeaderButtonClicked: {
+        if(root.state == d.tokenViewState)
+            deleteTokenAlertPopup.open()
+    }

    StackViewStates {
        id: stackManager
@ -421,10 +438,16 @@ SettingsPageLayout {
                }
            }

-            RemotelyDestructAlertPopup {
+            AlertPopup {
                id: alertPopup

-                onRemotelyDestructClicked: {
+                property int tokenCount
+
+                title: qsTr("Remotely destruct %n token(s)", "", tokenCount)
+                acceptBtnText: qsTr("Remotely destruct")
+                alertText: qsTr("Continuing will destroy tokens held by members and revoke any permissions they are given. To undo you will have to issue them new tokens.")
+
+                onAcceptClicked: {
                    signTransactionPopup.isRemotelyDestructTransaction = true
                    signTransactionPopup.open()
                }
@ -501,6 +524,15 @@ SettingsPageLayout {
                                  },
                                  StackView.Immediate)
            }
+
+            Connections {
+                target: d
+
+                function onRetryMintClicked() {
+                    root.retryMintToken(d.tokenKey)
+                    stackManager.clear(d.initialViewState, StackView.Immediate)
+                }
+            }
        }
    }

@ -527,6 +559,30 @@ SettingsPageLayout {
                restoreMode: Binding.RestoreBindingOrValue
            }

+            Binding {
+                target: root
+                property: "primaryHeaderButton.visible"
+                value: view.deployState === Constants.ContractTransactionStatus.Failed
+            }
+
+            Binding {
+                target: root
+                property: "primaryHeaderButton.text"
+                value: (view.deployState === Constants.ContractTransactionStatus.Failed) ? qsTr("Retry mint") : ""
+            }
+
+            Binding {
+                target: root
+                property: "secondaryHeaderButton.visible"
+                value: view.deployState === Constants.ContractTransactionStatus.Failed
+            }
+
+            Binding {
+                target: root
+                property: "secondaryHeaderButton.text"
+                value: (view.deployState === Constants.ContractTransactionStatus.Failed) ? qsTr("Delete") : ""
+            }
+
            Binding {
                target: d
                property: "tokenOwnersModel"
@ -602,4 +658,19 @@ SettingsPageLayout {
            }
        }
    }
+
+    AlertPopup {
+        id: deleteTokenAlertPopup
+
+        width: 521
+        title: qsTr("Delete %1").arg(root.title)
+        acceptBtnText: qsTr("Delete %1 token").arg(root.title)
+        alertText: qsTr("%1 is not yet minted, are you sure you want to delete it? All data associated with this token including its icon and description will be permanently deleted.").arg(root.title)
+
+        onAcceptClicked: {
+            root.deleteToken(d.tokenKey)
+            stackManager.clear(d.initialViewState, StackView.Immediate)
+        }
+        onCancelClicked: close()
+    }
 }
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml
@ -97,38 +97,34 @@ SettingsPageLayout {
            PropertyChanges {target: root; title: qsTr("Permissions")}
            PropertyChanges {target: root; previousPageName: ""}
            PropertyChanges {target: root; content: welcomeView}
-            PropertyChanges {target: root; headerButtonVisible: true}
-            PropertyChanges {target: root; headerButtonText: qsTr("Add new permission")}
-            PropertyChanges {target: root; headerWidth: root.viewWidth}
+            PropertyChanges {target: root; primaryHeaderButton.visible: true}
+            PropertyChanges {target: root; primaryHeaderButton.text: qsTr("Add new permission")}
        },
        State {
            name: d.newPermissionViewState
            PropertyChanges {target: root; title: qsTr("New permission")}
            PropertyChanges {target: root; previousPageName: qsTr("Permissions")}
            PropertyChanges {target: root; content: newPermissionView}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
        },
        State {
            name: d.permissionsViewState
            PropertyChanges {target: root; title: qsTr("Permissions")}
            PropertyChanges {target: root; previousPageName: ""}
            PropertyChanges {target: root; content: permissionsView}
-            PropertyChanges {target: root; headerButtonVisible: true}
-            PropertyChanges {target: root; headerButtonText: qsTr("Add new permission")}
-            PropertyChanges {target: root; headerWidth: root.viewWidth}
+            PropertyChanges {target: root; primaryHeaderButton.visible: true}
+            PropertyChanges {target: root; primaryHeaderButton.text: qsTr("Add new permission")}
        },
        State {
            name: d.editPermissionViewState
            PropertyChanges {target: root; title: qsTr("Edit permission")}
            PropertyChanges {target: root; previousPageName: qsTr("Permissions")}
            PropertyChanges {target: root; content: newPermissionView}
-            PropertyChanges {target: root; headerButtonVisible: false}
-            PropertyChanges {target: root; headerWidth: 0}
+            PropertyChanges {target: root; primaryHeaderButton.visible: false}
        }
    ]

-    onHeaderButtonClicked: {
+    onPrimaryHeaderButtonClicked: {
        if(root.state === d.welcomeViewState || root.state === d.permissionsViewState) {
            d.initializeData()
            root.state = d.newPermissionViewState
--- a/ui/app/AppLayouts/Chat/popups/community/RemotelyDestructAlertPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/RemotelyDestructAlertPopup.qml
@ -15,17 +15,18 @@ import utils 1.0
 StatusDialog {
    id: root

-    property int tokenCount: 0
+    property alias acceptBtnText: acceptBtn.text
+    property alias alertText: contentTextItem.text

-    signal remotelyDestructClicked
+    signal acceptClicked
    signal cancelClicked

-    title: qsTr("Remotely destruct %n token(s)", "", root.tokenCount)
    implicitWidth: 400 // by design
    topPadding: Style.current.padding
    bottomPadding: topPadding
    contentItem: StatusBaseText {
-        text: qsTr("Continuing will destroy tokens held by members and revoke any perissions they given. To undo you will have to issue them new tokens.")
+        id: contentTextItem
+
        font.pixelSize: Style.current.primaryTextFontSize
        wrapMode: Text.WordWrap
        lineHeight: 1.2
@ -46,11 +47,12 @@ StatusDialog {
            }

            StatusButton {
-                text: qsTr("Remotely destruct")
+                id: acceptBtn
+
                type: StatusBaseButton.Type.Danger

                onClicked: {
-                    root.remotelyDestructClicked()
+                    root.acceptClicked()
                    close()
                }
            }
--- a/ui/app/AppLayouts/Chat/popups/community/qmldir
+++ b/ui/app/AppLayouts/Chat/popups/community/qmldir
@ -1,6 +1,6 @@
+AlertPopup 1.0 AlertPopup.qml
 BurnTokensPopup 1.0 BurnTokensPopup.qml
 CreateChannelPopup 1.0 CreateChannelPopup.qml
 CommunityTokenPermissionsPopup 1.0 CommunityTokenPermissionsPopup.qml
 RemotelyDestructPopup 1.0 RemotelyDestructPopup.qml
-RemotelyDestructAlertPopup 1.0 RemotelyDestructAlertPopup.qml
 SignTokenTransactionsPopup 1.0 SignTokenTransactionsPopup.qml
--- a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
+++ b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
@ -343,6 +343,8 @@ StatusSectionLayout {
                onSignBurnTransactionOpened: communityTokensStore.computeBurnFee(chainId)
                onBurnCollectibles: communityTokensStore.burnCollectibles(tokenKey, amount)
                onAirdropCollectible: root.goTo(Constants.CommunitySettingsSections.Airdrops)
+                onDeleteToken: communityTokensStore.deleteToken(root.community.id, tokenKey)
+                onRetryMintToken: communityTokensStore.retryMintToken(root.community.id, tokenKey)

                Connections {
                    target: rootStore.communityTokensStore
@ -478,7 +480,7 @@ StatusSectionLayout {

                    function onAirdropCollectible(key) {
                        // Here it is forced a navigation to the new airdrop form, like if it was clicked the header button
-                        airdropPanel.headerButtonClicked()
+                        airdropPanel.primaryHeaderButtonClicked()

                        // Force a token selection to be airdroped with default amount 1
                        airdropPanel.selectCollectible(key, 1)
--- a/ui/app/AppLayouts/Chat/views/communities/CommunityWelcomeSettingsView.qml
+++ b/ui/app/AppLayouts/Chat/views/communities/CommunityWelcomeSettingsView.qml
@ -16,7 +16,8 @@ StatusScrollView {

    property int imageWidth: 256
    property int imageHeigth: root.imageWidth
-
+    
+    padding: 0

    ColumnLayout {
        id: mainLayout
--- a/ui/imports/shared/stores/CommunityTokensStore.qml
+++ b/ui/imports/shared/stores/CommunityTokensStore.qml
@ -42,6 +42,14 @@ QtObject {
        console.log("TODO: Deploy Asset backend!")
    }

+    function deleteToken(communityId, contractUniqueKey) {
+        console.log("TODO: Delete token bakend!")
+    }
+
+    function retryMintToken(communityId, contractUniqueKey) {
+        console.log("TODO: Retry mint token bakend!")
+    }
+
    readonly property Connections connections: Connections {
      target: communityTokensModuleInst
      function onDeployFeeUpdated(ethCurrency, fiatCurrency, errorCode) {