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

Vcluster/eo #3749 3 part agreement #3845

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2887d00
WIP refactors transfers form
MJ1227UB Dec 5, 2024
fae729b
chore converts old input to new signal input
MJ1227UB Dec 9, 2024
affa851
chore WIP
MJ1227UB Dec 10, 2024
eb5f3b8
Merge branch 'refs/heads/main' into vcluster/eo-#3749-3-part-agreement
MJ1227UB Dec 11, 2024
3a08cfd
chore WIP
MJ1227UB Dec 12, 2024
42798c5
chore WIP
MJ1227UB Dec 17, 2024
4220ef2
chore WIP
MJ1227UB Dec 18, 2024
040d4a9
chore: add license
github-actions[bot] Dec 18, 2024
74443a8
chore WIP
MJ1227UB Dec 18, 2024
b71c5aa
Merge remote-tracking branch 'origin/vcluster/eo-#3749-3-part-agreeme…
MJ1227UB Dec 18, 2024
ea79343
style: format
github-actions[bot] Dec 18, 2024
10d340a
chore WIP
MJ1227UB Dec 18, 2024
4b55012
chore WIP
MJ1227UB Dec 18, 2024
88b2928
Merge remote-tracking branch 'origin/vcluster/eo-#3749-3-part-agreeme…
MJ1227UB Dec 18, 2024
e39e22a
chore removes unnecessary hasLoaded
MJ1227UB Dec 18, 2024
541b96d
chore WIP adds sender input component
MJ1227UB Dec 19, 2024
120ef56
Merge branch 'refs/heads/main' into vcluster/eo-#3749-3-part-agreement
MJ1227UB Dec 20, 2024
d43cb47
chore WIP sender input and actors from consent
MJ1227UB Dec 20, 2024
7ddc844
chore WIP fix edit modal
MJ1227UB Dec 20, 2024
ec13e32
chore WIP adds senders from actor
MJ1227UB Dec 23, 2024
b62bdfd
chore refactors the way sender and receiver works to accomodate error…
MJ1227UB Jan 3, 2025
c5299e9
chore adds validation to receiver input
MJ1227UB Jan 6, 2025
077fc53
chore adds transfer agreement type to form
MJ1227UB Jan 6, 2025
f485d28
chore updates the way the form works to accompany new type and new st…
MJ1227UB Jan 10, 2025
f42bbf4
chore adds transfer agreement creation and refactors creation of tran…
MJ1227UB Jan 13, 2025
1a5b957
chore renames receiver to recipient and WIP recipient list fix
MJ1227UB Jan 14, 2025
3eb58e1
style: format
github-actions[bot] Jan 14, 2025
96abf23
chore refactors way recipients gets added to include the senders
MJ1227UB Jan 14, 2025
25239d3
chore WIP refactor way form completes and creation of transfer agreem…
MJ1227UB Jan 16, 2025
5c986e7
Merge remote-tracking branch 'origin/vcluster/eo-#3749-3-part-agreeme…
MJ1227UB Jan 16, 2025
8eb1b3b
chore WIP refactors edit modal
MJ1227UB Jan 16, 2025
ae6365b
chore renames all occurrences of recipient in code to receiver to mat…
MJ1227UB Jan 16, 2025
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
71 changes: 44 additions & 27 deletions libs/eo/core/globalization/assets-localization/i18n/da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -653,25 +653,28 @@ export const DA_TRANSLATIONS: TranslationKeys = {
createTransferAgreementProposal: {
title: 'Ny overførselsaftale',
closeLabel: 'Afbryd oprettelse af ny overførselsaftale',

recipient: {
stepLabel: 'Modtager',
title: 'Hvem er aftalen til?',
parties: {
stepLabel: 'Aftaleparter',
titleTo: 'Hvem er aftalen til?',
titleBetween: 'Hvem er aftalen mellem?',
description: 'Valgfrit, men anbefales af sikkerhedsmæssige årsager.',
nextLabel: 'Næste',
unknownRecipient: 'Ukendt virksomhed',
nextLabel: 'Tidsramme',
unknownParty: 'Ukendt virksomhed',
senderTinLabel: 'Afsender',
senderTinPlaceholder: 'CVR / TIN',
senderTinGeneralError: 'Vælg en organisation fra listen',
tinFormatError: 'Et 8-cifret TIN/CVR-nummer er påkrævet',
receiverTinLabel: 'Modtager',
receiverTinPlaceholder: 'CVR / TIN',
receiverTinGeneralError: 'Indtast nyt CVR-nummer eller vælg fra tidligere overførselsaftaler',
receiverTinEqualsSenderTin: 'Modtageren kan ikke være dit eget TIN/CVR',
receiverTinFormatError: 'Et 8-cifret TIN/CVR-nummer er påkrævet',
},
timeframe: {
stepLabel: 'Tidsramme',
title: 'Hvad er varigheden af aftalen?',
description: 'Ved at vælge ingen slutdato kan du altid stoppe aftalen manuelt.',
nextLabel: 'Næste',
previousLabel: 'Forrige',
nextLabel: 'Volumen',
previousLabel: 'Aftaleparter',
startDate: {
label: 'START',
required: 'Starten af perioden er påkrævet',
Expand All @@ -690,34 +693,48 @@ export const DA_TRANSLATIONS: TranslationKeys = {
'Den valgte periode overlapper med en eksisterende aftale: {{startDate}} - {{endDate}}',
},
},
invitation: {
stepLabel: 'Invitation',
title: {
success: 'Nyt link til overførselsaftale oprettet!',
error: 'Forslag til overførselsaftale kunne ikke genereres',
volume: {
title: 'Hvor meget vil du overføre?',
stepLabel: 'Volumen',
matchReceiver: 'Match modtagers forbrug',
everything: 'Alt der udstedes certifikater for',
nextLabel: 'Opsummering',
previousLabel: 'Tidsramme',
},
summary: {
stepLabel: 'Opsummering',
previousLabel: 'Volumen',
ready: {
title: 'Overførselsaftale klar til oprettelse!',
nextLabel: 'Opret aftale',
},
description: {
success: `
invitation: {
title: {
success: 'Nyt link til overførselsaftale oprettet!',
error: 'Forslag til overførselsaftale kunne ikke genereres',
},
description: {
success: `
<p>Hvad sker der nu?</p>
<ol style="padding-inline-start: revert;">
<li>Send følgende link til din modtager</li>
<li>Aftalen bliver endelig, når modtageren accepterer betingelserne</li>
</ol>`,
error: `
error: `
<p>Tryk på "Generer" i formularen nedenfor for at prøve igen.</p>
<p>Hvis problemet fortsætter, kontakt venligst support.</p>
`,
},
link: {
hint: 'Link udløber om 14 dage, og kan kun bruges en enkelt gang.',
hintProposal:
'Linket udløber 14 dage efter forslaget til overførselsaftalen blev oprettet, og kan kun bruges en enkelt gang.',
error: 'Kunne ikke generere link. Prøv igen.',
copy: 'Kopiér link',
retry: 'Generer',
},
nextLabel: 'Kopier & luk',
},
link: {
hint: 'Link udløber om 14 dage, og kan kun bruges en enkelt gang.',
hintProposal:
'Linket udløber 14 dage efter forslaget til overførselsaftalen blev oprettet, og kan kun bruges en enkelt gang.',
error: 'Kunne ikke generere link. Prøv igen.',
copy: 'Kopiér link',
retry: 'Generer',
},
nextLabel: 'Kopier & luk',
previousLabel: 'Forrige',
},
},
respondTransferAgreementProposal: {
Expand Down
72 changes: 45 additions & 27 deletions libs/eo/core/globalization/assets-localization/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ export const EN_TRANSLATIONS: TranslationKeys = {
unknownReceiver: 'Unknown company',
unknownSender: 'Unknown company',
senderTableHeader: 'Sender',
receiverTableHeader: 'Receiver',
receiverTableHeader: 'Recipient',
startDateTableHeader: 'Start Date',
endDateTableHeader: 'End Date',
statusTableHeader: 'Status',
Expand All @@ -645,7 +645,7 @@ export const EN_TRANSLATIONS: TranslationKeys = {
periodOfAgreementLabel: 'Period of agreement',
informationTab: 'Information',
historyTab: 'History',
receiverLabel: 'Receiver',
receiverLabel: 'Recipient',
unknownReceiver: 'Unknown company',
idLabel: 'ID',
},
Expand All @@ -663,18 +663,22 @@ export const EN_TRANSLATIONS: TranslationKeys = {
title: 'New transfer agreement',
closeLabel: 'Cancel creation of new transfer agreement',

recipient: {
stepLabel: 'Recipient',
title: 'Who is the agreement for?',
parties: {
stepLabel: 'Parties',
titleTo: 'Who is the agreement for?',
titleBetween: 'Who is the agreement between?',
description: 'Optional, but recommended for security reasons.',
nextLabel: 'Next',
unknownRecipient: 'Unknown company',
nextLabel: 'Timeframe',
unknownParty: 'Unknown company',
senderTinLabel: 'Sender',
senderTinPlaceholder: 'CVR / TIN',
senderTinGeneralError: 'Choose an organization from the list',
tinFormatError: 'An 8-digit TIN/CVR number is required',
receiverTinLabel: 'Recipient',
receiverTinPlaceholder: 'CVR / TIN',
receiverTinGeneralError: `Enter new CVR number or choose from previous<br />
transfer agreements`,
receiverTinEqualsSenderTin: 'The receiver cannot be your own TIN/CVR',
receiverTinFormatError: 'An 8-digit TIN/CVR number is required',
receiverTinEqualsSenderTin: 'The recipient cannot be your own TIN/CVR',
},
timeframe: {
stepLabel: 'Timeframe',
Expand All @@ -701,34 +705,48 @@ export const EN_TRANSLATIONS: TranslationKeys = {
'Chosen period overlaps with an existing agreement: {{startDate}} - {{endDate}}',
},
},
invitation: {
stepLabel: 'Invitation',
title: {
success: 'New link for transfer agreement created!',
error: 'Transfer agreeement proposal could not be generated',
volume: {
title: 'How much do you want to transfer?',
stepLabel: 'Volume',
matchReceiver: 'Match recipients consumption',
everything: 'Everything certificates are issued for',
nextLabel: 'Summary',
previousLabel: 'Timeframe',
},
summary: {
stepLabel: 'Summary',
previousLabel: 'Volume',
ready: {
title: 'Transfer agreement ready for creation!',
nextLabel: 'Create agreement',
},
description: {
success: `
invitation: {
title: {
success: 'New link for transfer agreement created!',
error: 'Transfer agreeement proposal could not be generated',
},
description: {
success: `
<p>What happens now?</p>
<ol style="padding-inline-start: revert;">
<li>Send the following link to your recipient</li>
<li>The agreement becomes final once the recipient accepts the terms</li>
</ol>`,
error: `
error: `
<p>Press "Generate" im the form below to try again.</p>
<p>If the problem persist, please contact support.</p>
`,
},
link: {
hint: 'Link expires in 14 days, usable by one organization or specific company.',
hintProposal:
'Link expires 14 days after the creation of the transfer agreement proposal, usable by one organization or specific company.',
error: `Couldn't generate link. Please try again.`,
copy: 'Copy link',
retry: 'Generate',
},
nextLabel: 'Copy & close',
},
link: {
hint: 'Link expires in 14 days, usable by one organization or specific company.',
hintProposal:
'Link expires 14 days after the creation of the transfer agreement proposal, usable by one organization or specific company.',
error: `Couldn't generate link. Please try again.`,
copy: 'Copy link',
retry: 'Generate',
},
nextLabel: 'Copy & close',
previousLabel: 'Previous',
},
},
respondTransferAgreementProposal: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,17 +529,21 @@ export interface TranslationKeys {
createTransferAgreementProposal: {
title: string;
closeLabel: string;
recipient: {
parties: {
stepLabel: string;
title: string;
titleTo: string;
titleBetween: string;
description: string;
nextLabel: string;
unknownRecipient: string;
unknownParty: string;
senderTinLabel: string;
senderTinPlaceholder: string;
senderTinGeneralError: string;
tinFormatError: string;
receiverTinLabel: string;
receiverTinPlaceholder: string;
receiverTinGeneralError: string;
receiverTinEqualsSenderTin: string;
receiverTinFormatError: string;
};
timeframe: {
stepLabel: string;
Expand All @@ -563,26 +567,40 @@ export interface TranslationKeys {
withoutEndDateOverlapping: string;
};
};
invitation: {
volume: {
stepLabel: string;
title: {
success: string;
error: string;
};
description: {
success: string;
error: string;
};
link: {
hint: string;
hintProposal: string;
error: string;
copy: string;
retry: string;
};
title: string;
matchReceiver: string;
everything: string;
nextLabel: string;
previousLabel: string;
};
summary: {
stepLabel: string;
previousLabel: string;
ready: {
title: string;
nextLabel: string;
};
invitation: {
title: {
success: string;
error: string;
};
description: {
success: string;
error: string;
};
link: {
hint: string;
hintProposal: string;
error: string;
copy: string;
retry: string;
};
nextLabel: string;
};
};
};
respondTransferAgreementProposal: {
title: string;
Expand Down
78 changes: 49 additions & 29 deletions libs/eo/core/globalization/assets-localization/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -535,21 +535,25 @@ export const translations = {
createTransferAgreementProposal: {
title: 'createTransferAgreementProposal.title' as const,
closeLabel: 'createTransferAgreementProposal.closeLabel' as const,
recipient: {
stepLabel: 'createTransferAgreementProposal.recipient.stepLabel' as const,
title: 'createTransferAgreementProposal.recipient.title' as const,
description: 'createTransferAgreementProposal.recipient.description' as const,
nextLabel: 'createTransferAgreementProposal.recipient.nextLabel' as const,
unknownRecipient: 'createTransferAgreementProposal.recipient.unknownRecipient' as const,
receiverTinLabel: 'createTransferAgreementProposal.recipient.receiverTinLabel' as const,
parties: {
stepLabel: 'createTransferAgreementProposal.parties.stepLabel' as const,
titleTo: 'createTransferAgreementProposal.parties.titleTo' as const,
titleBetween: 'createTransferAgreementProposal.parties.titleBetween' as const,
description: 'createTransferAgreementProposal.parties.description' as const,
nextLabel: 'createTransferAgreementProposal.parties.nextLabel' as const,
unknownParty: 'createTransferAgreementProposal.parties.unknownParty' as const,
senderTinLabel: 'createTransferAgreementProposal.parties.senderTinLabel' as const,
senderTinPlaceholder: 'createTransferAgreementProposal.parties.senderTinPlaceholder' as const,
senderTinGeneralError:
'createTransferAgreementProposal.parties.senderTinGeneralError' as const,
tinFormatError: 'createTransferAgreementProposal.parties.tinFormatError' as const,
receiverTinLabel: 'createTransferAgreementProposal.parties.receiverTinLabel' as const,
receiverTinPlaceholder:
'createTransferAgreementProposal.recipient.receiverTinPlaceholder' as const,
'createTransferAgreementProposal.parties.receiverTinPlaceholder' as const,
receiverTinGeneralError:
'createTransferAgreementProposal.recipient.receiverTinGeneralError' as const,
'createTransferAgreementProposal.parties.receiverTinGeneralError' as const,
receiverTinEqualsSenderTin:
'createTransferAgreementProposal.recipient.receiverTinEqualsSenderTin' as const,
receiverTinFormatError:
'createTransferAgreementProposal.recipient.receiverTinFormatError' as const,
'createTransferAgreementProposal.parties.receiverTinEqualsSenderTin' as const,
} as const,
timeframe: {
stepLabel: 'createTransferAgreementProposal.timeframe.stepLabel' as const,
Expand Down Expand Up @@ -578,25 +582,41 @@ export const translations = {
'createTransferAgreementProposal.timeframe.endDate.withoutEndDateOverlapping' as const,
} as const,
} as const,
invitation: {
stepLabel: 'createTransferAgreementProposal.invitation.stepLabel' as const,
title: {
success: 'createTransferAgreementProposal.invitation.title.success' as const,
error: 'createTransferAgreementProposal.invitation.title.error' as const,
volume: {
stepLabel: 'createTransferAgreementProposal.volume.stepLabel' as const,
title: 'createTransferAgreementProposal.volume.title' as const,
matchReceiver: 'createTransferAgreementProposal.volume.matchReceiver' as const,
everything: 'createTransferAgreementProposal.volume.everything' as const,
nextLabel: 'createTransferAgreementProposal.volume.nextLabel' as const,
previousLabel: 'createTransferAgreementProposal.volume.previousLabel' as const,
} as const,
summary: {
stepLabel: 'createTransferAgreementProposal.summary.stepLabel' as const,
previousLabel: 'createTransferAgreementProposal.summary.previousLabel' as const,
ready: {
title: 'createTransferAgreementProposal.summary.ready.title' as const,
nextLabel: 'createTransferAgreementProposal.summary.ready.nextLabel' as const,
} as const,
description: {
success: 'createTransferAgreementProposal.invitation.description.success' as const,
error: 'createTransferAgreementProposal.invitation.description.error' as const,
} as const,
link: {
hint: 'createTransferAgreementProposal.invitation.link.hint' as const,
hintProposal: 'createTransferAgreementProposal.invitation.link.hintProposal' as const,
error: 'createTransferAgreementProposal.invitation.link.error' as const,
copy: 'createTransferAgreementProposal.invitation.link.copy' as const,
retry: 'createTransferAgreementProposal.invitation.link.retry' as const,
invitation: {
title: {
success: 'createTransferAgreementProposal.summary.invitation.title.success' as const,
error: 'createTransferAgreementProposal.summary.invitation.title.error' as const,
} as const,
description: {
success:
'createTransferAgreementProposal.summary.invitation.description.success' as const,
error: 'createTransferAgreementProposal.summary.invitation.description.error' as const,
} as const,
link: {
hint: 'createTransferAgreementProposal.summary.invitation.link.hint' as const,
hintProposal:
'createTransferAgreementProposal.summary.invitation.link.hintProposal' as const,
error: 'createTransferAgreementProposal.summary.invitation.link.error' as const,
copy: 'createTransferAgreementProposal.summary.invitation.link.copy' as const,
retry: 'createTransferAgreementProposal.summary.invitation.link.retry' as const,
} as const,
nextLabel: 'createTransferAgreementProposal.summary.invitation.nextLabel' as const,
} as const,
nextLabel: 'createTransferAgreementProposal.invitation.nextLabel' as const,
previousLabel: 'createTransferAgreementProposal.invitation.previousLabel' as const,
} as const,
} as const,
respondTransferAgreementProposal: {
Expand Down
Loading
Loading