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

feat(MintTokens): Added validation rules in `CommunityNewCollectiblesView` page 

Added new validation rules for name, description, symbol, supply and decimal fields according to new design.

Closes #10623
This commit is contained in:
Noelia 2023-05-22 17:47:06 +02:00 committed by Noelia
parent 6abb9f0063
commit dbc3effe94
3 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storybook/pages/CommunityNewCollectibleViewPage.qml
View File

@ -33,6 +33,7 @@ SplitView {
enabledNetworks: NetworksModel.enabledNetworks enabledNetworks: NetworksModel.enabledNetworks
allNetworks: enabledNetworks allNetworks: enabledNetworks
accounts: WalletAccountsModel {} accounts: WalletAccountsModel {}
tokensModel: MintedCollectiblesModel.mintedCollectibleModel
onPreviewClicked: logs.logEvent("CommunityNewCollectibleView::previewClicked") onPreviewClicked: logs.logEvent("CommunityNewCollectibleView::previewClicked")
} }

73
ui/app/AppLayouts/Chat/views/communities/CommunityNewCollectibleView.qml
View File

@ -6,10 +6,11 @@ import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1 import StatusQ.Controls 0.1
import StatusQ.Controls.Validators 0.1 import StatusQ.Controls.Validators 0.1
import StatusQ.Components 0.1 import StatusQ.Components 0.1
import StatusQ.Core.Utils 0.1 import StatusQ.Core.Utils 0.1 as SQUtils
import utils 1.0 import utils 1.0
import AppLayouts.Wallet.controls 1.0 import AppLayouts.Wallet.controls 1.0
import shared.panels 1.0 import shared.panels 1.0
import shared.popups 1.0 import shared.popups 1.0
@ -31,6 +32,7 @@ StatusScrollView {
property int chainId property int chainId
property string chainName property string chainName
property string chainIcon property string chainIcon
property var tokensModel
// Collectible properties // Collectible properties
readonly property alias notTransferable: transferableChecker.checked readonly property alias notTransferable: transferableChecker.checked
@ -59,14 +61,13 @@ StatusScrollView {
id: d id: d
readonly property bool isFullyFilled: root.artworkSource.toString().length > 0 readonly property bool isFullyFilled: root.artworkSource.toString().length > 0
&& !!root.name && nameInput.valid
&& !!root.symbol && descriptionInput.valid
&& !!root.description && symbolInput.valid
&& (root.infiniteSupply || (!root.infiniteSupply && root.supplyAmount > 0) && (root.infiniteSupply || (!root.infiniteSupply && root.supplyAmount > 0))
&& (d.isAssetView && assetDecimalsInput.valid)) && (!root.isAssetView || (root.isAssetView&& assetDecimalsInput.valid))
readonly property int imageSelectorRectWidth: root.isAssetView ? 128 : 290
readonly property int imageSelectorRectWidth: d.isAssetView ? 128 : 290
} }
contentWidth: mainLayout.width contentWidth: mainLayout.width
@ -89,13 +90,13 @@ StatusScrollView {
id: dropAreaItem id: dropAreaItem
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: d.imageSelectorRectWidth Layout.preferredHeight: d.imageSelectorRectWidth
editorAnchorLeft: !d.isAssetView editorAnchorLeft: !root.isAssetView
editorRoundedImage: d.isAssetView editorRoundedImage: root.isAssetView
uploadTextLabel.uploadText: d.isAssetView ? qsTr("Upload") : qsTr("Drag and Drop or Upload Artwork") uploadTextLabel.uploadText: root.isAssetView ? qsTr("Upload") : qsTr("Drag and Drop or Upload Artwork")
uploadTextLabel.additionalText: qsTr("Images only") uploadTextLabel.additionalText: qsTr("Images only")
uploadTextLabel.showAdditionalInfo: !d.isAssetView uploadTextLabel.showAdditionalInfo: !root.isAssetView
editorTitle: qsTr("Collectible artwork") editorTitle: root.isAssetView ? qsTr("Asset icon") : qsTr("Collectible artwork")
acceptButtonText: qsTr("Upload collectible artwork") acceptButtonText: root.isAssetView ? qsTr("Upload asset icon") : qsTr("Upload collectible artwork")
} }
CustomStatusInput { CustomStatusInput {
@ -104,7 +105,10 @@ StatusScrollView {
label: qsTr("Name") label: qsTr("Name")
charLimit: 15 charLimit: 15
placeholderText: qsTr("Name") placeholderText: qsTr("Name")
errorText: d.isAssetView ? qsTr("Asset name") : qsTr("Collectible name") minLengthValidator.errorMessage: qsTr("Please name your token name (use A-Z and 0-9, hyphens and underscores only)")
regexValidator.errorMessage: qsTr("Your token name contains invalid characters (use A-Z and 0-9, hyphens and underscores only)")
extraValidator.validate: function (value) { return !SQUtils.ModelUtils.contains(root.tokensModel, "name", nameInput.text) }
extraValidator.errorMessage: qsTr("You have used this token name before")
} }
CustomStatusInput { CustomStatusInput {
@ -118,7 +122,9 @@ StatusScrollView {
input.placeholder.verticalAlignment: Qt.AlignTop input.placeholder.verticalAlignment: Qt.AlignTop
minimumHeight: 108 minimumHeight: 108
maximumHeight: minimumHeight maximumHeight: minimumHeight
errorText: d.isAssetView ? qsTr("Asset description") : qsTr("Collectible description") minLengthValidator.errorMessage: qsTr("Please enter a token description")
regexValidator.regularExpression: Constants.regularExpressions.asciiPrintable
regexValidator.errorMessage: qsTr("Only A-Z, 0-9 and standard punctuation allowed")
} }
CustomStatusInput { CustomStatusInput {
@ -127,8 +133,11 @@ StatusScrollView {
label: qsTr("Symbol") label: qsTr("Symbol")
charLimit: 6 charLimit: 6
placeholderText: qsTr("e.g. DOODLE") placeholderText: qsTr("e.g. DOODLE")
errorText: d.isAssetView ? qsTr("Asset symbol") :qsTr("Collectible symbol") minLengthValidator.errorMessage: qsTr("Please enter your token symbol (use A-Z only)")
validator.regularExpression: Constants.regularExpressions.asciiPrintable regexValidator.errorMessage: qsTr("Your token symbol contains invalid characters (use A-Z only)")
regexValidator.regularExpression: Constants.regularExpressions.capitalOnly
extraValidator.validate: function (value) { return !SQUtils.ModelUtils.contains(root.tokensModel, "symbol", symbolInput.text) }
extraValidator.errorMessage: qsTr("You have used this token symbol before")
} }
CustomLabelDescriptionComponent { CustomLabelDescriptionComponent {
@ -165,13 +174,17 @@ StatusScrollView {
onCheckedChanged: if(!checked) supplyInput.forceActiveFocus() onCheckedChanged: if(!checked) supplyInput.forceActiveFocus()
} }
StatusInput { CustomStatusInput {
id: supplyInput id: supplyInput
visible: !unlimitedSupplyChecker.checked visible: !unlimitedSupplyChecker.checked
label: qsTr("Total finite supply") label: qsTr("Total finite supply")
placeholderText: qsTr("e.g. 300") placeholderText: qsTr("e.g. 300")
validators: StatusIntValidator{bottom: 1; top: 999999999;} minLengthValidator.errorMessage: qsTr("Please enter a total finite supply")
regexValidator.errorMessage: qsTr("Your total finite supply contains invalid characters (use 0-9 only)")
regexValidator.regularExpression: Constants.regularExpressions.numerical
extraValidator.validate: function (value) { return parseInt(value) > 0 && parseInt(value) <= 999999999 }
extraValidator.errorMessage: qsTr("Enter a number between 0 and 999,999,999")
} }
CustomSwitchRowComponent { CustomSwitchRowComponent {
@ -201,8 +214,10 @@ StatusScrollView {
charLimitLabel: qsTr("Max 10") charLimitLabel: qsTr("Max 10")
placeholderText: "2" placeholderText: "2"
text: "2" // Default value text: "2" // Default value
validators: StatusIntValidator{ bottom: 1; top: 10; }
validationMode: StatusInput.ValidationMode.Always validationMode: StatusInput.ValidationMode.Always
minLengthValidator.errorMessage: qsTr("Please enter how many decimals your token should have")
regexValidator.errorMessage: qsTr("Your decimal amount contains invalid characters (use 0-9 only)")
regexValidator.regularExpression: Constants.regularExpressions.numerical
} }
StatusButton { StatusButton {
@ -222,20 +237,22 @@ StatusScrollView {
component CustomStatusInput: StatusInput { component CustomStatusInput: StatusInput {
id: customInput id: customInput
property string errorText property alias minLengthValidator: minLengthValidatorItem
property alias validator: regexValidator property alias regexValidator: regexValidatorItem
property alias extraValidator: extraValidatorItem
Layout.fillWidth: true Layout.fillWidth: true
validators: [ validators: [
StatusMinLengthValidator { StatusMinLengthValidator {
id: minLengthValidatorItem
minLength: 1 minLength: 1
errorMessage: Utils.getErrorMessage(customInput.errors,
customInput.errorText)
}, },
StatusRegularExpressionValidator { StatusRegularExpressionValidator {
id: regexValidator id: regexValidatorItem
regularExpression: Constants.regularExpressions.ascii regularExpression: Constants.regularExpressions.alphanumerical
errorMessage: Constants.errorMessages.asciiRegExp },
StatusValidator {
id: extraValidatorItem
} }
] ]
} }

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

@ -596,7 +596,8 @@ QtObject {
readonly property var alphanumericalExpanded: /^$|^[a-zA-Z0-9\-_ ]+$/ readonly property var alphanumericalExpanded: /^$|^[a-zA-Z0-9\-_ ]+$/
readonly property var asciiPrintable: /^$|^[!-~]+$/ readonly property var asciiPrintable: /^$|^[!-~]+$/
readonly property var ascii: /^$|^[\x00-\x7F]+$/ readonly property var ascii: /^$|^[\x00-\x7F]+$/
readonly property var numerical: /^\d+$/ readonly property var capitalOnly: /^$|^[A-Z]+$/
readonly property var numerical: /^$|^[0-9]+$/
} }
readonly property QtObject errorMessages: QtObject { readonly property QtObject errorMessages: QtObject {