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.

Sign up for GitHub

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

Legger til visning av ferdigstilt-hendelse for varsling #259

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Legger til visning av ferdigstilt-hendelse for varsling #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/api/kandidatvarsel-api/kandidatvarsel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions src/kandidat/kandidatliste/kandidatrad/smsstatus/SmsStatusPopup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ const Popuptekst: FunctionComponent<{ sms: Sms }> = ({ sms }) => {
<br /> Ekstern varsel: epost sendt
</>
);
case 'FERDIGSTILT':
return (
<>
<br /> Ekstern varsel: varsling er ferdigstilt{' '}
</>
);
case 'FEIL':
return (
<>
Expand Down
Loading