Fix bug custom fields default values undefined (#945)

* Fix bug in selected custom fields in admin panel invite user

* WIP

* Fix style

* WIP

client/src/app/admin/panel/users/admin-panel-view-user.js

@@ -51,14 +51,7 @@ class AdminPanelViewUser extends React.Component {
     }
 
     renderUserInfo() {
-        const {
+        const { name, disabled, email, verified, customfields, loading } = this.state;
-            name,
-            disabled,
-            email,
-            verified,
-            customfields,
-            loading
-        } = this.state;
 
         return (
             <div className="admin-panel-view-user__content">
@@ -187,10 +180,7 @@ class AdminPanelViewUser extends React.Component {
             const authorsListWithoutMe = r.data.authors.filter(author => author.id != this.props.params.userId);
 
             return authorsListWithoutMe.map(author => {
-                const {
+                const { id, name } = author;
-                    id,
-                    name
-                } = author;
 
                 return {
                     name,
@@ -207,10 +197,7 @@ class AdminPanelViewUser extends React.Component {
     transformUserListToAutocomplete() {
         return(
             this.state.userList.map((user) => {
-                const {
+                const { id, name } = user;
-                    id,
-                    name
-                } = user;
 
                 return ({
                     id: id*1,
@@ -236,27 +223,20 @@ class AdminPanelViewUser extends React.Component {
     }
 
     renderCustomField(_customfield) {
-        const {
+        const { customfield, value, id } = _customfield;
-            customfield,
-            value,
-            id
-        } = _customfield;
 
         return (
             <div className="admin-panel-view-user__info-item" key={`customFieldId__${id}`}>
                 {customfield}
                 <div className="admin-panel-view-user__info-box">
-                    {value}
+                    {(value !== "") ? value : <div className="admin-panel-view-user__empty-content">Empty</div>}
                 </div>
             </div>
         );
     }
 
     getTicketListProps() {
-        const {
+        const { tickets, loading } = this.state;
-            tickets,
-            loading
-        } = this.state;
 
         return {
             type: 'secondary',
@@ -268,15 +248,7 @@ class AdminPanelViewUser extends React.Component {
     }
 
     onUserRetrieved(result) {
-        const {
+        const { name, email, verified, tickets, disabled, customfields, userList } = result.data;
-            name,
-            email,
-            verified,
-            tickets,
-            disabled,
-            customfields,
-            userList
-        } = result.data;
 
         this.setState({
             name,

client/src/app/admin/panel/users/admin-panel-view-user.scss

@@ -9,6 +9,7 @@
             display: inline-block;
             margin-right: 20px;
             min-width: 200px;
+            margin-top: 10px;
         }
 
         &-box {
@@ -20,6 +21,11 @@
         }
     }
 
+    &__empty-content {
+        font-style: italic;
+        color: $dark-grey;
+    }
+
     &__action-buttons {
         margin-top: 20px;
     }

client/src/app/admin/panel/users/invite-user-widget.js

@@ -28,7 +28,7 @@ class InviteUserWidget extends React.Component {
         this.state = {
             loading: false,
             email: null,
-            customFields: []
+            customFields: null
         };
     }
 
@@ -41,6 +41,8 @@ class InviteUserWidget extends React.Component {
     }
 
     render() {
+        if(!this.state.customFields) return null;
+
         return (
             <Widget className={this.getClass()}>
                 <Header title={i18n('INVITE_USER')} description={i18n('INVITE_USER_VIEW_DESCRIPTION')} />

client/src/app/main/main-signup/main-signup-widget.js

@@ -40,6 +40,7 @@ class MainSignUpWidget extends React.Component {
 
     render() {
         if(!this.state.customFields) return null;
+
         return (
             <Widget className={this.getClass()}>
                 <Header title={i18n('SIGN_UP')} description={i18n('SIGN_UP_VIEW_DESCRIPTION')} />