From 4945b5655a1df6b30162b36c447cbd63b5e3fba7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 9 Dec 2022 16:41:23 +0530
Subject: [PATCH] feat(gui): allow project reordering for super admin user

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/pages/index/index/index.vue   | 113 +++++++++++++++++-
 packages/nocodb/src/lib/Noco.ts               |   2 +-
 .../nocodb/src/lib/meta/api/projectApis.ts    |  12 +-
 packages/nocodb/src/lib/models/Project.ts     |  11 ++
 packages/nocodb/src/lib/models/ProjectUser.ts |   2 +-
 .../src/lib/version-upgrader/NcUpgrader.ts    |   2 +
 .../ncProjectOrderUpgrader.ts                 |  18 +++
 7 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 packages/nocodb/src/lib/version-upgrader/ncProjectOrderUpgrader.ts

diff --git a/packages/nc-gui/pages/index/index/index.vue b/packages/nc-gui/pages/index/index/index.vue
index 262a57f1fd..8b3bb91c92 100644
--- a/packages/nc-gui/pages/index/index/index.vue
+++ b/packages/nc-gui/pages/index/index/index.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
+import type { Table } from 'ant-design-vue'
 import type { ProjectType } from 'nocodb-sdk'
+import Sortable from 'sortablejs'
 import tinycolor from 'tinycolor2'
 import { breakpointsTailwind } from '@vueuse/core'
 import {
@@ -43,6 +45,7 @@ const { appInfo } = useGlobal()
 const loadProjects = async () => {
   const response = await api.project.list({})
   projects.value = response.list
+  await initSortable()
 }
 
 const filteredProjects = computed(
@@ -139,6 +142,113 @@ const copyProjectMeta = async () => {
   copy(JSON.stringify(aggregatedMetaInfo))
   message.info('Copied aggregated project meta to clipboard')
 }
+
+const table = ref<typeof Table>()
+
+let sortableInstance: Sortable
+
+const extractTableRowId = (el?: HTMLElement | null) => {
+  return el?.querySelector('[data-project-id]')?.getAttribute('data-project-id')
+}
+
+// todo: replace with vuedraggable
+function initSortable() {
+  // const base_id = el.getAttribute('nc-base')
+  sortableInstance?.destroy()
+
+  sortableInstance = Sortable.create(table.value?.$el?.querySelector('.ant-table-tbody') as HTMLLIElement, {
+    // handle: '.nc-drag-icon',
+    onEnd: async (evt) => {
+      console.log(evt)
+      const projectId = extractTableRowId(evt.item)
+      console.log(projectId)
+
+      const prevElement = evt.item?.previousElementSibling
+      const nextElement = evt.item?.nextElementSibling
+
+      let prevElementIndex = -1
+      let nextElementIndex = -1
+
+      // find the adjacent siblings index
+      if (!prevElement && !nextElement) {
+        return
+      } else if (!prevElement) {
+        nextElementIndex = projects.value?.findIndex((p) => p.id === extractTableRowId(nextElement))
+        if (nextElementIndex > 0) prevElementIndex = nextElementIndex - 1
+      } else {
+        prevElementIndex = projects.value?.findIndex((p) => p.id === extractTableRowId(prevElement))
+        if (prevElementIndex < projects.value!.length - 1) nextElementIndex = prevElementIndex + 1
+      }
+
+      if (prevElementIndex === -1 && nextElementIndex === -1) return
+
+      let newOrder
+
+      if (prevElementIndex === -1) {
+        newOrder = projects.value![nextElementIndex].order / 2
+      } else if (nextElementIndex === -1) {
+        newOrder = projects.value![prevElementIndex].order + 1
+      } else {
+        newOrder = ((projects.value![prevElementIndex].order ?? 1) + (projects.value![nextElementIndex].order ?? 1)) / 2
+      }
+
+      console.log({ newOrder, prevElementIndex, nextElementIndex, nextElement, prevElement })
+      // Update local project
+      const localProject = projects.value?.find((p) => p.id === projectId)
+
+      if (localProject) {
+        localProject.order = newOrder
+      }
+
+      // sync project order with server
+      await $api.project.update(projectId, { order: newOrder })
+
+      /*   let updatedElementOrder: number
+
+         // if moved to the beginning
+         if (!prevElement) {
+           const nextElementIndex = projects.value?.findIndex(
+             (p) => p.id === nextElement?.querySelector('[data-project-id]').getAttribute('data-project-id'),
+           )
+           updatedElementOrder = projects.value?.[nextElementIndex!].order! / 2
+         }
+         // if moved to the ending
+         else if (!nextElement) {
+           const prevElementIndex = projects.value?.findIndex(
+             (p) => p.id === prevElement?.querySelector('[data-project-id]')?.getAttribute('data-project-id'),
+           )
+           updatedElementOrder = (projects.value?.[prevElementIndex!].order ?? 1) + 1
+         }
+         // if moved in between
+         else {
+
+
+           const nextElementIndex = projects.value?.findIndex(
+             (p) => p.id === nextElement?.querySelector('[data-project-id]')?.getAttribute('data-project-id'),
+           )
+           const prevElementIndex = projects.value?.findIndex(
+             (p) => p.id === prevElement?.querySelector('[data-project-id]')?.getAttribute('data-project-id'),
+           )
+
+           console.log({
+             prevElement,
+             nextElement,
+             nextElementIndex,
+             prevElementIndex,
+             prevElementOrder: projects.value?.[prevElementIndex!].order,
+             nextElementOrder: projects.value?.[nextElementIndex!].order,
+           })
+
+           updatedElementOrder = ((projects.value?.[nextElementIndex!].order ?? 1) + (projects.value?.[prevElementIndex!].order ?? 1)) / 2
+         }
+
+         console.log({ updatedElementOrder })
+
+   */
+    },
+    animation: 150,
+  })
+}
 </script>
 
 <template>
@@ -221,6 +331,7 @@ const copyProjectMeta = async () => {
 
     <a-table
       v-else
+      ref="table"
       :custom-row="customRow"
       :data-source="filteredProjects"
       :pagination="{ position: ['bottomCenter'] }"
@@ -233,7 +344,7 @@ const copyProjectMeta = async () => {
       <!-- Title -->
       <a-table-column key="title" :title="$t('general.title')" data-index="title">
         <template #default="{ text, record }">
-          <div class="flex items-center">
+          <div class="flex items-center nc-project-title" :data-project-id="record.id">
             <div @click.stop>
               <a-menu class="!border-0 !m-0 !p-0" trigger-sub-menu-action="click">
                 <template v-if="isUIAllowed('projectTheme')">
diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts
index 0dc767c026..71258fa3ba 100644
--- a/packages/nocodb/src/lib/Noco.ts
+++ b/packages/nocodb/src/lib/Noco.ts
@@ -101,7 +101,7 @@ export default class Noco {
   constructor() {
     process.env.PORT = process.env.PORT || '8080';
     // todo: move
-    process.env.NC_VERSION = '0098005';
+    process.env.NC_VERSION = '0100003';
 
     // if env variable NC_MINIMAL_DBS is set, then disable project creation with external sources
     if (process.env.NC_MINIMAL_DBS) {
diff --git a/packages/nocodb/src/lib/meta/api/projectApis.ts b/packages/nocodb/src/lib/meta/api/projectApis.ts
index e2f07a1147..85977b2b6a 100644
--- a/packages/nocodb/src/lib/meta/api/projectApis.ts
+++ b/packages/nocodb/src/lib/meta/api/projectApis.ts
@@ -56,8 +56,18 @@ export async function projectUpdate(
     'title',
     'meta',
     'color',
+    'order',
   ]);
 
+  // todo: maintain project order in user_project table for non super admin users
+  // block project order update for non super admin users
+  if (
+    'order' in data &&
+    !req['user']?.roles?.includes(OrgUserRoles.SUPER_ADMIN)
+  ) {
+    NcError.forbidden('Only super admin can update order');
+  }
+
   if (
     data?.title &&
     project.title !== data.title &&
@@ -465,7 +475,7 @@ export async function projectInfoGet(_req, res) {
 export async function projectCost(req, res) {
   let cost = 0;
   const project = await Project.getWithInfo(req.params.projectId);
-  
+
   for (const base of project.bases) {
     const sqlClient = NcConnectionMgrv2.getSqlClient(base);
     const userCount = await ProjectUser.getUsersCount(req.query);
diff --git a/packages/nocodb/src/lib/models/Project.ts b/packages/nocodb/src/lib/models/Project.ts
index cf1cdf5a4d..1174079aac 100644
--- a/packages/nocodb/src/lib/models/Project.ts
+++ b/packages/nocodb/src/lib/models/Project.ts
@@ -54,6 +54,9 @@ export default class Project implements ProjectType {
         is_meta: projectBody.is_meta,
         created_at: projectBody.created_at,
         updated_at: projectBody.updated_at,
+        order:
+          projectBody.order ??
+          (await ncMeta.metaGetNextOrder(MetaTable.PROJECT, {})),
       }
     );
 
@@ -101,6 +104,9 @@ export default class Project implements ProjectType {
             },
           ],
         },
+        orderBy: {
+          order: 'asc',
+        },
       });
       await NocoCache.setList(CacheScope.PROJECT, [], projectList);
     }
@@ -261,6 +267,11 @@ export default class Project implements ProjectType {
       }
       o = { ...o, ...updateObj };
 
+      // if order is changed, delete existing project list to get new ordered list
+      if ('order' in updateObj) {
+        await NocoCache.delAll(CacheScope.PROJECT, '*');
+      }
+
       await NocoCache.del(CacheScope.INSTANCE_META);
 
       // set cache
diff --git a/packages/nocodb/src/lib/models/ProjectUser.ts b/packages/nocodb/src/lib/models/ProjectUser.ts
index c4c7454a31..1f485f5c41 100644
--- a/packages/nocodb/src/lib/models/ProjectUser.ts
+++ b/packages/nocodb/src/lib/models/ProjectUser.ts
@@ -245,7 +245,7 @@ export default class ProjectUser {
         this.where(`${MetaTable.PROJECT}.deleted`, false).orWhereNull(
           `${MetaTable.PROJECT}.deleted`
         );
-      });
+      }).orderBy('order', 'asc');
 
     if (projectList?.length) {
       await NocoCache.setList(CacheScope.USER_PROJECT, [userId], projectList);
diff --git a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
index a51d04910b..23878d85d7 100644
--- a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
@@ -8,6 +8,7 @@ import ncProjectEnvUpgrader0011045 from './ncProjectEnvUpgrader0011045';
 import ncProjectUpgraderV2_0090000 from './ncProjectUpgraderV2_0090000';
 import ncDataTypesUpgrader from './ncDataTypesUpgrader';
 import ncProjectRolesUpgrader from './ncProjectRolesUpgrader';
+import ncProjectOrderUpgrader from './ncProjectOrderUpgrader';
 
 const log = debug('nc:version-upgrader');
 import boxen from 'boxen';
@@ -35,6 +36,7 @@ export default class NcUpgrader {
         { name: '0090000', handler: ncProjectUpgraderV2_0090000 },
         { name: '0098004', handler: ncDataTypesUpgrader },
         { name: '0098005', handler: ncProjectRolesUpgrader },
+        { name: '0100003', handler: ncProjectOrderUpgrader },
       ];
       if (!(await ctx.ncMeta.knexConnection?.schema?.hasTable?.('nc_store'))) {
         return;
diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectOrderUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectOrderUpgrader.ts
new file mode 100644
index 0000000000..5fbdb8ae23
--- /dev/null
+++ b/packages/nocodb/src/lib/version-upgrader/ncProjectOrderUpgrader.ts
@@ -0,0 +1,18 @@
+import { MetaTable } from '../utils/globals'
+import { NcUpgraderCtx } from './NcUpgrader'
+
+/** Upgrader for upgrading roles */
+export default async function({ ncMeta }: NcUpgraderCtx) {
+  const projects = await ncMeta.metaList2(null, null, MetaTable.PROJECT)
+
+  let order = 0;
+  for (const project of projects) {
+    await ncMeta.metaUpdate(
+      null,
+      null,
+      MetaTable.PROJECT,
+      {
+      order: ++order,
+    }, project.id)
+  }
+}