fixed comments section

Author: aayushis12

android/app/bin/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

src/gists/gists.reducer.js

@@ -38,11 +38,11 @@ const setError = (state, { error }) => ({
 	error,
 });
 
-const clearCache = () => ({
-	gists: [],
-	hasMoreData: true,
+const clearCache = state => ({
+	...state,
 	nextPageNo: 1,
 	comments: [],
+	hasMoreComments: true,
 });
 
 const setGistComments = (state, { payload }) => {
@@ -51,11 +51,9 @@ const setGistComments = (state, { payload }) => {
 	const isLinkAvailable = links && links.next;
 	let newComments = data;
 
-	console.log('isLinkAvailable', links, !!isLinkAvailable, 'nextPageno', state.nextPageNo);
 	if (state.nextPageNo > 1) {
 		newComments = array.concat(state.comments, data);
 	}
-	console.log('data******************', data, newComments);
 
 	return {
 		...state,

src/gists/gists.saga.js

@@ -21,7 +21,6 @@ import {
 	requestDeleteComment,
 	requestAddComment,
 } from '../api';
-import { clearCache } from '../../src/cache/cache.actionType';
 
 const tokenSelector = state => state.auth.access_token;
 const userNameSelector = state => state.loggedInUser.userName;
@@ -80,23 +79,20 @@ function* fetchPublicGists() {
 
 function* fetchCommentsForGist(action) {
 	try {
+		if (action.payload.clearCache) {
+			yield put({ type: 'CLEAR_CACHE' });
+		}
 		const moreDataAvailabe = yield select(state => state.gistComments.hasMoreComments);
 
-		// yield call(clearCache);
-		console.log('here');
-		// console.o;
-		 // if (moreDataAvailabe) {
-		yield put(fetchGistComments.progress());
-		// const token = yield select(tokenSelector);
-		const requestData = yield all([select(tokenSelector), select(state => state.gistComments.nextPageNo)]);
-		const { data, headers } = yield call(requestGistComments, requestData[0], action.payload, requestData[1]);
-		const links = headerparser(headers.link);
-
-		console.log('linkssssssssssssssssssssssssssssssssssssss', links);
-		yield put(fetchGistComments.success({ data, links }));
-		// }
+		if (moreDataAvailabe) {
+			yield put(fetchGistComments.progress());
+			const requestData = yield all([select(tokenSelector), select(state => state.gistComments.nextPageNo)]);
+			const { data, headers } = yield call(requestGistComments, requestData[0], action.payload.id, requestData[1]);
+			const links = headerparser(headers.link);
+
+			yield put(fetchGistComments.success({ data, links }));
+		}
 	} catch (err) {
-		console.log('comments fetch', err);
 		yield put(publicGistsFetch.error(err));
 	}
 }

src/gists/screens/components/GistContent.js

@@ -96,7 +96,7 @@ GistListContent.propTypes = {
 	showLoader: PropTypes.bool,
 	fetchGists: PropTypes.func.isRequired,
 	gistList: PropTypes.array, // eslint-disable-line
-	hasMoreData: PropTypes.bool.isRequired,
+	hasMoreData: PropTypes.bool,
 };
 
 GistListContent.defaultProps = {

src/gists/screens/gistComments.screen.js

@@ -19,6 +19,7 @@ import { fetchGistComments, deleteComment, addComment } from '../gists.actiontyp
 import ListEmptyComponent from './components/EmptyListComponent';
 import { colors } from '../../config';
 import GistOptions from './components/gistoptions.screen';
+import { clearCache } from '../../cache/cache.actionType';
 
 const CardContainer = styled(CardView)`
 	padding: 3%;
@@ -78,7 +79,6 @@ const ActivityIndicatorContainer = styled.View`
 	justify-content: center;
 	align-items: center;
 `;
-// padding: 20;
 const EndOfViewStyle = styled.View`
 	flex: 1;
 	justify-content: center;
@@ -99,7 +99,7 @@ class GistCommentsScreen extends React.Component {
 		};
 	}
 	componentDidMount() {
-		this.fetchComments();
+		this.fetchComments(true);
 	}
 
 	onPressItem = () => {
@@ -122,8 +122,8 @@ class GistCommentsScreen extends React.Component {
 		});
 	}
 
-	fetchComments = () => {
-		this.props.fetchComments(this.props.navigation.getParam('gistData').id);
+	fetchComments = (clearCache = false) => {
+		this.props.fetchComments({ id: this.props.navigation.getParam('gistData').id, clearCache });
 	}
 
 	deleteComment = () => {
@@ -135,11 +135,10 @@ class GistCommentsScreen extends React.Component {
 	}
 
 	handleOnEndReached = () => {
-		this.props.fetchComments(this.props.navigation.getParam('gistData').id);
+		this.fetchComments();
 	}
 
   renderItem = ({ item }) => {
-  	console.log('item type=============', item.type);
   	switch (item.type) {
   	case 'preloader':
   		return (
@@ -183,20 +182,12 @@ class GistCommentsScreen extends React.Component {
   }
 
   render() {
-  	const { inProgress, hasMoreComments, comments } = this.props;
+  	const { hasMoreComments, comments } = this.props;
 
-  	console.log('hasMoreComments', hasMoreComments);
   	const toAppendData = hasMoreComments ? getGistComments('preloader') : getGistComments('noData');
 
   	const uniqComments = uniqBy(concat(comments, toAppendData), ({ id }) => (id));
 
-  	// if (inProgress) {
-  	// 	return (
-  	// 		<ActivityIndicatorContainer>
-  	// 			<ActivityIndicator size="large" color="#33B5E5" />
-  	// 		</ActivityIndicatorContainer>
-  	// 	);
-  	// }
 
   	return (
   		<React.Fragment>
@@ -236,7 +227,7 @@ class GistCommentsScreen extends React.Component {
   }
 }
 const mapDispatchToProps = dispatch => ({
-	fetchComments: id => dispatch(fetchGistComments.action(id)),
+	fetchComments: data => dispatch(fetchGistComments.action(data)),
 	deleteThisComment: data => dispatch(deleteComment.action(data)),
 	addThisComment: data => dispatch(addComment.action(data)),
 });
@@ -248,8 +239,6 @@ const mapStateToProps = ({ gistComments, loggedInUser }) => ({
 });
 
 GistCommentsScreen.propTypes = {
-//	comments: PropTypes.arrayOf(React.PropTypes.object).isRequired,
-	inProgress: PropTypes.bool.isRequired,
 	fetchComments: PropTypes.func.isRequired,
 	addThisComment: PropTypes.func.isRequired,
 	deleteThisComment: PropTypes.func.isRequired,