From 84b2fec38d9019dd277d0f28cceb864c9adf153b Mon Sep 17 00:00:00 2001
From: Unknown <nikolabjelo@gmail.com>
Date: Sun, 10 Feb 2019 20:41:30 +0100
Subject: [PATCH] Remove position from prizes/rules

---
 .../Event/Create/Tabs/Technical/Prizes/List.js   | 16 ++++------------
 .../Event/Create/Tabs/Technical/Rules/List.js    | 16 ++++------------
 .../Event/Edit/Tabs/Technical/Prizes/List.js     | 16 ++++------------
 .../Event/Edit/Tabs/Technical/Rules/List.js      | 16 ++++------------
 4 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/src/Components/Event/Create/Tabs/Technical/Prizes/List.js b/src/Components/Event/Create/Tabs/Technical/Prizes/List.js
index 4a08a93df..a1b310dd2 100644
--- a/src/Components/Event/Create/Tabs/Technical/Prizes/List.js
+++ b/src/Components/Event/Create/Tabs/Technical/Prizes/List.js
@@ -12,7 +12,7 @@ import {
 
 const DragHandle = SortableHandle(() => <div className='dragHandle' />);
 
-const SortableItem = SortableElement(({ value, deletePrize }) => (
+const SortableItem = SortableElement(({ value, deletePrize, index }) => (
   <div className='sortableListItem'>
     <Grid container spacing={16}>
       <Grid item>
@@ -27,7 +27,7 @@ const SortableItem = SortableElement(({ value, deletePrize }) => (
           </Typography>
         </Grid>
         <Grid item>
-          <Typography style={{ cursor: 'pointer' }} onClick={() => deletePrize(value.position)} >Remove</Typography>
+          <Typography style={{ cursor: 'pointer' }} onClick={() => deletePrize(index)} >Remove</Typography>
         </Grid>
       </Grid>
     </Grid>
@@ -44,22 +44,14 @@ const SortableList = SortableContainer(({ items, deletePrize }) => (
 
 class List extends React.Component {
   onSortEnd = ({ oldIndex, newIndex }) => {
-    let newPrizes = this.props.prizes.slice(0);
+    const newPrizes = this.props.prizes.slice(0);
     newPrizes.splice(newIndex, 0, newPrizes.splice(oldIndex, 1)[0]);
-    newPrizes = newPrizes.map((prize, index) => {
-      prize.position = index;
-      return prize;
-    });
     this.props.edit(newPrizes);
   }
 
   deletePrize = (deletedIndex) => {
-    let newPrizes = this.props.prizes.slice(0);
+    const newPrizes = this.props.prizes.slice(0);
     newPrizes.splice(deletedIndex, 1);
-    newPrizes = newPrizes.map((prize, index) => {
-      prize.position = index;
-      return prize;
-    });
     this.props.edit(newPrizes);
   }
 
diff --git a/src/Components/Event/Create/Tabs/Technical/Rules/List.js b/src/Components/Event/Create/Tabs/Technical/Rules/List.js
index c9570ae4c..e2966ae7d 100644
--- a/src/Components/Event/Create/Tabs/Technical/Rules/List.js
+++ b/src/Components/Event/Create/Tabs/Technical/Rules/List.js
@@ -12,7 +12,7 @@ import {
 
 const DragHandle = SortableHandle(() => <div className='dragHandle' />);
 
-const SortableItem = SortableElement(({ value, deleteRule }) => (
+const SortableItem = SortableElement(({ value, deleteRule, index }) => (
   <div className='sortableListItem'>
     <Grid container spacing={16}>
       <Grid item>
@@ -28,7 +28,7 @@ const SortableItem = SortableElement(({ value, deleteRule }) => (
           </Typography>
         </Grid>
         <Grid item>
-          <Typography style={{ cursor: 'pointer' }} onClick={() => deleteRule(value.position)} >Remove</Typography>
+          <Typography style={{ cursor: 'pointer' }} onClick={() => deleteRule(index)} >Remove</Typography>
         </Grid>
       </Grid>
     </Grid>
@@ -45,22 +45,14 @@ const SortableList = SortableContainer(({ items, deleteRule }) => (
 
 class List extends React.Component {
   onSortEnd = ({ oldIndex, newIndex }) => {
-    let newRules = this.props.rules.slice(0);
+    const newRules = this.props.rules.slice(0);
     newRules.splice(newIndex, 0, newRules.splice(oldIndex, 1)[0]);
-    newRules = newRules.map((rule, index) => {
-      rule.position = index;
-      return rule;
-    });
     this.props.edit(newRules);
   }
 
   deleteRule = (deletedIndex) => {
-    let newRules = this.props.rules.slice(0);
+    const newRules = this.props.rules.slice(0);
     newRules.splice(deletedIndex, 1);
-    newRules = newRules.map((rule, index) => {
-      rule.position = index;
-      return rule;
-    });
     this.props.edit(newRules);
   }
 
diff --git a/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js b/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js
index 4a08a93df..a1b310dd2 100644
--- a/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js
+++ b/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js
@@ -12,7 +12,7 @@ import {
 
 const DragHandle = SortableHandle(() => <div className='dragHandle' />);
 
-const SortableItem = SortableElement(({ value, deletePrize }) => (
+const SortableItem = SortableElement(({ value, deletePrize, index }) => (
   <div className='sortableListItem'>
     <Grid container spacing={16}>
       <Grid item>
@@ -27,7 +27,7 @@ const SortableItem = SortableElement(({ value, deletePrize }) => (
           </Typography>
         </Grid>
         <Grid item>
-          <Typography style={{ cursor: 'pointer' }} onClick={() => deletePrize(value.position)} >Remove</Typography>
+          <Typography style={{ cursor: 'pointer' }} onClick={() => deletePrize(index)} >Remove</Typography>
         </Grid>
       </Grid>
     </Grid>
@@ -44,22 +44,14 @@ const SortableList = SortableContainer(({ items, deletePrize }) => (
 
 class List extends React.Component {
   onSortEnd = ({ oldIndex, newIndex }) => {
-    let newPrizes = this.props.prizes.slice(0);
+    const newPrizes = this.props.prizes.slice(0);
     newPrizes.splice(newIndex, 0, newPrizes.splice(oldIndex, 1)[0]);
-    newPrizes = newPrizes.map((prize, index) => {
-      prize.position = index;
-      return prize;
-    });
     this.props.edit(newPrizes);
   }
 
   deletePrize = (deletedIndex) => {
-    let newPrizes = this.props.prizes.slice(0);
+    const newPrizes = this.props.prizes.slice(0);
     newPrizes.splice(deletedIndex, 1);
-    newPrizes = newPrizes.map((prize, index) => {
-      prize.position = index;
-      return prize;
-    });
     this.props.edit(newPrizes);
   }
 
diff --git a/src/Components/Event/Edit/Tabs/Technical/Rules/List.js b/src/Components/Event/Edit/Tabs/Technical/Rules/List.js
index c9570ae4c..e2966ae7d 100644
--- a/src/Components/Event/Edit/Tabs/Technical/Rules/List.js
+++ b/src/Components/Event/Edit/Tabs/Technical/Rules/List.js
@@ -12,7 +12,7 @@ import {
 
 const DragHandle = SortableHandle(() => <div className='dragHandle' />);
 
-const SortableItem = SortableElement(({ value, deleteRule }) => (
+const SortableItem = SortableElement(({ value, deleteRule, index }) => (
   <div className='sortableListItem'>
     <Grid container spacing={16}>
       <Grid item>
@@ -28,7 +28,7 @@ const SortableItem = SortableElement(({ value, deleteRule }) => (
           </Typography>
         </Grid>
         <Grid item>
-          <Typography style={{ cursor: 'pointer' }} onClick={() => deleteRule(value.position)} >Remove</Typography>
+          <Typography style={{ cursor: 'pointer' }} onClick={() => deleteRule(index)} >Remove</Typography>
         </Grid>
       </Grid>
     </Grid>
@@ -45,22 +45,14 @@ const SortableList = SortableContainer(({ items, deleteRule }) => (
 
 class List extends React.Component {
   onSortEnd = ({ oldIndex, newIndex }) => {
-    let newRules = this.props.rules.slice(0);
+    const newRules = this.props.rules.slice(0);
     newRules.splice(newIndex, 0, newRules.splice(oldIndex, 1)[0]);
-    newRules = newRules.map((rule, index) => {
-      rule.position = index;
-      return rule;
-    });
     this.props.edit(newRules);
   }
 
   deleteRule = (deletedIndex) => {
-    let newRules = this.props.rules.slice(0);
+    const newRules = this.props.rules.slice(0);
     newRules.splice(deletedIndex, 1);
-    newRules = newRules.map((rule, index) => {
-      rule.position = index;
-      return rule;
-    });
     this.props.edit(newRules);
   }