From 1084b5bee612eb23c4af287ff0fe9034028271b9 Mon Sep 17 00:00:00 2001
From: Vilde Stefferud <33753494+vildestefferud@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:10:21 +0100
Subject: [PATCH] Legger til visning av ferdigstilt-hendelse for varsling
(#259)
---
.github/workflows/deploy.yml | 2 +-
src/api/kandidatvarsel-api/kandidatvarsel.ts | 4 ++++
.../kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx | 6 ++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8de42a89..eb57f71b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -45,7 +45,7 @@ jobs:
deploy-til-dev:
name: Deploy til dev-gcp
needs: bygg-og-push-docker-image
- if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/amp'
+ if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/legger-til-ferdigstilt-hendelse-varsling'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
diff --git a/src/api/kandidatvarsel-api/kandidatvarsel.ts b/src/api/kandidatvarsel-api/kandidatvarsel.ts
index 758b12eb..cc54a87b 100644
--- a/src/api/kandidatvarsel-api/kandidatvarsel.ts
+++ b/src/api/kandidatvarsel-api/kandidatvarsel.ts
@@ -50,6 +50,9 @@ export enum EksternStatus {
/** Vi har fått bekreftet at en e-post er sendt. */
VELLYKKET_EPOST = 'VELLYKKET_EPOST',
+ /** Varsling er ferdigstilt*/
+ FERDIGSTILT = 'FERDIGSTILT',
+
/** Det skjedde en feil, og vi vil ikke prøve å sende varselet igjen. */
FEIL = 'FEIL',
}
@@ -58,6 +61,7 @@ const EksternStatusSchema = z
.literal(EksternStatus.UNDER_UTSENDING)
.or(z.literal(EksternStatus.VELLYKKET_SMS))
.or(z.literal(EksternStatus.VELLYKKET_EPOST))
+ .or(z.literal(EksternStatus.FERDIGSTILT))
.or(z.literal(EksternStatus.FEIL));
const SmsSchema = z
diff --git a/src/kandidat/kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx b/src/kandidat/kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx
index 0ab7ec98..8df66382 100644
--- a/src/kandidat/kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx
+++ b/src/kandidat/kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx
@@ -66,6 +66,12 @@ const Popuptekst: FunctionComponent<{ sms: Sms }> = ({ sms }) => {
Ekstern varsel: epost sendt
);
+ case 'FERDIGSTILT':
+ return (
+ <>
+
Ekstern varsel: varsling er ferdigstilt{' '}
+
+ );
case 'FEIL':
return (
<>