Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TAS-2870] ✨ Add Arweave DRM link option in edit ISCN #505

Merged
merged 1 commit into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions components/SameAsFieldList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ export default class SameAsFieldList extends Vue {
}

@Watch('urlOptions', { deep: true })
onUrlOptionsChanged(newValue: Array<any>) {
console.log('urlOptions', newValue)
onUrlOptionsChanged() {
this.setUrlList()
}

Expand Down
102 changes: 63 additions & 39 deletions pages/edit/_iscnId.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,25 @@
/>
</FormField>
<div v-if="step === 2">
<FormField
v-if="shouldShowDRMOption"
:label="$t('IscnRegisterForm.label.drm')"
class="mb-[12px]"
>
<CheckBox v-model="isUseArweaveLink">
{{ $t('IscnRegisterForm.label.drm.details') }}
</CheckBox>
</FormField>
<FormField
:label="$t('iscn.meta.content.fingerprints')"
class="mb-[12px]"
>
<ContentFingerprintLink
v-for="item in contentFingerprints"
:key="item.key"
v-for="item in contentFingerprintLinks"
:key="item"
:item="item"
:class="['mb-[8px]', 'break-all', 'text-[14px]']"
/>
<ContentFingerprintLink
v-for="(f, i) in customContentFingerprints"
:key="f + i"
:item="f"
/>
<div :class="['flex', 'mt-[12px]', 'gap-[8px]']">
<TextField v-model="contentFingerprintInput" class="w-full" />
<Button
Expand All @@ -77,7 +81,7 @@
>
<SameAsFieldList
:name="name"
:url-options="contentFingerprintOptions"
:url-options="contentFingerprintLinks"
:file-records="uploadFileRecords"
:current-list="sameAsList"
@on-update="(value) => (sameAsList = value)"
Expand All @@ -88,7 +92,7 @@

<!-- default content fingerprint -->
<div
v-else-if="contentFingerprints.length"
v-else-if="contentFingerprintLinks.length"
:class="[
'relative',
'rounded-[12px]',
Expand Down Expand Up @@ -129,13 +133,13 @@
/>
</div>
<FormField
v-if="contentFingerprints.length"
v-if="contentFingerprintLinks.length"
:label="$t('iscn.meta.content.fingerprints')"
class="mb-[12px]"
>
<ContentFingerprintLink
v-for="item in contentFingerprints"
:key="item.key"
v-for="item in contentFingerprintLinks"
:key="item"
:item="item"
:class="['mb-[8px]', 'break-all', 'text-[14px]']"
/>
Expand All @@ -147,7 +151,7 @@
>
<ContentFingerprintLink
v-for="item in sameAs"
:key="item.key"
:key="item"
:item="item"
:class="['mb-[8px]', 'break-all', 'text-[14px]']"
/>
Expand Down Expand Up @@ -294,11 +298,13 @@ export default class EditIscnPage extends Vue {
publisher: string = ''
datePublished: string = ''

isUseArweaveLink= false
shouldShowUploadSection: boolean = false
shouldShowMoreSettings: boolean = false
uploadFileRecords: any = null
uploadIpfsHashList: string[] = []
uploadArweaveIdList: string[] = []
uploadIpfsList: string[] = []
uploadArweaveLinkList: string[] = []
sameAsList: any = []

step: number = 1
Expand All @@ -310,6 +316,17 @@ export default class EditIscnPage extends Vue {

latestVersion: number | string = ''

get combinedArweaveIdList() {
return this.uploadArweaveIdList || []
}

get combinedArweaveLinks(): string[] {
if (this.isUseArweaveLink) {
return this.uploadArweaveLinkList
}
return this.combinedArweaveIdList.map((link) => this.formatArweave(link) as string)
}

get formattedSameAsList() {
if (this.sameAsList.length) {
return this.sameAsList.map(
Expand All @@ -328,31 +345,35 @@ export default class EditIscnPage extends Vue {
return Boolean(this.step === 1 && this.shouldShowUploadSection)
}

get contentFingerprintOptions() {
const array = []
if (this.uploadArweaveIdList) {
array.push(...this.uploadArweaveIdList.map((id: string) => id))
get contentFingerprintLinks() {
if (this.contentFingerprints.length) {
return this.contentFingerprints
}
const array: string[] = []
if (this.combinedArweaveLinks.length) {
array.push(...this.combinedArweaveLinks)
}
if (this.uploadIpfsList.length) {
array.push(...this.uploadIpfsList.map((ipfs) => ipfs))
if (!this.isUseArweaveLink && this.uploadIpfsHashList.length) {
array.push(...this.uploadIpfsHashList.map((ipfs) => this.formatIpfs(ipfs) as string))
}
if (this.customContentFingerprints.length) {
array.push(...this.customContentFingerprints)
}
return array
}

get shouldShowDRMOption() {
return this.uploadArweaveIdList.filter(Boolean).length
}

get payload() {
return {
...this.contentMetadata,
name: this.name,
description: this.description,
keywords: this.contentMetadata.keywords,
url: this.url,
contentFingerprints: Array.from(new Set([
...this.contentFingerprints,
...this.customContentFingerprints,
])),
contentFingerprints: this.contentFingerprintLinks,
stakeholders: this.iscnRecord?.stakeholders,
type: this.type,
usageInfo: this.license,
Expand Down Expand Up @@ -406,24 +427,24 @@ export default class EditIscnPage extends Vue {
this.contentFingerprintInput = ''
}

onSubmitUpload({ fileRecords }: { fileRecords: any[] }) {
onSubmitUpload({
fileRecords,
arweaveIds,
arweaveLinks,
}: {
fileRecords: any[]
arweaveIds: string[]
arweaveLinks: string[]
}) {
this.contentFingerprints = []
if (fileRecords && fileRecords.length) {
this.uploadFileRecords = [...fileRecords]
this.uploadIpfsList = fileRecords.map(
(file) => this.formatIpfs(file.ipfsHash) as string,
)
this.uploadArweaveIdList = fileRecords.map(
(file) => this.formatArweave(file.arweaveId) as string,
)

this.contentFingerprints = [
...fileRecords.map(
(file) => this.formatFileSHA256(file.fileSHA256) as string,
),
...this.uploadIpfsList,
...this.uploadArweaveIdList,
]
}
if (arweaveIds && arweaveIds.length) {
this.uploadArweaveIdList = [...arweaveIds]
}
if (arweaveLinks && arweaveLinks.length) {
this.uploadArweaveLinkList = [...arweaveLinks]
}
logTrackerEvent(this, 'ISCNEdit', 'ISCNConfirmFile', '', 1)
this.step = 2
Expand All @@ -433,6 +454,9 @@ export default class EditIscnPage extends Vue {
this.isSubmitLoading = true
try {
await this.initIfNecessary()
if (!this.signer) {
throw new Error('No signer found')
}
const result = await signISCN(this.payload, this.signer, this.address, {
iscnId: this.iscnId,
gas: new BigNumber(ISCN_GAS_FEE).multipliedBy(UPDATE_ISCN_GAS_MULTIPLIER).toFixed(0),
Expand Down
Loading