From 4c8a2d105cc396f2977a9637f207fb3bd964bfeb Mon Sep 17 00:00:00 2001
From: Petr Stefan <ptr.stef@gmail.com>
Date: Mon, 29 Jan 2018 18:30:00 +0100
Subject: [PATCH] Fix multiple SIS terms forms initial values

---
 .../SisIntegration/EditTerm/EditTerm.js       |  6 +++-
 .../TermsListItem/TermsListItem.js            | 33 +++++++++----------
 src/pages/SisIntegration/SisIntegration.js    |  9 +++--
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/components/SisIntegration/EditTerm/EditTerm.js b/src/components/SisIntegration/EditTerm/EditTerm.js
index 888e27e1b..54cd2a6ca 100644
--- a/src/components/SisIntegration/EditTerm/EditTerm.js
+++ b/src/components/SisIntegration/EditTerm/EditTerm.js
@@ -107,4 +107,8 @@ EditTerm.propTypes = {
   isOpen: PropTypes.bool.isRequired
 };
 
-export default reduxForm({ form: 'edit-sis-term' })(EditTerm);
+export default reduxForm({
+  form: 'edit-sis-term',
+  enableReinitialize: true,
+  keepDirtyOnReinitialize: false
+})(EditTerm);
diff --git a/src/components/SisIntegration/TermsListItem/TermsListItem.js b/src/components/SisIntegration/TermsListItem/TermsListItem.js
index 9912a8a87..629527188 100644
--- a/src/components/SisIntegration/TermsListItem/TermsListItem.js
+++ b/src/components/SisIntegration/TermsListItem/TermsListItem.js
@@ -2,46 +2,43 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage, FormattedDate, FormattedTime } from 'react-intl';
 
-const TermsListItem = ({
-  data: { id, year, term, beginning, end, advertiseUntil },
-  createActions
-}) =>
+const TermsListItem = ({ data, createActions }) =>
   <tr>
     <td>
-      {year}
+      {data.year}
     </td>
     <td>
-      {term === 1 &&
+      {data.term === 1 &&
         <FormattedMessage id="app.termsList.winter" defaultMessage="Winter" />}
-      {term === 2 &&
+      {data.term === 2 &&
         <FormattedMessage id="app.termsList.summer" defaultMessage="Summer" />}
-      {term !== 1 &&
-        term !== 2 &&
+      {data.term !== 1 &&
+        data.term !== 2 &&
         <span>
-          {term}
+          {data.term}
         </span>}
     </td>
     <td>
-      {beginning
-        ? <FormattedDate value={new Date(beginning * 1000)} />
+      {data.beginning
+        ? <FormattedDate value={new Date(data.beginning * 1000)} />
         : <span>&mdash;</span>}
     </td>
     <td>
-      {end
-        ? <FormattedDate value={new Date(end * 1000)} />
+      {data.end
+        ? <FormattedDate value={new Date(data.end * 1000)} />
         : <span>&mdash;</span>}
     </td>
     <td>
-      {advertiseUntil
+      {data.advertiseUntil
         ? <span>
-            <FormattedDate value={new Date(advertiseUntil * 1000)} />
+            <FormattedDate value={new Date(data.advertiseUntil * 1000)} />
             {', '}
-            <FormattedTime value={new Date(advertiseUntil * 1000)} />
+            <FormattedTime value={new Date(data.advertiseUntil * 1000)} />
           </span>
         : <span>&mdash;</span>}
     </td>
     <td className="text-right">
-      {createActions && createActions(id)}
+      {createActions && createActions(data.id, data)}
     </td>
   </tr>;
 
diff --git a/src/pages/SisIntegration/SisIntegration.js b/src/pages/SisIntegration/SisIntegration.js
index d31446db7..14053a217 100644
--- a/src/pages/SisIntegration/SisIntegration.js
+++ b/src/pages/SisIntegration/SisIntegration.js
@@ -88,7 +88,7 @@ class SisIntegration extends Component {
                 >
                   <TermsList
                     terms={sisTerms}
-                    createActions={id =>
+                    createActions={(id, data) =>
                       <div>
                         <Button
                           bsSize="xs"
@@ -125,13 +125,18 @@ class SisIntegration extends Component {
                           </Button>
                         </Confirm>
                         <EditTerm
-                          id={id}
+                          form={id}
                           isOpen={this.state.openEdit === id}
                           onClose={() => this.setState({ openEdit: null })}
                           onSubmit={data =>
                             editTerm(this.state.openEdit, data).then(() =>
                               this.setState({ openEdit: null })
                             )}
+                          initialValues={{
+                            beginning: data.beginning * 1000,
+                            end: data.end * 1000,
+                            advertiseUntil: data.advertiseUntil * 1000
+                          }}
                         />
                       </div>}
                   />