diff --git a/next-tavla/app/(admin)/organizations/components/CreateOrganization.tsx b/next-tavla/app/(admin)/organizations/components/CreateOrganization.tsx
index 03662514c..276c83dad 100644
--- a/next-tavla/app/(admin)/organizations/components/CreateOrganization.tsx
+++ b/next-tavla/app/(admin)/organizations/components/CreateOrganization.tsx
@@ -51,6 +51,7 @@ function CreateOrganization() {
id="name"
name="name"
required
+ {...getFormFeedbackForField('name', state)}
/>
diff --git a/next-tavla/app/(admin)/utils.ts b/next-tavla/app/(admin)/utils.ts
index 0da4b17fa..b1426f4fe 100644
--- a/next-tavla/app/(admin)/utils.ts
+++ b/next-tavla/app/(admin)/utils.ts
@@ -1,7 +1,13 @@
import { VariantType } from '@entur/form'
import { FirebaseError } from 'firebase/app'
-type InputType = 'general' | 'user' | 'email' | 'password' | 'repeat_password'
+type InputType =
+ | 'general'
+ | 'user'
+ | 'email'
+ | 'password'
+ | 'repeat_password'
+ | 'name'
export type TFormFeedback = {
form_type: InputType
@@ -103,6 +109,12 @@ export function getFormFeedbackForError(e: TError): TFormFeedback {
feedback: 'Denne personen er allerede medlem av organisasjoen.',
variant: 'info',
}
+ case 'organization/name-missing':
+ return {
+ form_type: 'name',
+ feedback: 'Organisasjonen må ha et navn',
+ variant: 'warning',
+ }
}
return {
diff --git a/next-tavla/src/Admin/utils/formActions.ts b/next-tavla/src/Admin/utils/formActions.ts
index e6a61e427..9e2b31eca 100644
--- a/next-tavla/src/Admin/utils/formActions.ts
+++ b/next-tavla/src/Admin/utils/formActions.ts
@@ -75,6 +75,8 @@ export async function createOrganizationAction(
try {
const name = data.get('name')?.toString() ?? ''
+ if (!name) return getFormFeedbackForError('organization/name-missing')
+
const user = await getUserFromSessionCookie()
if (!user) return getFormFeedbackForError('auth/operation-not-allowed')