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: Save profile identity in one json (#13937)

This commit is contained in:
Mikhail Rogachev 2024-03-13 10:46:40 +01:00 committed by GitHub
parent 7f78c03e6a
commit 611d70a3b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 87 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/modules/main/profile_section/profile/io_interface.nim
View File

@ -10,7 +10,7 @@ import models/profile_preferences_account_item
import models/profile_preferences_collectible_item
import models/profile_preferences_asset_item
import models/showcase_save_data
import models/profile_save_data
type
AccessInterface* {.pure inheritable.} = ref object of RootObj
@ -31,12 +31,6 @@ method getModuleAsVariant*(self: AccessInterface): QVariant {.base.} =
method getCollectiblesModel*(self: AccessInterface): QVariant {.base.} =
raise newException(ValueError, "No implementation available")
method storeIdentityImage*(self: AccessInterface, imageUrl: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method deleteIdentityImage*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method getBio*(self: AccessInterface): string {.base.} =
raise newException(ValueError, "No implementation available")
@ -55,6 +49,9 @@ method saveSocialLinks*(self: AccessInterface) {.base.} =
method onSocialLinksUpdated*(self: AccessInterface, socialLinks: SocialLinks, error: string) {.base.} =
raise newException(ValueError, "No implementation available")
method saveProfileIdentityInfo*(self: AccessInterface, identity: IdentitySaveData) {.base.} =
raise newException(ValueError, "No implementation available")
method saveProfileShowcasePreferences*(self: AccessInterface, showcase: ShowcaseSaveData) {.base.} =
raise newException(ValueError, "No implementation available")

29
src/app/modules/main/profile_section/profile/models/showcase_save_data.nim → src/app/modules/main/profile_section/profile/models/profile_save_data.nim
View File

@ -23,6 +23,18 @@ type ShowcaseSaveData* = ref object of RootObj
assets*: seq[ShowcaseSaveEntry]
socialLinks*: seq[ShowcaseSaveSocialLink]
type IdentityImage* = ref object of RootObj
source*: string
aX*: int
aY*: int
bX*: int
bY*: int
type IdentitySaveData* = ref object of RootObj
displayName*: string
bio*: string
image*: IdentityImage
proc toShowcaseSaveEntry*(jsonObj: JsonNode): ShowcaseSaveEntry =
result = ShowcaseSaveEntry()
discard jsonObj.getProp("showcaseKey", result.showcaseKey)
@ -57,3 +69,20 @@ proc toShowcaseSaveData*(jsonObj: JsonNode): ShowcaseSaveData =
result.collectibles = toShowcaseSaveEntries(jsonObj, "collectibles")
result.assets = toShowcaseSaveEntries(jsonObj, "assets")
result.socialLinks = toShowcaseSaveSocialLinks(jsonObj)
proc toIdentityImage*(jsonObj: JsonNode): IdentityImage =
result = IdentityImage()
discard jsonObj.getProp("source", result.source)
discard jsonObj.getProp("aX", result.aX)
discard jsonObj.getProp("aY", result.aY)
discard jsonObj.getProp("bX", result.bX)
discard jsonObj.getProp("bY", result.bY)
proc toIdentitySaveData*(jsonObj: JsonNode): IdentitySaveData =
result = IdentitySaveData()
discard jsonObj.getProp("displayName", result.displayName)
discard jsonObj.getProp("bio", result.bio)
if jsonObj{"image"} != nil and jsonObj{"image"}.kind != JNull:
result.image = jsonObj{"image"}.toIdentityImage()
else:
result.image = nil

73
src/app/modules/main/profile_section/profile/module.nim
View File

@ -27,7 +27,7 @@ import models/profile_preferences_asset_item
import models/showcase_preferences_generic_model
import models/showcase_preferences_social_links_model
import models/showcase_save_data
import models/profile_save_data
import backend/collectibles as backend_collectibles
@ -96,24 +96,9 @@ method viewDidLoad*(self: Module) =
self.moduleLoaded = true
self.delegate.profileModuleDidLoad()
method storeIdentityImage*(self: Module, imageUrl: string, aX: int, aY: int, bX: int, bY: int) =
let keyUid = singletonInstance.userProfile.getKeyUid()
let image = singletonInstance.utils.formatImagePath(imageUrl)
self.controller.storeIdentityImage(keyUid, image, aX, aY, bX, bY)
method deleteIdentityImage*(self: Module) =
let keyUid = singletonInstance.userProfile.getKeyUid()
self.controller.deleteIdentityImage(keyUid)
method setDisplayName*(self: Module, displayName: string) =
self.controller.setDisplayName(displayName)
method getBio(self: Module): string =
self.controller.getBio()
method setBio(self: Module, bio: string) =
discard self.controller.setBio(bio)
method onBioChanged*(self: Module, bio: string) =
self.view.emitBioChangedSignal()
@ -133,44 +118,30 @@ method getProfileShowcaseSocialLinksLimit*(self: Module): int =
method getProfileShowcaseEntriesLimit*(self: Module): int =
return self.controller.getProfileShowcaseEntriesLimit()
# TODO: remove old save api
method storeProfileShowcasePreferences(self: Module,
communities: seq[ProfileShowcaseCommunityItem],
accounts: seq[ProfileShowcaseAccountItem],
collectibles: seq[ProfileShowcaseCollectibleItem],
assets: seq[ProfileShowcaseAssetItem]) =
if self.presentedPublicKey != singletonInstance.userProfile.getPubKey():
error "Attempt to save preferences with wrong public key"
return
var revealedAddresses: seq[string]
for acc in accounts:
if acc.showcaseVisibility != ProfileShowcaseVisibility.ToNoOne:
revealedAddresses.add(acc.address)
var verifiedTokens: seq[ProfileShowcaseVerifiedTokenPreference] = @[]
var unverifiedTokens: seq[ProfileShowcaseUnverifiedTokenPreference] = @[]
for asset in assets:
# TODO: more obvious way to check if it is verified or not
if asset.communityId == "":
verifiedTokens.add(asset.toShowcaseVerifiedTokenPreference())
else:
unverifiedTokens.add(asset.toShowcaseUnverifiedTokenPreference())
self.controller.storeProfileShowcasePreferences(ProfileShowcasePreferencesDto(
communities: communities.map(item => item.toShowcasePreferenceItem()),
accounts: accounts.map(item => item.toShowcasePreferenceItem()),
collectibles: collectibles.map(item => item.toShowcasePreferenceItem()),
verifiedTokens: verifiedTokens,
unverifiedTokens: unverifiedTokens
),
revealedAddresses
)
method setIsFirstShowcaseInteraction(self: Module) =
singletonInstance.localAccountSettings.setIsFirstShowcaseInteraction(false)
proc storeIdentityImage*(self: Module, identityImage: IdentityImage) =
let keyUid = singletonInstance.userProfile.getKeyUid()
let image = singletonInstance.utils.formatImagePath(identityImage.source)
# FIXME the function to get the file size is messed up
# let size = image_getFileSize(image)
# TODO find a way to i18n this (maybe send just a code and then QML sets the right string)
# return "Max file size is 20MB"
self.controller.storeIdentityImage(keyUid, image, identityImage.aX, identityImage.aY, identityImage.bX, identityImage.bY)
proc deleteIdentityImage*(self: Module) =
let keyUid = singletonInstance.userProfile.getKeyUid()
self.controller.deleteIdentityImage(keyUid)
method saveProfileIdentityInfo*(self: Module, identity: IdentitySaveData) =
self.controller.setDisplayName(identity.displayName)
discard self.controller.setBio(identity.bio)
if identity.image != nil:
self.storeIdentityImage(identity.image)
else:
self.deleteIdentityImage()
method saveProfileShowcasePreferences*(self: Module, showcase: ShowcaseSaveData) =
# TODO: remove this check within old api
if self.presentedPublicKey != singletonInstance.userProfile.getPubKey():

34
src/app/modules/main/profile_section/profile/view.nim
View File

@ -14,7 +14,7 @@ import models/profile_preferences_collectible_item
import models/profile_preferences_assets_model
import models/profile_preferences_asset_item
import models/showcase_save_data
import models/profile_save_data
import models/showcase_preferences_generic_model
import models/showcase_preferences_social_links_model
@ -106,21 +106,6 @@ QtObject:
proc load*(self: View) =
self.delegate.viewDidLoad()
proc upload*(self: View, imageUrl: string, aX: int, aY: int, bX: int, bY: int): string {.slot.} =
# var image = singletonInstance.utils.formatImagePath(imageUrl)
# FIXME the function to get the file size is messed up
# var size = image_getFileSize(image)
# TODO find a way to i18n this (maybe send just a code and then QML sets the right string)
# return "Max file size is 20MB"
self.delegate.storeIdentityImage(imageUrl, aX, aY, bX, bY)
proc remove*(self: View): string {.slot.} =
self.delegate.deleteIdentityImage()
proc setDisplayName(self: View, displayName: string) {.slot.} =
self.delegate.setDisplayName(displayName)
proc socialLinksModel*(self: View): SocialLinksModel =
return self.socialLinksModel
@ -209,9 +194,6 @@ QtObject:
read = getBio
notify = bioChanged
proc setBio(self: View, bio: string) {.slot.} =
self.delegate.setBio(bio)
proc emitBioChangedSignal*(self: View) =
self.bioChanged()
@ -276,21 +258,17 @@ QtObject:
QtProperty[QVariant] showcasePreferencesSocialLinksModel:
read = getProfileShowcasePreferencesSocialLinksModel
# TODO: remove old save preferences api
proc storeProfileShowcasePreferences(self: View) {.slot.} =
let communities = self.profileShowcaseCommunitiesModel.items()
let accounts = self.profileShowcaseAccountsModel.items()
let collectibles = self.profileShowcaseCollectiblesModel.items()
let assets = self.profileShowcaseAssetsModel.items()
self.delegate.storeProfileShowcasePreferences(communities, accounts, collectibles, assets)
proc clearModels*(self: View) {.slot.} =
self.profileShowcaseCommunitiesModel.clear()
self.profileShowcaseAccountsModel.clear()
self.profileShowcaseCollectiblesModel.clear()
self.profileShowcaseAssetsModel.clear()
proc saveIdentityInfo(self: View, profileData: string) {.slot.} =
let profileDataObj = profileData.parseJson
let identityInfo = profileDataObj.toIdentitySaveData()
self.delegate.saveProfileIdentityInfo(identityInfo)
proc saveProfileShowcasePreferences(self: View, profileData: string) {.slot.} =
let profileDataObj = profileData.parseJson
let showcase = profileDataObj.toShowcaseSaveData()

42
ui/app/AppLayouts/Profile/stores/ProfileStore.qml
View File

@ -63,35 +63,19 @@ QtObject {
// Identity related:
function saveIdentityInfo(displayName, bio, source, aX, aY, bX, bY) {
// TODO: Update according to issue #13767
_setDisplayName(displayName)
_setBio(bio)
if(source)
_uploadImage(source, aX, aY, bX, bY)
else
_removeImage()
}
function _setDisplayName(displayName) {
root.profileModule.setDisplayName(displayName)
}
function _setBio(bio) {
root.profileModule.setBio(bio)
}
function _uploadImage(source, aX, aY, bX, bY) {
return root.profileModule.upload(source, aX, aY, bX, bY)
}
function _removeImage() {
return root.profileModule.remove()
}
// Preferences (Accounts, Communities, Collectibles, Assets and social links):
// TO BE REMOVED: Deprecated --> Issue #13688
function storeProfileShowcasePreferences() {
root.profileModule.storeProfileShowcasePreferences()
var identityInfo = {
"displayName": displayName,
"bio": bio,
"image": source ? {
"source": source,
"aX": aX,
"aY": aY,
"bX": bX,
"bY": bY
} : null
}
let json = JSON.stringify(identityInfo)
root.profileModule.saveIdentityInfo(json)
}
function getProfileShowcaseEntriesLimit() {

23
ui/app/AppLayouts/Profile/views/MyProfileView.qml
View File

@ -123,10 +123,10 @@ SettingsContentBase {
property bool hasAnyProfileShowcaseChanges: showcaseModels.dirty
property bool isIdentityTabDirty: (!descriptionPanel.isEnsName &&
descriptionPanel.displayName.text !== profileStore.displayName) ||
descriptionPanel.bio.text !== profileStore.bio ||
profileStore.socialLinksDirty ||
profileHeader.icon !== profileStore.profileLargeImage
descriptionPanel.displayName.text !== profileStore.displayName) ||
descriptionPanel.bio.text !== profileStore.bio ||
profileStore.socialLinksDirty ||
profileHeader.icon !== profileStore.profileLargeImage
property ProfileShowcaseModels showcaseModels: ProfileShowcaseModels {
communitiesSourceModel: root.communitiesModel
@ -156,18 +156,21 @@ SettingsContentBase {
function save() {
// Accounts, Communities, Assets, Collectibles and social links info
if (hasAnyProfileShowcaseChanges)
if (hasAnyProfileShowcaseChanges) {
root.profileStore.saveProfileShowcasePreferences(showcaseModels.buildJSONModelsCurrentState())
}
// Identity info
if(isIdentityTabDirty)
if (isIdentityTabDirty) {
root.profileStore.saveIdentityInfo(descriptionPanel.displayName.text,
descriptionPanel.bio.text.trim(),
profileHeader.icon,
profileHeader.cropRect.x.toFixed(),
profileHeader.cropRect.y.toFixed(),
(profileHeader.cropRect.x + profileHeader.cropRect.width).toFixed(),
(profileHeader.cropRect.y + profileHeader.cropRect.height).toFixed())
profileHeader.cropRect.x,
profileHeader.cropRect.y,
(profileHeader.cropRect.x + profileHeader.cropRect.width),
(profileHeader.cropRect.y + profileHeader.cropRect.height))
profileHeader.icon = Qt.binding(() => { return profileStore.profileLargeImage })
}
}
}