Factions are now props in tasklist

src/components/GameView.js

@@ -167,6 +167,7 @@ export default class GameView extends React.Component {
               <TaskListButton
                 gameId={this.state.gameInfo.id}
                 role={this.state.role}
+                factions={this.state.gameInfo.factions}
               />
             )}
             {this.state.role !== "admin" && this.state.role !== "" && (

src/components/TaskList.js

@@ -9,14 +9,12 @@ class TaskList extends React.Component {
       taskNameInput: "", // >= 3
       taskDescriptionInput: "", // no limits
       tasks: [],
-      factionlist: [],
       selectedFactionId: ""
     };
   }
 
   componentDidMount() {
     this.getTasks(this.props.gameId);
-    this.getFactionlist(this.props.gameId); // TODO: remove if the user is not admin?
   }
 
   getTasks(gameId) {
@@ -42,25 +40,6 @@ class TaskList extends React.Component {
       .catch(error => console.log(error));
   }
 
-  getFactionlist(gameId) {
-    fetch(`${process.env.REACT_APP_API_URL}/game/${gameId}`, {
-      method: "GET"
-    })
-      .then(result => {
-        if (!result.ok) {
-          throw Error(result.responseText);
-        } else {
-          return result.json();
-        }
-      })
-      .then(result => {
-        this.setState({
-          factionlist: result.factions
-        });
-      })
-      .catch(error => console.log(error));
-  }
-
   handleTaskCreation = e => {
     e.preventDefault();
     if (this.state.taskNameInput === "") {
@@ -206,10 +185,10 @@ class TaskList extends React.Component {
       }
     }
 
-    let factionlistItems = this.state.factionlist.map(item => {
+    let factionlistItems = this.props.factions.map(faction => {
       return (
-        <option key={item.factionId} value={item.factionId}>
-          {item.factionName}
+        <option key={faction.factionId} value={faction.factionId}>
+          {faction.factionName}
         </option>
       );
     });

src/components/TaskListButton.js

@@ -45,7 +45,11 @@ export default class TaskListButton extends React.Component {
           Tasks
         </button>
         {this.state.open && (
-          <TaskList gameId={this.props.gameId} role={this.props.role} />
+          <TaskList
+            gameId={this.props.gameId}
+            role={this.props.role}
+            factions={this.props.factions}
+          />
         )}
       </Fragment>
     );