From 7f0db243e9247e8b36d5d9c255595714d2c69e63 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 2 Feb 2024 13:29:07 +0000
Subject: [PATCH] fix: add base order on creating new base

---
 .../components/dashboard/TreeView/index.vue   |  2 +-
 packages/nc-gui/store/bases.ts                | 25 +++++++++++++++++++
 packages/nocodb/src/models/Base.ts            |  5 ++++
 packages/nocodb/src/services/bases.service.ts |  4 ---
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/index.vue b/packages/nc-gui/components/dashboard/TreeView/index.vue
index d98bb73ddf..582be12766 100644
--- a/packages/nc-gui/components/dashboard/TreeView/index.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import Draggable from 'vuedraggable'
 import type { TableType } from 'nocodb-sdk'
-
 import ProjectWrapper from './ProjectWrapper.vue'
 
 import {
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index d4e3b0fa82..6ec5428be5 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -9,6 +9,8 @@ import type { NcProject, User } from '#imports'
 export const useBases = defineStore('basesStore', () => {
   const { $api } = useNuxtApp()
 
+  const { isUIAllowed } = useRoles()
+
   const bases = ref<Map<string, NcProject>>(new Map())
 
   const basesList = computed<NcProject[]>(() =>
@@ -150,6 +152,8 @@ export const useBases = defineStore('basesStore', () => {
         })
         return acc
       }, new Map())
+
+      await updateNullBaseOrder()
     } catch (e) {
       console.error(e)
       message.error(e.message)
@@ -300,6 +304,27 @@ export const useBases = defineStore('basesStore', () => {
     await navigateTo(`/nc/${baseId}`)
   }
 
+  async function updateNullBaseOrder() {
+    if (!isUIAllowed('baseMove')) return
+    
+    const basesArray = Array.from(bases.value.values())
+    const isOrderNullPresent = basesArray.some((base) => base.order === null)
+    if (isOrderNullPresent) {
+      const orderUpdateBasesList = basesArray.map((base, i) => {
+        bases.value.set(base.id!, { ...base, order: i + 1 })
+
+        return {
+          id: base.id,
+          order: i + 1,
+        }
+      })
+
+      for (const orderUpdateBase of orderUpdateBasesList) {
+        await api.base.update(orderUpdateBase.id!, { order: orderUpdateBase.order })
+      }
+    }
+  }
+
   onMounted(() => {
     if (!activeProjectId.value) return
     if (isProjectPopulated(activeProjectId.value)) return
diff --git a/packages/nocodb/src/models/Base.ts b/packages/nocodb/src/models/Base.ts
index 96d81c9ad8..e7c726aa80 100644
--- a/packages/nocodb/src/models/Base.ts
+++ b/packages/nocodb/src/models/Base.ts
@@ -57,6 +57,11 @@ export default class Base implements BaseType {
       'order',
     ]);
 
+    if (!insertObj.order) {
+      // get order value
+      insertObj.order = await ncMeta.metaGetNextOrder(MetaTable.PROJECT, {});
+    }
+
     const { id: baseId } = await ncMeta.metaInsert2(
       null,
       null,
diff --git a/packages/nocodb/src/services/bases.service.ts b/packages/nocodb/src/services/bases.service.ts
index 0cd03a34d6..58ab4d6db5 100644
--- a/packages/nocodb/src/services/bases.service.ts
+++ b/packages/nocodb/src/services/bases.service.ts
@@ -196,10 +196,6 @@ export class BasesService {
     baseBody.title = DOMPurify.sanitize(baseBody.title);
     baseBody.slug = baseBody.title;
 
-    const bases = await Base.list(param);
-
-    console.log('list', bases);
-
     const base = await Base.createProject(baseBody);
 
     // TODO: create n:m instances here