Merge pull request #228 from tomaszrondio/2.0

fix: content lists drag and drop matching id's'
superdesk · Dec 31, 2019 · 2d587f4 · 2d587f4
2 parents eadb050 + fff00ae
commit 2d587f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/client/components/ContentLists/Manual/Manual.jsx b/client/components/ContentLists/Manual/Manual.jsx
@@ -395,6 +395,9 @@ class Manual extends React.Component {
     return list;
   };
 
+  getDraggableId = item =>
+    item.content ? item.id + "_" + item.content.id : item.id;
+
   render() {
     let filteredContentListItems = this.markDuplicates([
       ...this.state.list.items
@@ -486,7 +489,7 @@ class Manual extends React.Component {
                       {filteredContentListItems.map((item, index) => (
                         <Draggable
                           key={"list" + item.id}
-                          draggableId={item.id}
+                          draggableId={this.getDraggableId(item)}
                           index={index}
                         >
                           {(provided, snapshot) => (
@@ -560,7 +563,7 @@ class Manual extends React.Component {
                       {this.state.articles.items.map((item, index) => (
                         <Draggable
                           key={"article" + item.id}
-                          draggableId={item.id}
+                          draggableId={this.getDraggableId(item)}
                           index={index}
                         >
                           {(provided, snapshot) => (

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "moment": "^2.24.0",
     "ng-file-upload": "^12.2.13",
     "ng-infinite-scroll": "^1.3.0",
-    "react-awesome-slider": "^1.0.1",
+    "react-awesome-slider": "^1.2.0",
     "react-beautiful-dnd": "^11.0.5",
     "react-select": "^3.0.4",
     "react-virtualized-auto-sizer": "^1.0.2",