fix/dnd-bugs (#721)

Codeminer42 · Mar 23, 2021 · d83c594 · d83c594
1 parent 8b190c4
commit d83c594
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 5 deletions.
diff --git a/app/assets/javascripts/components/Columns/ColumnItem.js b/app/assets/javascripts/components/Columns/ColumnItem.js
@@ -33,7 +33,7 @@ export const Column = ({ title, children, renderAction, onClose, canClose, provi
 
 const DroppableColumn = ({ title, children, renderAction, onClose, visible, canClose, columnId }) => (
   visible && (
-    <Droppable droppableId={JSON.stringify({ columnId })} isDropDisabled={isDone(columnId)}>
+    <Droppable droppableId={JSON.stringify({ columnId })} isDropDisabled={isDone(columnId)} type='column'>
       {provided => (
         <Column
           canClose={canClose}

diff --git a/app/assets/javascripts/components/projects/ProjectBoard.js b/app/assets/javascripts/components/projects/ProjectBoard.js
@@ -92,7 +92,6 @@ export const ProjectBoard = ({
       dragStory.state,
     );
 
-
     const newStories = moveStory(
       sourceArray,
       destinationArray,

diff --git a/app/assets/javascripts/components/stories/Sprints.js b/app/assets/javascripts/components/stories/Sprints.js
@@ -30,7 +30,7 @@ const renderSprints = (sprints, fetchStories, columnId) => (
 )
 
 const droppableContainer = columnId => (
-  <Droppable droppableId={JSON.stringify({columnId, sprintIndex: 0})}>
+  <Droppable droppableId={JSON.stringify({columnId, sprintIndex: 0})} type='sprints'>
     {provided => (
       <div className='Sprints' ref={provided.innerRef} {...provided.droppableProps}>
         {provided.placeholder}

diff --git a/app/assets/javascripts/components/stories/Stories.js b/app/assets/javascripts/components/stories/Stories.js
@@ -8,6 +8,7 @@ const Stories = ({ stories, from, sprintIndex, columnId, isDropDisabled }) => (
   <Droppable
     droppableId={JSON.stringify({ columnId, sprintIndex })}
     isDropDisabled={isDropDisabled}
+    type='stories'
   >
     {provided => (
       <div

diff --git a/app/assets/stylesheets/new_board/_project_board.scss b/app/assets/stylesheets/new_board/_project_board.scss
@@ -4,7 +4,7 @@
   overflow: inherit;
   padding-top: 2px;
   max-width: 100%;
-  overflow: auto hidden;
+  overflow: hidden;
 
   &-loading {
     display: flex;

diff --git a/spec/cypress/integration/dragAndDrop_spec.js b/spec/cypress/integration/dragAndDrop_spec.js
@@ -179,6 +179,38 @@ describe("DragAndDrop", () => {
       // check new order
       cy.getDraggablesFromColumn(backlog).should("contain", dragStory);
       cy.getDraggablesFromColumn(done).should("not.contain", dragStory);
-    })
+    });
+
+    it("Drags to closed and reopened columns", () => {
+      const dragStory =
+        "A user should be able drag this story from chilly bean and drop to backlog";
+
+      // close first column
+      cy.contains("close").click();
+
+      cy.wait(300);
+
+      // close second column
+      cy.contains("close").click();
+
+      cy.wait(300);
+
+      // reopen chillybin column
+      cy.get('i[class$="fa-snowflake"]').click();
+
+      cy.wait(300);
+
+      //reopen backlog/current sprint column
+      cy.get('i[class$="fa-th-list"]').click();
+
+      // move story
+      cy.getDraggablesFromColumn(chillyBin)
+        .eq(1)
+        .as("drag-element")
+        .moveStory("@drag-element", Keys.arrowRight, Keys.space);
+
+      cy.getDraggablesFromColumn(backlog).should("contain", dragStory);
+
+    });
   });
 });