Merge pull request #155 from agileseason/151-fix-drop-issue-into-the-…

…column-header Fix issue position when drop into the column header
agileseason · Feb 18, 2023 · cd8db70 · cd8db70
2 parents ec40bcf + 4aaf3ed
commit cd8db70
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/src/components/app_drop.vue b/src/components/app_drop.vue
@@ -21,6 +21,16 @@
 
 import * as Sentry from '@sentry/browser';
 
+const COLUMN_TOP_CLASSES = {
+  'column-drag': true,
+  'header': true,
+  'issues-count': true,
+  'name-wrapper': true,
+  'name': true,
+  'issue-new': true,
+  'column-settings': true
+};
+
 export default {
   props: {
     transferData: {
@@ -35,7 +45,10 @@ export default {
 
       try {
         const transferData = JSON.parse(payload);
-        this.$emit('drop', transferData);
+        this.$emit( 'drop', {
+          ...transferData,
+          isColumnTop: !!COLUMN_TOP_CLASSES[e.toElement.className]
+        });
       } catch (e) {
         Sentry.setContext('transferData', { payload });
         Sentry.captureException(e);

diff --git a/src/components/board/column.vue b/src/components/board/column.vue
@@ -6,6 +6,7 @@
     :transferData="{ type: 'column', enterColumnIndex: columnIndex }"
   >
     <AppDrag
+      class='column-drag'
       :transferData="{ type: 'column', fromColumnIndex: columnIndex }"
       :is-read-only='isReadOnly'
     >
@@ -431,6 +432,7 @@ export default {
           background-image: url('../../assets/icons/dots-hover.svg')
 
   .body
+    border-radius: 4px
     height: calc(100vh - 80px)
     overflow-y: scroll
 

diff --git a/src/mixins/moving_issues_and_columns.js b/src/mixins/moving_issues_and_columns.js
@@ -23,12 +23,13 @@ export default {
         this.moveIssue(transferData)
       }
     },
-    moveIssue({ fromColumnIndex, fromIssueIndex }) {
+    moveIssue({ fromColumnIndex, fromIssueIndex, isColumnTop }) {
       this.moveColumnIssue({
         fromColumnIndex,
         toColumnIndex: this.columnIndex,
         fromIssueIndex: fromIssueIndex,
-        toIssueIndex: this.issueIndex
+        toIssueIndex: this.issueIndex,
+        isColumnTop
       });
     },
     moveColumn({ fromColumnIndex }) {

diff --git a/src/store/modules/board.js b/src/store/modules/board.js
@@ -99,7 +99,7 @@ export default {
 
     async moveIssue(
       { commit, getters, state, dispatch },
-      { fromColumnIndex, toColumnIndex, fromIssueIndex, toIssueIndex }
+      { fromColumnIndex, toColumnIndex, fromIssueIndex, toIssueIndex, isColumnTop }
     ) {
       if (fromColumnIndex === undefined) { return; }
       if (toColumnIndex === undefined) { return; }
@@ -110,9 +110,14 @@ export default {
         // Однозначно, куда был перемещен тикет по данным параметрам
         // не представляется возмоным. Есть только 2а варианта:
         // 1) Пример ниже для перемещения в самый низ.
-        toIssueIndex = state.columns[toColumnIndex].issues.length + 1;
+        // toIssueIndex = state.columns[toColumnIndex].issues.length + 1;
         // 2) Пример ниже для перемещения в самый верх.
         // toIssueIndex = 0;
+        if (isColumnTop) {
+          toIssueIndex = 0;
+        } else {
+          toIssueIndex = state.columns[toColumnIndex].issues.length + 1;
+        }
       }
 
       const fromIssues = state.columns[fromColumnIndex].issues;