fix(admin): remove Auto entity type, make entityType required in form config wizard

Author: pmigueld

packages/admin/src/stores/programDraft.ts

@@ -385,7 +385,7 @@ export const useProgramDraftStore = defineStore('programDraft', () => {
     }
 
     draft.value.entityForms.forEach((form) => {
-      const formErrors: { name?: string; title?: string; formio?: string } = {}
+      const formErrors: { name?: string; title?: string; formio?: string; entityType?: string } = {}
       if (!form.name.trim()) {
         formErrors.name = 'Name is required'
         valid = false
@@ -394,6 +394,10 @@ export const useProgramDraftStore = defineStore('programDraft', () => {
         formErrors.title = 'Title is required'
         valid = false
       }
+      if (!form.entityType) {
+        formErrors.entityType = 'Entity type is required'
+        valid = false
+      }
       if (!form.formio) {
         formErrors.formio = 'Form definition is required'
         valid = false
@@ -614,10 +618,9 @@ export const useProgramDraftStore = defineStore('programDraft', () => {
         description: draft.value.description,
         version: draft.value.version,
         entityForms: draft.value.entityForms.map((form) => {
-          const { entityType, nameField, ...rest } = form
+          const { nameField, ...rest } = form
           const withId = { id: form.name, ...rest }
-          const withType = entityType ? { ...withId, entityType } : withId
-          return nameField ? { ...withType, nameField } : withType
+          return nameField ? { ...withId, nameField } : withId
         }),
         externalSync: draft.value.externalSync,
         authConfigs: draft.value.authConfigs,

packages/admin/src/views/wizard/FormsStep.vue

@@ -240,16 +240,15 @@ const onSpecFileSelection = async (value: File[] | File | null) => {
               <v-select
                 v-model="form.entityType"
                 :items="[
-                  { title: '(Auto - infer from topology)', value: '' },
-                  { title: 'Group', value: 'group' },
+                  { title: 'Group / Household', value: 'group' },
                   { title: 'Individual', value: 'individual' },
-                  { title: 'Record', value: 'record' },
+                  { title: 'Record (activity linked to an entity)', value: 'record' },
                 ]"
                 item-title="title"
                 item-value="value"
-                label="Entity Type (Optional)"
-                placeholder="Auto"
-                hint="Override the entity type. Use 'Individual' for standalone individuals without a parent group."
+                label="Entity Type"
+                :rules="[(v: string) => !!v || 'Entity type is required']"
+                hint="Determines how this form's data is stored and synced. Cannot be changed after creation."
                 persistent-hint
                 variant="outlined"
                 density="compact"

packages/backend/src/routes/appConfigRoutes.ts

@@ -41,7 +41,7 @@ const AppConfigSchema = z.object({
     name: z.string(),
     title: z.string(),
     dependsOn: z.string().nullish(),
-    entityType: z.enum(["group", "individual", "record"]).nullish(),
+    entityType: z.enum(["group", "individual", "record"]).optional(),
     nameField: z.string().nullish(),
     formio: z.record(z.string(), z.unknown()),
   })).nullish(),