From 3beafd29b2fa7446e0474dc6488eb6faadb760c2 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner
Date: Fri, 25 Apr 2025 21:09:08 +0200
Subject: [PATCH] changes after renamings
---
.../LinkInformations/RedeemCommunitySelection.vue | 10 +++++-----
.../LinkInformations/RedeemInformation.vue | 4 ++--
.../src/components/LinkInformations/RedeemValid.vue | 4 ++--
frontend/src/pages/TransactionLink.vue | 12 ++++++------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue b/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
index fbf415897..dffe5ec11 100644
--- a/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
+++ b/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
@@ -3,7 +3,7 @@
:link-data="linkData"
:redeem-code="redeemCode"
:is-contribution-link="isContributionLink"
- :is-disbursement-link="isDisbursementLink"
+ :is-redeem-jwt-link="isRedeemJwtLink"
class="redeem-community-selection"
>
@@ -11,16 +11,16 @@
-
+
{{ $t('gdd_per_link.recipientCommunitySelection') }}
{{ $t('gdd_per_link.recipientCommunityFix') }}
-
+
@@ -56,7 +56,7 @@ const props = defineProps({
linkData: { type: Object, required: true },
redeemCode: { type: String, required: true },
isContributionLink: { type: Boolean, default: false },
- isDisbursementLink: { type: Boolean, default: false },
+ isRedeemJwtLink: { type: Boolean, default: false },
recipientCommunity: {
type: Object,
required: false,
diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
index 7b22543e7..bcf2129e8 100644
--- a/frontend/src/components/LinkInformations/RedeemInformation.vue
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -6,7 +6,7 @@
{{ CONFIG.COMMUNITY_NAME }}
{{ $t('contribution-link.thanksYouWith') }} {{ $filters.GDD(linkData.amount) }}
-
+
{{ '"' + linkData.senderCommunity.name + '.' + linkData.senderUser.firstName + '"' }}
{{ $t('transaction-link.send_you') }} {{ $filters.GDD(linkData.amount) }}
@@ -22,7 +22,7 @@ export default {
props: {
linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false },
- isDisbursementLink: { type: Boolean, default: false },
+ isRedeemJwtLink: { type: Boolean, default: false },
},
data() {
return {
diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index 9e252566f..aaf52d313 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -3,7 +3,7 @@
@@ -31,7 +31,7 @@ export default {
props: {
linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false },
- isDisbursementLink: { type: Boolean, default: false },
+ isRedeemJwtLink: { type: Boolean, default: false },
validLink: { type: Boolean, default: false },
},
}
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index b66bc3974..1739233a8 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -8,7 +8,7 @@
:link-data="linkData"
:redeem-code="redeemCode"
:is-contribution-link="isContributionLink"
- :is-disbursement-link="isDisbursementLink"
+ :is-redeem-jwt-link="isRedeemJwtLink"
/>
@@ -20,7 +20,7 @@
@@ -89,8 +89,8 @@ const isContributionLink = computed(() => {
return params.code?.search(/^CL-/) === 0
})
-const isDisbursementLink = computed(() => {
- if (result.value?.queryTransactionLink?.__typename === 'DisbursementLink') {
+const isRedeemJwtLink = computed(() => {
+ if (result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink') {
return true
}
return false
@@ -130,10 +130,10 @@ const itemType = computed(() => {
return 'REDEEM_SELECT_COMMUNITY'
}
if (
- (!isDisbursementLink.value &&
+ (!isRedeemJwtLink.value &&
linkData.value.recipientUser &&
store.state.gradidoID === linkData.value.recipientUser.gradidoID) ||
- (isDisbursementLink.value &&
+ (isRedeemJwtLink.value &&
linkData.value.senderUser.gradidoID === linkData.value.recipientUser.gradidoID)
) {
console.log('TransactionLink.itemType... SELF_CREATOR')