From 984818c393d55fcde3dca54604acdaf261aa0d7a Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 24 Jul 2023 23:26:22 +0200 Subject: [PATCH] many more improvements and cleanup --- .run/wg-portal-migrate.run.xml | 2 +- frontend/src/components/UserEditModal.vue | 39 +++++----------- frontend/src/components/UserViewModal.vue | 14 ++++-- frontend/src/helpers/models.js | 23 ++++++++++ frontend/src/views/UserView.vue | 19 +++----- internal/adapters/database.go | 46 ++++++++++++------- .../assets/ProfileView-8a66d1eb.js | 1 + .../assets/ProfileView-fb409d54.js | 1 - .../frontend-dist/assets/UserView-385d07a3.js | 1 - .../frontend-dist/assets/UserView-af8dd105.js | 1 + .../{index-4f7c99b3.js => index-96214b1b.js} | 6 +-- .../app/api/core/frontend-dist/index.html | 2 +- internal/app/api/v0/model/models_user.go | 10 ++++ internal/app/auth/auth.go | 11 +++++ internal/app/migrate_v1.go | 12 ++++- internal/app/users/user_manager.go | 8 +++- internal/domain/base.go | 19 ++++---- internal/domain/context.go | 9 ++++ internal/domain/user.go | 38 +++++++++++++-- 19 files changed, 179 insertions(+), 83 deletions(-) create mode 100644 internal/app/api/core/frontend-dist/assets/ProfileView-8a66d1eb.js delete mode 100644 internal/app/api/core/frontend-dist/assets/ProfileView-fb409d54.js delete mode 100644 internal/app/api/core/frontend-dist/assets/UserView-385d07a3.js create mode 100644 internal/app/api/core/frontend-dist/assets/UserView-af8dd105.js rename internal/app/api/core/frontend-dist/assets/{index-4f7c99b3.js => index-96214b1b.js} (99%) diff --git a/.run/wg-portal-migrate.run.xml b/.run/wg-portal-migrate.run.xml index cc01d8c..1cb7679 100644 --- a/.run/wg-portal-migrate.run.xml +++ b/.run/wg-portal-migrate.run.xml @@ -2,7 +2,7 @@ - + diff --git a/frontend/src/components/UserEditModal.vue b/frontend/src/components/UserEditModal.vue index 3667184..3106295 100644 --- a/frontend/src/components/UserEditModal.vue +++ b/frontend/src/components/UserEditModal.vue @@ -4,6 +4,7 @@ import {userStore} from "@/stores/users"; import {computed, ref, watch} from "vue"; import { useI18n } from 'vue-i18n'; import { notify } from "@kyvg/vue3-notification"; +import {freshUser} from "@/helpers/models"; const { t } = useI18n() @@ -30,34 +31,14 @@ const title = computed(() => { return t("users.new") }) -const formData = ref(freshFormData()) - -function freshFormData() { - return { - Identifier: "", - - Email: "", - Source: "db", - IsAdmin: false, - - Firstname: "", - Lastname: "", - Phone: "", - Department: "", - Notes: "", - - Password: "", - - Disabled: false, - } -} +const formData = ref(freshUser()) // functions watch(() => props.visible, async (newValue, oldValue) => { if (oldValue === false && newValue === true) { // if modal is shown if (!selectedUser.value) { - formData.value = freshFormData() + formData.value = freshUser() } else { // fill existing userdata formData.value.Identifier = selectedUser.value.Identifier formData.value.Email = selectedUser.value.Email @@ -76,7 +57,7 @@ watch(() => props.visible, async (newValue, oldValue) => { ) function close() { - formData.value = freshFormData() + formData.value = freshUser() emit('close') } @@ -115,7 +96,7 @@ async function del() {