fix user creation

This commit is contained in:
Kuchenpirat 2025-07-12 15:03:12 +00:00
commit ee198bc369

View file

@ -21,31 +21,28 @@
<v-card variant="outlined"> <v-card variant="outlined">
<v-card-text> <v-card-text>
<v-select <v-select
v-if="groups" v-model="selectedGroup"
v-model="selectedGroupId" :items="groups || []"
:items="groups"
item-title="name" item-title="name"
item-value="id" return-object
:return-object="false"
variant="filled" variant="filled"
:label="$t('group.user-group')" :label="$t('group.user-group')"
:rules="[validators.required]" :rules="[validators.required]"
/> />
<v-select <v-select
v-model="newUserData.household" v-model="state.newUserData.household"
:disabled="!selectedGroupId" :disabled="!selectedGroup"
:items="households" :items="households"
item-title="name" item-title="name"
item-value="name" item-value="name"
:return-object="false"
variant="filled" variant="filled"
:label="$t('household.user-household')" :label="$t('household.user-household')"
:hint="selectedGroupId ? '' : $t('group.you-must-select-a-group-before-selecting-a-household')" :hint="selectedGroup ? '' : $t('group.you-must-select-a-group-before-selecting-a-household')"
persistent-hint persistent-hint
:rules="[validators.required]" :rules="[validators.required]"
/> />
<AutoForm <AutoForm
v-model="newUserData" v-model="state.newUserData"
:items="userForm" :items="userForm"
/> />
</v-card-text> </v-card-text>
@ -60,46 +57,34 @@
</v-container> </v-container>
</template> </template>
<script lang="ts"> <script setup lang="ts">
import { useAdminApi } from "~/composables/api"; import { useAdminApi } from "~/composables/api";
import { useGroups } from "~/composables/use-groups"; import { useGroups } from "~/composables/use-groups";
import { useAdminHouseholds } from "~/composables/use-households";
import { useUserForm } from "~/composables/use-users"; import { useUserForm } from "~/composables/use-users";
import { validators } from "~/composables/use-validators"; import { validators } from "~/composables/use-validators";
import type { UserIn } from "~/lib/api/types/user"; import type { GroupInDB, UserIn } from "~/lib/api/types/user";
import type { VForm } from "~/types/auto-forms"; import type { VForm } from "~/types/auto-forms";
export default defineNuxtComponent({
setup() {
definePageMeta({ definePageMeta({
layout: "admin", layout: "admin",
}); });
const { userForm } = useUserForm(); const { userForm } = useUserForm();
const { groups } = useGroups(); const { groups } = useGroups();
const { useHouseholdsInGroup } = useAdminHouseholds();
const router = useRouter(); const router = useRouter();
// ==============================================
// New User Form
const refNewUserForm = ref<VForm | null>(null); const refNewUserForm = ref<VForm | null>(null);
const adminApi = useAdminApi(); const adminApi = useAdminApi();
const selectedGroupId = ref<string>(""); const selectedGroup = ref<GroupInDB | undefined>(undefined);
const households = useHouseholdsInGroup(selectedGroupId); const households = computed(() => selectedGroup.value?.households || []);
const selectedGroup = computed(() => {
return groups.value?.find(group => group.id === selectedGroupId.value);
});
const state = reactive({ const state = reactive({
newUserData: { newUserData: {
username: "", username: "",
fullName: "", fullName: "",
email: "", email: "",
admin: false, admin: false,
group: selectedGroup.value?.name || "", group: computed(() => selectedGroup.value?.name || ""),
household: "", household: "",
advanced: false, advanced: false,
canInvite: false, canInvite: false,
@ -109,10 +94,6 @@ export default defineNuxtComponent({
authMethod: "Mealie", authMethod: "Mealie",
}, },
}); });
watch(selectedGroup, (newGroup) => {
state.newUserData.group = newGroup?.name || "";
state.newUserData.household = "";
});
async function handleSubmit() { async function handleSubmit() {
if (!refNewUserForm.value?.validate()) return; if (!refNewUserForm.value?.validate()) return;
@ -123,19 +104,6 @@ export default defineNuxtComponent({
router.push("/admin/manage/users"); router.push("/admin/manage/users");
} }
} }
return {
...toRefs(state),
userForm,
refNewUserForm,
handleSubmit,
groups,
selectedGroupId,
households,
validators,
};
},
});
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>