From e82d7eeee58a6fd6d0b71788c4fd2f09ce90d8f5 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Tue, 6 Feb 2018 13:54:21 +0100
Subject: FIX import screen toggles

- fix toggle double click event (nested `fields` property)
- do not call `prepareForm` for every render but only on init (otherwise all toggles reset to `default: true`
---
 src/components/auth/Import.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 078244434..7de571896 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,22 +41,20 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-  prepareForm() {
-    const { services } = this.props;
-
-    const config = {
+    config = {
       fields: {
-        import: [...services.filter(s => s.recipe).map(s => ({
-          add: {
-            default: true,
-            options: s,
+        import: [...this.props.services.filter(s => s.recipe).map(s => ({
+          fields: {
+            add: {
+              default: true,
+              options: s,
+            },
           },
         }))],
       },
     };
 
-    return new Form(config, this.context.intl);
-  }
+    form = new Form(this.config, this.context.intl);
 
   submit(e) {
     const { services } = this.props;
@@ -74,7 +72,9 @@ export default class Import extends Component {
   }
 
   render() {
-    this.form = this.prepareForm();
+    // if (this.form === undefined) {
+    //   this.form = this.prepareForm();
+    // }
     const { intl } = this.context;
     const { services, isSubmitting, inviteRoute } = this.props;
 
-- 
cgit v1.2.3-54-g00ecf


From 2448cc6160647d5ecaf88f7bf3754993a322d180 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Tue, 6 Feb 2018 13:58:33 +0100
Subject: fix linting errors

---
 src/components/auth/Import.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 7de571896..6bfd2d70f 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,20 +41,20 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-    config = {
-      fields: {
-        import: [...this.props.services.filter(s => s.recipe).map(s => ({
-          fields: {
-            add: {
-              default: true,
-              options: s,
-            },
+  config = {
+    fields: {
+      import: [...this.props.services.filter(s => s.recipe).map(s => ({
+        fields: {
+          add: {
+            default: true,
+            options: s,
           },
-        }))],
-      },
-    };
+        },
+      }))],
+    },
+  };
 
-    form = new Form(this.config, this.context.intl);
+  form = new Form(this.config, this.context.intl);
 
   submit(e) {
     const { services } = this.props;
-- 
cgit v1.2.3-54-g00ecf


From 4f254611db890b2cac96984644f1049bd7cf0e72 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Thu, 8 Feb 2018 10:03:39 +0100
Subject: fix(App) Bugfix Fix toggle buttons shown during import

moved form definition to `componentWillMount`
---
 src/components/auth/Import.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 6bfd2d70f..eb0debd39 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,20 +41,22 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-  config = {
-    fields: {
-      import: [...this.props.services.filter(s => s.recipe).map(s => ({
-        fields: {
-          add: {
-            default: true,
-            options: s,
+  componentWillMount() {
+    const config = {
+      fields: {
+        import: [...this.props.services.filter(s => s.recipe).map(s => ({
+          fields: {
+            add: {
+              default: true,
+              options: s,
+            },
           },
-        },
-      }))],
-    },
-  };
-
-  form = new Form(this.config, this.context.intl);
+        }))],
+      },
+    };
+  
+    this.form = new Form(config, this.context.intl);
+  }
 
   submit(e) {
     const { services } = this.props;
-- 
cgit v1.2.3-54-g00ecf


From 19a5aa1d4d3ca178490b6578236a93aba72dba1b Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Thu, 8 Feb 2018 10:08:18 +0100
Subject: fix linting errors

---
 src/components/auth/Import.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index eb0debd39..9b99c4382 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -54,7 +54,7 @@ export default class Import extends Component {
         }))],
       },
     };
-  
+
     this.form = new Form(config, this.context.intl);
   }
 
-- 
cgit v1.2.3-54-g00ecf


From 0a407dbe45502e3b35230790604ccc2302e615dd Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Thu, 8 Feb 2018 10:25:21 +0100
Subject: [MINOR] remove commented code

---
 src/components/auth/Import.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 9b99c4382..9ba14e768 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -74,9 +74,6 @@ export default class Import extends Component {
   }
 
   render() {
-    // if (this.form === undefined) {
-    //   this.form = this.prepareForm();
-    // }
     const { intl } = this.context;
     const { services, isSubmitting, inviteRoute } = this.props;
 
-- 
cgit v1.2.3-54-g00ecf