From 6a22cd54ec0cf08525a39a745ad1e1cbd5dac3c2 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 10:04:14 -0300
Subject: [PATCH] Adding OrganizationDetails

---
 .../src/routes/Install/components/Install.js          |  4 ++--
 .../Install/components/Steps/CreateYourAccount.js     | 10 ----------
 ...{AddOrganizationName.js => OrganizationDetails.js} | 11 +++++++++++
 .../src/routes/Install/containers/Install.js          |  2 ++
 client/coral-framework/helpers/error.js               |  1 +
 client/coral-framework/helpers/validate.js            |  1 +
 locales/en.yml                                        |  1 +
 locales/es.yml                                        |  1 +
 8 files changed, 19 insertions(+), 12 deletions(-)
 rename client/coral-admin/src/routes/Install/components/Steps/{AddOrganizationName.js => OrganizationDetails.js} (78%)

diff --git a/client/coral-admin/src/routes/Install/components/Install.js b/client/coral-admin/src/routes/Install/components/Install.js
index 823b32968..4e0024102 100644
--- a/client/coral-admin/src/routes/Install/components/Install.js
+++ b/client/coral-admin/src/routes/Install/components/Install.js
@@ -5,7 +5,7 @@ import Layout from 'coral-admin/src/components/Layout';
 import PropTypes from 'prop-types';
 
 import InitialStep from './Steps/InitialStep';
-import AddOrganizationName from './Steps/AddOrganizationName';
+import OrganizationDetails from './Steps/OrganizationDetails';
 import CreateYourAccount from './Steps/CreateYourAccount';
 import PermittedDomainsStep from './Steps/PermittedDomainsStep';
 import FinalStep from './Steps/FinalStep';
@@ -56,7 +56,7 @@ class Install extends React.Component {
                 goToStep={this.props.goToStep}
               >
                 <InitialStep />
-                <AddOrganizationName
+                <OrganizationDetails
                   install={install}
                   handleSettingsChange={this.handleSettingsChange}
                   handleSettingsSubmit={this.handleSettingsSubmit}
diff --git a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
index 723c4fb78..37387c446 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
@@ -52,16 +52,6 @@ const InitialStep = props => {
             errorMsg={install.errors.confirmPassword}
           />
 
-          <TextField
-            className={styles.textField}
-            id="organizationContactEmail"
-            type="email"
-            label={t('install.create.organization_contact_email')}
-            onChange={handleUserChange}
-            showErrors={install.showErrors}
-            errorMsg={install.errors.organizationEmailContact}
-          />
-
           {!props.install.isLoading ? (
             <Button
               className="talk-install-step-3-save-button"
diff --git a/client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
similarity index 78%
rename from client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
rename to client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
index aa3cfd534..5cb608d88 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
@@ -21,6 +21,17 @@ const AddOrganizationName = props => {
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName}
           />
+
+          <TextField
+            className={styles.TextField}
+            id="organizationContactEmail"
+            type="email"
+            label={t('install.create.organization_contact_email')}
+            onChange={handleSettingsChange}
+            showErrors={install.showErrors}
+            errorMsg={install.errors.organizationContactEmail}
+          />
+
           <Button
             className="talk-install-step-2-save-button"
             type="submit"
diff --git a/client/coral-admin/src/routes/Install/containers/Install.js b/client/coral-admin/src/routes/Install/containers/Install.js
index 597b5718d..d18f914d7 100644
--- a/client/coral-admin/src/routes/Install/containers/Install.js
+++ b/client/coral-admin/src/routes/Install/containers/Install.js
@@ -28,6 +28,7 @@ class InstallContainer extends React.Component {
   render() {
     return (
       <Install
+        install={this.props.install}
         goToStep={this.props.goToStep}
         nextStep={this.props.nextStep}
         submitUser={this.props.submitUser}
@@ -48,6 +49,7 @@ InstallContainer.contextTypes = {
 };
 
 InstallContainer.propTypes = {
+  install: PropTypes.object.isRequired,
   goToStep: PropTypes.func.isRequired,
   nextStep: PropTypes.func.isRequired,
   submitUser: PropTypes.func.isRequired,
diff --git a/client/coral-framework/helpers/error.js b/client/coral-framework/helpers/error.js
index 18c365de1..a041bde4e 100644
--- a/client/coral-framework/helpers/error.js
+++ b/client/coral-framework/helpers/error.js
@@ -6,4 +6,5 @@ export default {
   username: t('error.username'),
   confirmPassword: t('error.confirm_password'),
   organizationName: t('error.organization_name'),
+  organizationContactEmail: t('error.organization_contact_email'),
 };
diff --git a/client/coral-framework/helpers/validate.js b/client/coral-framework/helpers/validate.js
index 849e00e7a..26c1d8a99 100644
--- a/client/coral-framework/helpers/validate.js
+++ b/client/coral-framework/helpers/validate.js
@@ -4,4 +4,5 @@ export default {
   confirmPassword: () => true,
   username: username => /^[a-zA-Z0-9_]+$/.test(username),
   organizationName: org => /^[a-zA-Z0-9_ ]+$/.test(org),
+  organizationContactEmail: email => /^.+@.+\..+$/.test(email),
 };
diff --git a/locales/en.yml b/locales/en.yml
index 91085d0db..4acbfb2db 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -235,6 +235,7 @@ en:
     email_not_verified: "E-mail address {0} not verified."
     email_password: "E-mail and/or password combination incorrect."
     organization_name: "Organization name must only contain letters or numbers."
+    organization_contact_email: "Organization email is not valid."
     password: "Password must be at least 8 characters"
     username: "Usernames can contain letters numbers and _ only"
     unexpected: "Unexpected error occurred. Sorry!"
diff --git a/locales/es.yml b/locales/es.yml
index 7b2f17c5c..ffbcec9ce 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -233,6 +233,7 @@ es:
     email_not_verified: "Correo {0} no confirmado."
     email_password: "Correo y/o contraseña incorrecta."
     organization_name: "El nombre de la organización debe contener letras y/o números."
+    organization_contact_email: "El email de la organización no es válido."
     password: "La contraseña debe tener por lo menos 8 caracteres"
     username: "Los nombres pueden contener letras números y _"
     required_field: "Este campo es requerido"