LFG185: profile screen data populated correctly

kusalshrestha · kusalshrestha · commit 43318f68336d · 2017-12-11T15:44:43.000+05:45
diff --git a/app/actions/fetchActions.js b/app/actions/fetchActions.js
@@ -5,16 +5,19 @@ import * as ActionType from 'App/constants/actionsType';
 import { store } from './../../App';
 
 export const validateEmail = (token) => {
-  console.log('11111', Resource.emailValidation(token));  
+  // console.log('11111', Resource.emailValidation(token));  
   return (dispatch) => {
     dispatch(networkFetching())
-    fetch(uri.EMAIL_VALIDATION, Resource.emailValidation(token))
+    fetch(`${uri.EMAIL_VALIDATION}?token=${token}`, Resource.emailValidation())
     .then(data => data.json())
     .then(json => {
-      console.log('json:', json)
+      // console.log('loginjson:', json)
       dispatch(validateLFEmail())
     })
-    .catch(err => dispatch(networkFetchError(err)))
+    .catch(err => {
+      console.log('errrrrrrr', err);
+      dispatch(networkFetchError(err))
+    })
   }
 }
 
@@ -28,7 +31,6 @@ export const fetchEmployeeFromAPI = (apiKey) => {
       var myProfile = util.getMyInformation(jsonResponse, store.getState().rootReducer.auth.user.email)[0];
       dispatch(myProfileInfo(myProfile));
       dispatch(getEmployeeList(jsonResponse));
-      console.log('ooooo', groupEmployeesOnDepartmentBasis(util.groupByDepartment(jsonResponse)))
       dispatch(groupEmployeesOnDepartmentBasis(util.groupByDepartment(jsonResponse)))
     })
     .catch(err => {dispatch(networkFetchError(err))})
diff --git a/app/navigator/tabNavigator.js b/app/navigator/tabNavigator.js
@@ -63,7 +63,6 @@ export const startTabScreen = () => {
         },
         passProps: {
           data: {
-            ...store.getState().rootReducer.user.myProfile,
             fromProfileTab: true,
           }
         } 
