From 78cf03b2220cba64d25f2f33bf1a21ba02b2f701 Mon Sep 17 00:00:00 2001
From: bayang <wabayang@gmail.com>
Date: Sat, 20 Apr 2024 12:10:09 +0200
Subject: [PATCH] fix: frontend dependencies upgrade issue

---
 src/jelu-ui/src/components/Login.vue     |  4 ----
 src/jelu-ui/src/components/UserModal.vue | 14 ++++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/jelu-ui/src/components/Login.vue b/src/jelu-ui/src/components/Login.vue
index 2e0b93dd..5613326e 100644
--- a/src/jelu-ui/src/components/Login.vue
+++ b/src/jelu-ui/src/components/Login.vue
@@ -131,7 +131,6 @@ const submit = () => {
         <o-input
           v-model="form.login"
           type="text"
-          value="john"
           maxlength="50"
           class="input focus:input-accent"
         />
@@ -146,7 +145,6 @@ const submit = () => {
         <o-input
           v-model="loginValidation"
           type="text"
-          value="john"
           maxlength="50"
           class="input focus:input-accent"
         />
@@ -157,7 +155,6 @@ const submit = () => {
         </label>
         <o-input
           v-model="form.password"
-          value="123"
           type="password"
           maxlength="150"
           password-reveal
@@ -174,7 +171,6 @@ const submit = () => {
         </label>
         <o-input
           v-model="passwordValidation"
-          value="123"
           type="password"
           maxlength="150"
           password-reveal
diff --git a/src/jelu-ui/src/components/UserModal.vue b/src/jelu-ui/src/components/UserModal.vue
index 38c455f0..408a3cb6 100644
--- a/src/jelu-ui/src/components/UserModal.vue
+++ b/src/jelu-ui/src/components/UserModal.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { setErrors } from '@formkit/vue';
+import { useProgrammatic } from "@oruga-ui/oruga-next";
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { UpdateUser, User } from "../model/User";
+import { useStore } from 'vuex';
+import { User } from "../model/User";
 import dataService from "../services/DataService";
+import { key } from '../store';
 import { ObjectUtils } from "../utils/ObjectUtils";
-import { useProgrammatic } from "@oruga-ui/oruga-next";
-import { useStore } from 'vuex'
-import { key } from '../store'
 
 const { t } = useI18n({
       inheritLocale: true,
@@ -20,7 +21,7 @@ const props = defineProps<{
   currentUser: User,
 }>()
 
-const createUser: UpdateUser = {"password" : "", "isAdmin" : undefined}
+const createUser = ref({"password" : "", "isAdmin" : undefined})
 console.log(props.currentUser)
 console.log(createUser)
 
@@ -31,9 +32,10 @@ const emit = defineEmits<{
 async function editUser(user: any) {
   console.log("edit user")
   console.log(createUser)
+  console.log(user)
   if (props.currentUser.id != null) {
     try {
-      let modified = await dataService.updateUser(props.currentUser.id, createUser)
+      let modified = await dataService.updateUser(props.currentUser.id, {"isAdmin": user.isAdmin, "password": user.password})
       store.commit('user', modified)
       ObjectUtils.toast(oruga, "success", t('admin_user.user_updated', {name : props.currentUser.login}), 2500)
       emit('close')