From 1c2651bbe93833834c20169e11137a586e5f6798 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 29 Jul 2022 21:40:08 +0200
Subject: [PATCH] fix(gui-v2): view sorting not persisting correctly

---
 .../components/smartsheet/sidebar/MenuTop.vue        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
index 0efe9ed656..b46542022a 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
@@ -78,21 +78,21 @@ function initializeSortable(el: HTMLElement) {
       const currentItem: Record<string, any> = views.value[oldIndex]
 
       // get items meta of before and after the moved item
-      const itemBefore: Record<string, any> = views.value[newIndex]
-      const itemAfter: Record<string, any> = views.value[newIndex + 1]
+      const nextItem: Record<string, any> = views.value[newIndex]
+      const previousItem: Record<string, any> = views.value[newIndex + 1]
 
       let nextOrder: number
 
       // set new order value based on the new order of the items
       if (views.value.length - 1 === newIndex) {
-        nextOrder = itemBefore.order + 1
+        nextOrder = parseFloat(nextItem.order) + 1
       } else if (newIndex === 0) {
-        nextOrder = itemAfter.order / 2
+        nextOrder = parseFloat(nextItem.order) / 2
       } else {
-        nextOrder = (itemBefore.order + itemAfter.order) / 2
+        nextOrder = (parseFloat(nextItem.order) + parseFloat(previousItem.order)) / 2
       }
 
-      await api.dbView.update(currentItem.id, { order: nextOrder.toString() })
+      await api.dbView.update(currentItem.id, { order: !isNaN(Number(nextOrder)) ? nextOrder.toString() : oldIndex.toString() })
     },
     animation: 150,
   })