From d5e8181855f5f8b2190f604344e472a5a0034904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Wed, 19 Aug 2015 16:02:10 +0200
Subject: [PATCH] make cyland submission stateful

---
 .../ascribe_buttons/cyland_submit_button.js       |  9 ++++++++-
 .../ascribe_forms/cyland_additional_data_form.js  | 13 -------------
 .../components/cyland/cyland_register_piece.js    | 15 ++++++++++-----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js b/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js
index a4c23e41..ab7723ea 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js
+++ b/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js
@@ -36,12 +36,19 @@ let CylandSubmitButton = React.createClass({
     },
 
     render() {
+        let piece = this.props.piece;
+        let startFrom = 1;
+
+        if(piece && piece.extra_data && Object.keys(piece.extra_data).length > 0) {
+            startFrom = 2;
+        }
+
         return (
             <ButtonLink
                 to="register_piece"
                 query={{
                     'slide_num': 0,
-                    'start_from': 1,
+                    'start_from': startFrom,
                     'piece_id': this.props.piece.id
                 }}
                 className={classNames('btn', 'btn-default', 'btn-xs', this.props.className)}>
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
index 95e55fca..38eeee7f 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
@@ -64,17 +64,6 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     render() {
-        let artistBio = '';
-        let conceptualOverview = '';
-
-        if (Object.keys(this.props.piece).length !== 0 && Object.keys(this.props.piece.extra_data).length !== 0) {
-            let extraData = this.props.piece.extra_data;
-
-            artistBio = extraData.artist_bio;
-            conceptualOverview = extraData.conceptual_overview;
-        }
-
-
         if(this.props.piece && this.props.piece.id) {
             return (
                 <Form
@@ -107,7 +96,6 @@ let CylandAdditionalDataForm = React.createClass({
                             rows={1}
                             editable={true}
                             placeholder={getLangText('Enter the artist\'s biography...')}
-                            defaultValue={artistBio}
                             required="required"/>
                     </Property>
                     <Property
@@ -118,7 +106,6 @@ let CylandAdditionalDataForm = React.createClass({
                             rows={1}
                             editable={true}
                             placeholder={getLangText('Enter a conceptual overview...')}
-                            defaultValue={conceptualOverview}
                             required="required"/>
                     </Property>
                     <FurtherDetailsFileuploader
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
index 5e96a1e6..1c07bbd1 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
@@ -92,6 +92,8 @@ let CylandRegisterPiece = React.createClass({
 
     handleRegisterSuccess(response){
 
+        this.refreshPieceList();
+
         // also start loading the piece for the next step
         if(response && response.piece) {
             PieceActions.updatePiece(response.piece);
@@ -101,6 +103,7 @@ let CylandRegisterPiece = React.createClass({
     },
 
     handleAdditionalDataSuccess() {
+        this.refreshPieceList();
         this.refs.slidesContainer.nextSlide();
     },
 
@@ -108,8 +111,13 @@ let CylandRegisterPiece = React.createClass({
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        // once the user was able to register + loan a piece successfully, we need to make sure to keep
-        // the piece list up to date
+        this.refreshPieceList();
+
+        PieceActions.fetchOne(this.state.piece.id);
+        this.transitionTo('piece', {pieceId: this.state.piece.id});
+    },
+
+    refreshPieceList() {
         PieceListActions.fetchPieceList(
             this.state.page,
             this.state.pageSize,
@@ -118,9 +126,6 @@ let CylandRegisterPiece = React.createClass({
             this.state.orderAsc,
             this.state.filterBy
         );
-
-        PieceActions.fetchOne(this.state.piece.id);
-        this.transitionTo('piece', {pieceId: this.state.piece.id});
     },
 
     changeSlide() {