From 59c53a09f2bb24766669fd9668be5355de73f568 Mon Sep 17 00:00:00 2001
From: Sergei Ogorelkov <sergei.ogorelkov@xored.com>
Date: Mon, 6 Feb 2023 21:34:52 +0600
Subject: [PATCH] Fix "SortableList" drag n drop with descending sorting
 (#2591)

Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@xored.com>
---
 .../src/components/list/SortableList.svelte        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/view-resources/src/components/list/SortableList.svelte b/plugins/view-resources/src/components/list/SortableList.svelte
index e50d8ceb32..30b334477d 100644
--- a/plugins/view-resources/src/components/list/SortableList.svelte
+++ b/plugins/view-resources/src/components/list/SortableList.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, FindOptions, FindResult, Ref } from '@hcengineering/core'
+  import { Class, Doc, DocumentQuery, FindOptions, FindResult, Ref, SortingOrder } from '@hcengineering/core'
   import { Asset, getResource, IntlString } from '@hcengineering/platform'
   import presentation, { createQuery, getClient } from '@hcengineering/presentation'
   import { calcRank, DocWithRank } from '@hcengineering/task'
@@ -49,6 +49,7 @@
   export let icon: Asset | undefined = undefined
   export let iconSize: IconSize = 'small'
 
+  const SORTING_ORDER = SortingOrder.Ascending
   const client = getClient()
   const hierarchy = client.getHierarchy()
   const itemsQuery = createQuery()
@@ -121,9 +122,12 @@
         items[draggingIndex < itemIndex ? itemIndex + 1 : itemIndex] as DocWithRank
       ]
 
+      const sortingOrder = queryOptions?.sort?.rank ?? SORTING_ORDER
+      const rank = sortingOrder === SortingOrder.Ascending ? calcRank(prev, next) : calcRank(next, prev)
+
       try {
         areItemsSorting = true
-        await client.update(item, { rank: calcRank(prev, next) })
+        await client.update(item, { rank })
       } finally {
         areItemsSorting = false
       }
@@ -149,7 +153,11 @@
 
   $: !$$slots.object && updatePresenter(_class)
   $: updateObjectFactory(_class)
-  $: itemsQuery.query(_class, query, updateItems, { ...queryOptions, limit: Math.max(queryOptions?.limit ?? 0, 200) })
+  $: itemsQuery.query(_class, query, updateItems, {
+    ...(isSortable ? { sort: { rank: SORTING_ORDER } } : {}),
+    ...(queryOptions ?? {}),
+    limit: Math.max(queryOptions?.limit ?? 0, 200)
+  })
 
   $: isLoading = isPresenterLoading || areItemsloading
   $: isSortable = hierarchy.getAllAttributes(_class).has('rank')