fix(desk): not updating entries

Author: zzhenryquezz

packages/desktop/modules/collection/pages/CList.vue

@@ -61,6 +61,8 @@ async function submit() {
     Object.keys(payload.value).forEach((key) => {
         payload.value[key] = ''
     })
+
+    dialog.value = false
 }
 
 // Delete collection
@@ -72,7 +74,7 @@ async function deleteItem(collectionId: string) {
     <div>
         <v-dialog v-model="dialog">
             <v-card color="b-secondary" width="500">
-                <v-card-head>
+                <v-card-head class="px-4">
                     <v-card-title>
                         {{ $t('addEntity', [$t('collection')]) }}
                     </v-card-title>
@@ -99,7 +101,11 @@ async function deleteItem(collectionId: string) {
                             />
                         </div>
 
-                        <v-btn :disabled="!payload.name || !payload.path" class="w-full">
+                        <v-btn
+                            :disabled="!payload.name || !payload.path"
+                            class="w-full"
+                            type="submit"
+                        >
                             {{ $t('create') }}
                         </v-btn>
                     </w-form>

packages/desktop/modules/entry/pages/EFolder.vue

@@ -171,6 +171,12 @@ function updateSelection() {
 }
 
 watch(selected, updateSelection)
+watch(
+    () => props.path,
+    () => {
+        selected.value = []
+    }
+)
 
 onKeyStroke(['ArrowDown', 'ArrowUp'], (e) => {
     if (!entries.value.length) return
@@ -201,7 +207,12 @@ async function updateItem(item: DirectoryEntry) {
 
     const index = editItem.value
 
-    if (!index) return
+    if (index === undefined) return
+
+    if (newPath === item.path) {
+        editItem.value = undefined
+        return
+    }
 
     await store
         .update({
@@ -215,16 +226,28 @@ async function updateItem(item: DirectoryEntry) {
         .catch(() => {
             item.name = DirectoryEntry.basename(item.path)
         })
+
+    editItem.value = undefined
 }
 
 watch(selected, () => (editItem.value = undefined))
 
 // show
 
 function show(item: DirectoryEntry) {
-    if (editItem.value) return
+    if (editItem.value !== undefined) return
+
+    return router.push(`/entries/${item.path}`)
+}
+
+async function onEnter(item: DirectoryEntry) {
+    const index = entries.value.indexOf(item)
+
+    const promise = editItem.value === index ? updateItem : show
+
+    await promise(item)
 
-    router.push(`/entries/${item.path}`)
+    updateSelection()
 }
 </script>
 
@@ -280,10 +303,9 @@ function show(item: DirectoryEntry) {
                             tabindex="0"
                             @dblclick="show(item)"
                             @click="onSelect($event, index)"
-                            @keydown.enter="show(item)"
+                            @keyup.enter="onEnter(item)"
                             @keydown.f2="editItem = index"
                             @keydown.esc="updateSelection"
-                            @mousedown.prevent
                         >
                             <v-td class="pl-10 flex pr-7">
                                 <div class="w-4 mr-2">
@@ -297,7 +319,6 @@ function show(item: DirectoryEntry) {
                                     size="sm"
                                     class="w-full max-w-[70%]"
                                     autofocus
-                                    @keypress.enter="updateItem(item)"
                                 />
 
                                 <div