Merge pull request #2327 from rashmi73/issue_2132

issue 2132 fix

Author: ThomasKranitsas

src/shared/components/Settings/Tools/Devices/index.jsx

@@ -187,7 +187,7 @@ export default class Devices extends ConsentComponent {
    * Invalid value, can not save
    * @param newDevice object
    */
-  onCheckFormValue(newDevice) {
+  onCheckFormValue(newDevice, updateState = true) {
     let invalid = false;
 
     let errorMessage = '';
@@ -227,7 +227,9 @@ export default class Devices extends ConsentComponent {
       errorMessage += ' cannot be empty';
     }
 
-    this.setState({ errorMessage, formInvalid: invalid });
+    if (updateState) {
+      this.setState({ errorMessage, formInvalid: invalid });
+    }
     return invalid;
   }
 
@@ -280,6 +282,11 @@ export default class Devices extends ConsentComponent {
     this.setState({ isMobileView: window.innerWidth <= screenSM });
   }
 
+  isFormValid() {
+    const { newDevice } = this.state;
+    return this.onCheckFormValue(newDevice, false);
+  }
+
   render() {
     const {
       deviceTrait, isMobileView, showConfirmation, indexNo,
@@ -288,7 +295,7 @@ export default class Devices extends ConsentComponent {
       ? deviceTrait.traits.data.slice() : [];
     const { newDevice, formInvalid, errorMessage } = this.state;
     const canModifyTrait = !this.props.traitRequestCount;
-
+    const isInValidDeviceForm = this.isFormValid();
     return (
       <div styleName="devices-container">
         {
@@ -412,7 +419,7 @@ export default class Devices extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddDevice}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || isInValidDeviceForm}
             >
               Add device to your list
             </PrimaryButton>
@@ -497,7 +504,7 @@ export default class Devices extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddDevice}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || isInValidDeviceForm}
             >
               Add Device
             </PrimaryButton>

src/shared/components/Settings/Tools/ServiceProviders/index.jsx

@@ -30,7 +30,7 @@ export default class ServiceProviders extends ConsentComponent {
     this.onAddServiceProvider = this.onAddServiceProvider.bind(this);
     this.loadPersonalizationTrait = this.loadPersonalizationTrait.bind(this);
     this.updatePredicate = this.updatePredicate.bind(this);
-
+    this.isFormValid = this.isFormValid.bind(this);
     const { userTraits } = props;
     this.state = {
       formInvalid: false,
@@ -247,6 +247,14 @@ export default class ServiceProviders extends ConsentComponent {
     this.setState({ isMobileView: window.innerWidth <= screenSM });
   }
 
+  isFormValid() {
+    const { newServiceProvider } = this.state;
+    if (newServiceProvider.serviceProviderType && (newServiceProvider.name.trim().length !== 0)) {
+      return true;
+    }
+    return false;
+  }
+
   render() {
     const {
       serviceProviderTrait, isMobileView, showConfirmation, indexNo,
@@ -255,7 +263,7 @@ export default class ServiceProviders extends ConsentComponent {
       ? serviceProviderTrait.traits.data.slice() : [];
     const { newServiceProvider, formInvalid, errorMessage } = this.state;
     const canModifyTrait = !this.props.traitRequestCount;
-
+    const isValidServiceProviderForm = this.isFormValid();
     return (
       <div styleName="service-provider-container">
         {
@@ -331,7 +339,7 @@ export default class ServiceProviders extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddServiceProvider}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || !isValidServiceProviderForm}
             >
               Add service provider to your list
             </PrimaryButton>
@@ -380,7 +388,7 @@ export default class ServiceProviders extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddServiceProvider}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || !isValidServiceProviderForm}
             >
               Add Provider
             </PrimaryButton>

src/shared/components/Settings/Tools/Software/index.jsx

@@ -247,6 +247,14 @@ export default class Software extends ConsentComponent {
     this.setState({ isMobileView: window.innerWidth <= screenSM });
   }
 
+  isFormValid() {
+    const { newSoftware } = this.state;
+    if (newSoftware.softwareType && (newSoftware.name.trim().length !== 0)) {
+      return true;
+    }
+    return false;
+  }
+
   render() {
     const {
       softwareTrait, isMobileView, showConfirmation, indexNo,
@@ -255,7 +263,7 @@ export default class Software extends ConsentComponent {
       ? softwareTrait.traits.data.slice() : [];
     const { newSoftware, formInvalid, errorMessage } = this.state;
     const canModifyTrait = !this.props.traitRequestCount;
-
+    const isValidSoftwareForm = this.isFormValid();
     return (
       <div styleName="software-container">
         {
@@ -331,7 +339,7 @@ export default class Software extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddSoftware}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || !isValidSoftwareForm}
             >
               Add software to your list
             </PrimaryButton>
@@ -380,7 +388,7 @@ export default class Software extends ConsentComponent {
             <PrimaryButton
               styleName="complete"
               onClick={this.onHandleAddSoftware}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || !isValidSoftwareForm}
             >
               Add Software
             </PrimaryButton>

src/shared/components/Settings/Tools/Subscriptions/index.jsx

@@ -297,7 +297,7 @@ export default class Subscription extends ConsentComponent {
             <PrimaryButton
               theme={{ button: styles.complete }}
               onClick={this.onHandleAddSubscription}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || (newSubscription.name.trim().length === 0)}
             >
               Add subscription to your list
             </PrimaryButton>
@@ -328,7 +328,7 @@ export default class Subscription extends ConsentComponent {
             <PrimaryButton
               theme={{ button: styles.complete }}
               onClick={this.onHandleAddSubscription}
-              disabled={!canModifyTrait}
+              disabled={!canModifyTrait || (newSubscription.name.trim().length === 0)}
             >
               Add Subscription
             </PrimaryButton>