diff --git a/app/reducers/user.js b/app/reducers/user.js
@@ -2,6 +2,7 @@ import * as actionType from 'App/constants/actionsType';
 
 const initialState = {
   isValid: false,
+  groupedEmployees: [],
 }
 
 const user = (state = initialState, action) => {
@@ -25,9 +26,10 @@ const user = (state = initialState, action) => {
       }
 
     case actionType.GROUP_EMPLOYEES_DEPARTMENT_BASIS:
+      // console.log('11111_GROUP', action.groupedEmployees)
       return {
         ...state,
-        groupedEmployees: 'xxx'
+        groupedEmployees: action.groupedEmployees
       }
 
     default:
diff --git a/app/screens/contact/contact.js b/app/screens/contact/contact.js
@@ -17,6 +17,7 @@ import ContactCell from './contactCell';
 import screens from 'App/constants/screens';
 import { getWidth, getHeight } from 'App/utils/dimension';
 import style, { AVATAR_SIZE, STICKY_HEADER_HEIGHT, DOT_MARGIN, PARALLAX_HEADER_HEIGHT } from './styles';
+import { setInterval } from 'core-js/library/web/timers';
 
 const DEPARTMENT_LIST = [{
                             name: 'iOS', 
@@ -127,6 +128,7 @@ const DEPARTMENT_LIST = [{
   }
 
   _renderParallaxTableHeaderView = (data, index) => {
+    // return (<View style={{width: 200, height: 200}}>asd</View>)
     return (
       <ParallaxScrollView
         onScroll={this.props.onScroll}
@@ -166,7 +168,6 @@ const DEPARTMENT_LIST = [{
   }
 
   _renderTableView = (employees, index) => {
-    console.log('-----', employees, index);
     const { onScroll = () => {} } = this.props;    
     return (
       <SectionList
@@ -227,7 +228,7 @@ const DEPARTMENT_LIST = [{
         activeDotColor={colors.LF_DARK_GRREEN}
         dotStyle={{marginBottom: DOT_MARGIN}}>
           {
-            util.groupByDepartment(this.props.employees).map((data, index) => this._renderTableView(data, index))
+            this.props.groupedEmp.map((data, index) => this._renderTableView(data, index))
           }
       </Swiper>
     )
@@ -242,7 +243,10 @@ const DEPARTMENT_LIST = [{
   }
 
   render() {
-    // console.log('-----', this.props.groupedEmp);
+    // setInterval(() => {
+    //   console.log('----_CONTACT', this.props.groupedEmp);      
+    // }, 1000);
+    // console.log('----_CONTACT', this.props.groupedEmp);
     return (
       <View style={ style.mainContainer }>
         { this._renderStatusBar() }
diff --git a/app/screens/contact/contactCell/contactCell.js b/app/screens/contact/contactCell/contactCell.js
@@ -47,7 +47,7 @@ import placeHolderImage from './../../../../assets/images/default.png';
       title: '',
       passProps: {
         data: {
-          ...this.props.data
+          profile: this.props.data
         }
       }        
     });
diff --git a/app/screens/contactDetail/contactDetail.js b/app/screens/contactDetail/contactDetail.js
@@ -37,10 +37,10 @@ import style, { AVATAR_SIZE, STICKY_HEADER_HEIGHT, DOT_MARGIN, PARALLAX_HEADER_H
           <View key="parallax-header" style={ style.parallaxHeader }>
             <Image style={ style.avatar } source={{uri: 'https://pbs.twimg.com/profile_images/2694242404/5b0619220a92d391534b0cd89bf5adc1_400x400.jpeg'}}/>
             <Text style={ style.sectionSpeakerText }>
-              { this.props.data.department.name }
+              { this.props.data.department.name || '' }
             </Text>
             <Text style={ style.sectionTitleText }>
-              { this.props.data.department.name }
+              { this.props.data.department.name || '' }
             </Text>
           </View>
         )}
diff --git a/app/screens/profile/profile.js b/app/screens/profile/profile.js
@@ -74,7 +74,7 @@ class ProfileScreen extends Component {
         backgroundSpeed={10}
         renderBackground={() => (
           <View key="background">
-            <Image source={{uri: this.props.data.avatarUrl || 'https://pbs.twimg.com/profile_images/2694242404/5b0619220a92d391534b0cd89bf5adc1_400x400.jpeg'}} style={style.tableHeaderBackgroundImage}/>
+            <Image source={{uri: this.data.avatarUrl || 'https://pbs.twimg.com/profile_images/2694242404/5b0619220a92d391534b0cd89bf5adc1_400x400.jpeg'}} style={style.tableHeaderBackgroundImage}/>
             <View style={style.tableHeaderBackgroundOverlay}/>
           </View>
         )}
@@ -83,10 +83,10 @@ class ProfileScreen extends Component {
           <View key="parallax-header" style={ style.parallaxHeader }>
             <Image style={ style.avatar } source={{uri: 'https://pbs.twimg.com/profile_images/2694242404/5b0619220a92d391534b0cd89bf5adc1_400x400.jpeg'}}/>
             <Text style={ style.sectionSpeakerText }>
-              { this.props.data.department.name }
+              { this.data.department.name || '' }
             </Text>
             <Text style={ style.sectionTitleText }>
-              { this.props.data.department.name }
+              { this.data.department.name || '' }
             </Text>
           </View>
         )}
@@ -99,7 +99,7 @@ class ProfileScreen extends Component {
     switch (index) {
       case PHONE_NUMBER: return this._renderPhoneCell();
       case ADDRESS: return this._renderTextCell('Address', '');
-      case EMAIL: return this._renderTextCell('Email', this.props.data.username);
+      case EMAIL: return this._renderTextCell('Email', this.data.username || '');
       case DEPARTMENT: return this._renderTextCell('Department', '');
       case DOB: return this._renderTextCell('Dob', '');
       case SKYPE: return this._renderTextCell('Skype ID', '');
@@ -111,7 +111,7 @@ class ProfileScreen extends Component {
     return (
       <View style={style.phoneCell}>
         <View style={style.nameTextContainer}>
-          <Text style={style.titleText}>{ this.props.data.firstName } {this.props.data.lastName}</Text>
+          <Text style={style.titleText}>{ this.data.firstName || '' } {this.data.lastName || ''}</Text>
         </View>
         <View style={style.phoneMessageContainer}>
           <TouchableOpacity style={style.phoneButton} onPress={() => Communications.phonecall('0123456789', true)}>
@@ -216,7 +216,8 @@ class ProfileScreen extends Component {
   }
 
   render() {
-    if (this.props.me) {
+    this.data = this.props.data.fromProfileTab ? this.props.me : this.props.data.profile
+    if (this.data) {
       return this._renderProfileScreen()
     } else {
       return this._renderActivityIndicator()
diff --git a/app/utils/dataNormalization.js b/app/utils/dataNormalization.js
@@ -57,7 +57,6 @@ export const getUniqueArrayOfFirstCharOfName = (employeesList) => {
   var uniqueArray = firstLettersOfNames.filter((value, index, array) => {
     return index == array.indexOf(value);
   });
-  console.log('00000uniqueArrayPerson', uniqueArray)
   return uniqueArray;
 }
 
@@ -88,7 +87,6 @@ export const getUniqueArrayOfDepartmrnt = (employeesList) => {
   var uniquedepartment = departments.filter((value, index, array) => {
     return index == array.indexOf(value);
   });
-  console.log('00000uniqueArrayDepartment', uniquedepartment)
   return uniquedepartment;
 }
 
diff --git a/app/utils/networkResource.js b/app/utils/networkResource.js
@@ -1,15 +1,10 @@
 const POST = "POST"
 const GET = "GET"
 
-export const emailValidation = (token) => {
+export const emailValidation = () => {
   return (
     {
       method: POST
-    },
-    {
-      body: JSON.stringify({
-        token: token
-      })
     }
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ export const startTabScreen = () => {`
`63`	`63`	`},`
`64`	`64`	`passProps: {`
`65`	`65`	`data: {`
`66`		`- ...store.getState().rootReducer.user.myProfile,`
`67`	`66`	`fromProfileTab: true,`
`68`	`67`	`}`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import * as actionType from 'App/constants/actionsType';`
`2`	`2`
`3`	`3`	`const initialState = {`
`4`	`4`	`isValid: false,`
	`5`	`+ groupedEmployees: [],`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`const user = (state = initialState, action) => {`
`@@ -25,9 +26,10 @@ const user = (state = initialState, action) => {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`case actionType.GROUP_EMPLOYEES_DEPARTMENT_BASIS:`
	`29`	`+ // console.log('11111_GROUP', action.groupedEmployees)`
`28`	`30`	`return {`
`29`	`31`	`...state,`
`30`		`- groupedEmployees: 'xxx'`
	`32`	`+ groupedEmployees: action.groupedEmployees`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ import placeHolderImage from './../../../../assets/images/default.png';`
`47`	`47`	`title: '',`
`48`	`48`	`passProps: {`
`49`	`49`	`data: {`
`50`		`- ...this.props.data`
	`50`	`+ profile: this.props.data`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`});`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ export const getUniqueArrayOfFirstCharOfName = (employeesList) => {`
`57`	`57`	`var uniqueArray = firstLettersOfNames.filter((value, index, array) => {`
`58`	`58`	`return index == array.indexOf(value);`
`59`	`59`	`});`
`60`		`- console.log('00000uniqueArrayPerson', uniqueArray)`
`61`	`60`	`return uniqueArray;`
`62`	`61`	`}`
`63`	`62`
`@@ -88,7 +87,6 @@ export const getUniqueArrayOfDepartmrnt = (employeesList) => {`
`88`	`87`	`var uniquedepartment = departments.filter((value, index, array) => {`
`89`	`88`	`return index == array.indexOf(value);`
`90`	`89`	`});`
`91`		`- console.log('00000uniqueArrayDepartment', uniquedepartment)`
`92`	`90`	`return uniquedepartment;`
`93`	`91`	`}`
`94`	`92`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,10 @@`
`1`	`1`	`const POST = "POST"`
`2`	`2`	`const GET = "GET"`
`3`	`3`
`4`		`-export const emailValidation = (token) => {`
	`4`	`+export const emailValidation = () => {`
`5`	`5`	`return (`
`6`	`6`	`{`
`7`	`7`	`method: POST`
`8`		`- },`
`9`		`- {`
`10`		`- body: JSON.stringify({`
`11`		`- token: token`
`12`		`- })`
`13`	`8`	`}`
`14`	`9`	`)`
`15`	`10`	`}`