From b68cc018d17df67e643b9dff5d04974e4796efe6 Mon Sep 17 00:00:00 2001
From: Marte Fossum <myf@uio.no>
Date: Wed, 8 Feb 2023 16:03:50 +0100
Subject: [PATCH] GREG-330: Remove old confirmation-/error message
---
frontend/src/routes/components/sponsorGuestButtons.tsx | 2 +-
frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx | 8 ++++++++
frontend/src/routes/sponsor/register/stepRegistration.tsx | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/frontend/src/routes/components/sponsorGuestButtons.tsx b/frontend/src/routes/components/sponsorGuestButtons.tsx
index 2b1168d7..893c0d0c 100644
--- a/frontend/src/routes/components/sponsorGuestButtons.tsx
+++ b/frontend/src/routes/components/sponsorGuestButtons.tsx
@@ -104,7 +104,7 @@ export default function SponsorGuestButtons(props: SponsorGuestButtonsProps) {
{cancelledInvitationFor && (
<Alert
sx={{ fontSize: '1.375rem', marginTop: '1rem', marginBottom: '1rem' }}
- severity="info"
+ severity="success"
>
{t('guestInfo.invitationCancelled', {
name: cancelledInvitationFor,
diff --git a/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
index f8b43d3c..8667bfed 100644
--- a/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
+++ b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
@@ -150,6 +150,8 @@ export default function GuestRoleInfo({
const newEndDate = addDays(-1)(today)
if (role.start_date !== undefined && role.start_date > newEndDate) {
setBadEndDate(true)
+ setShowPeriodChange(false)
+ setShowPeriodChangeFailed(false)
} else {
role.end_date = newEndDate
endPeriodPost(role_id, { end_date: newEndDate }, reloadGuests)
@@ -196,7 +198,13 @@ export default function GuestRoleInfo({
.then((result) => {
if (result !== null) {
setShowPeriodChange(true)
+ setBadEndDate(false)
+ setShowPeriodChangeFailed(false)
console.log('result', result)
+ } else {
+ setShowPeriodChangeFailed(true)
+ setShowPeriodChange(false)
+ setBadEndDate(false)
}
// Reload the guest so that the information on the overview page is updated
reloadGuests()
diff --git a/frontend/src/routes/sponsor/register/stepRegistration.tsx b/frontend/src/routes/sponsor/register/stepRegistration.tsx
index 029a5d7d..23e6034a 100644
--- a/frontend/src/routes/sponsor/register/stepRegistration.tsx
+++ b/frontend/src/routes/sponsor/register/stepRegistration.tsx
@@ -177,6 +177,8 @@ export default function StepRegistration() {
const handleBack = () => {
setActiveStep((prevActiveStep) => prevActiveStep - 1)
+ setFormDataErrorReport(undefined)
+ setSubmitErrorReport(undefined)
}
const handleForwardFromRegister = (
--
GitLab