Implement channel page with just the first page of results (#140)
This commit is contained in:
parent
3c8e7d13e0
commit
ed61f470f7
5 changed files with 258 additions and 10 deletions
11
app/src/component/fileList/index.js
Normal file
11
app/src/component/fileList/index.js
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import FileList from './view';
|
||||||
|
import { selectClaimsById } from 'lbry-redux';
|
||||||
|
|
||||||
|
const select = state => ({
|
||||||
|
claimsById: selectClaimsById(state),
|
||||||
|
});
|
||||||
|
|
||||||
|
const perform = dispatch => ({});
|
||||||
|
|
||||||
|
export default connect(select, perform)(FileList);
|
184
app/src/component/fileList/view.js
Normal file
184
app/src/component/fileList/view.js
Normal file
|
@ -0,0 +1,184 @@
|
||||||
|
// @flow
|
||||||
|
import * as React from 'react';
|
||||||
|
import { buildURI } from 'lbry-redux';
|
||||||
|
import { FlatList } from 'react-native';
|
||||||
|
import FileItem from '../fileItem';
|
||||||
|
import discoverStyle from '../../styles/discover';
|
||||||
|
|
||||||
|
// In the future, all Flow types need to be specified in a common source (lbry-redux, perhaps?)
|
||||||
|
type FileInfo = {
|
||||||
|
name: string,
|
||||||
|
channelName: ?string,
|
||||||
|
pending?: boolean,
|
||||||
|
channel_claim_id: string,
|
||||||
|
value?: {
|
||||||
|
publisherSignature: {
|
||||||
|
certificateId: string,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
metadata: {
|
||||||
|
publisherSignature: {
|
||||||
|
certificateId: string,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
hideFilter: boolean,
|
||||||
|
sortByHeight?: boolean,
|
||||||
|
claimsById: Array<{}>,
|
||||||
|
fileInfos: Array<FileInfo>,
|
||||||
|
checkPending?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
type State = {
|
||||||
|
sortBy: string,
|
||||||
|
};
|
||||||
|
|
||||||
|
class FileList extends React.PureComponent<Props, State> {
|
||||||
|
static defaultProps = {
|
||||||
|
hideFilter: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
constructor(props: Props) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
sortBy: 'dateNew',
|
||||||
|
};
|
||||||
|
|
||||||
|
(this: any).handleSortChanged = this.handleSortChanged.bind(this);
|
||||||
|
|
||||||
|
this.sortFunctions = {
|
||||||
|
dateNew: fileInfos =>
|
||||||
|
this.props.sortByHeight
|
||||||
|
? fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
|
if (fileInfo1.pending) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
const height1 = this.props.claimsById[fileInfo1.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo1.claim_id].height
|
||||||
|
: 0;
|
||||||
|
const height2 = this.props.claimsById[fileInfo2.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo2.claim_id].height
|
||||||
|
: 0;
|
||||||
|
if (height1 > height2) {
|
||||||
|
return -1;
|
||||||
|
} else if (height1 < height2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
})
|
||||||
|
: [...fileInfos].reverse(),
|
||||||
|
dateOld: fileInfos =>
|
||||||
|
this.props.sortByHeight
|
||||||
|
? fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
|
const height1 = this.props.claimsById[fileInfo1.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo1.claim_id].height
|
||||||
|
: 999999;
|
||||||
|
const height2 = this.props.claimsById[fileInfo2.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo2.claim_id].height
|
||||||
|
: 999999;
|
||||||
|
if (height1 < height2) {
|
||||||
|
return -1;
|
||||||
|
} else if (height1 > height2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
})
|
||||||
|
: fileInfos,
|
||||||
|
title: fileInfos =>
|
||||||
|
fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
|
const getFileTitle = fileInfo => {
|
||||||
|
const { value, metadata, name, claim_name: claimName } = fileInfo;
|
||||||
|
if (metadata) {
|
||||||
|
// downloaded claim
|
||||||
|
return metadata.title || claimName;
|
||||||
|
} else if (value) {
|
||||||
|
// published claim
|
||||||
|
const { title } = value.stream.metadata;
|
||||||
|
return title || name;
|
||||||
|
}
|
||||||
|
// Invalid claim
|
||||||
|
return '';
|
||||||
|
};
|
||||||
|
const title1 = getFileTitle(fileInfo1).toLowerCase();
|
||||||
|
const title2 = getFileTitle(fileInfo2).toLowerCase();
|
||||||
|
if (title1 < title2) {
|
||||||
|
return -1;
|
||||||
|
} else if (title1 > title2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}),
|
||||||
|
filename: fileInfos =>
|
||||||
|
fileInfos.slice().sort(({ file_name: fileName1 }, { file_name: fileName2 }) => {
|
||||||
|
const fileName1Lower = fileName1.toLowerCase();
|
||||||
|
const fileName2Lower = fileName2.toLowerCase();
|
||||||
|
if (fileName1Lower < fileName2Lower) {
|
||||||
|
return -1;
|
||||||
|
} else if (fileName2Lower > fileName1Lower) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
getChannelSignature = (fileInfo: FileInfo) => {
|
||||||
|
if (fileInfo.pending) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileInfo.value) {
|
||||||
|
return fileInfo.value.publisherSignature.certificateId;
|
||||||
|
}
|
||||||
|
return fileInfo.channel_claim_id;
|
||||||
|
};
|
||||||
|
|
||||||
|
handleSortChanged(event: SyntheticInputEvent<*>) {
|
||||||
|
this.setState({
|
||||||
|
sortBy: event.target.value,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
sortFunctions: {};
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { fileInfos, hideFilter, checkPending, navigation, style } = this.props;
|
||||||
|
const { sortBy } = this.state;
|
||||||
|
const items = [];
|
||||||
|
|
||||||
|
if (!fileInfos) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.sortFunctions[sortBy](fileInfos).forEach(fileInfo => {
|
||||||
|
const { name: claimName, claim_name: claimNameDownloaded, claim_id: claimId } = fileInfo;
|
||||||
|
const uriParams = {};
|
||||||
|
|
||||||
|
// This is unfortunate
|
||||||
|
// https://github.com/lbryio/lbry/issues/1159
|
||||||
|
const name = claimName || claimNameDownloaded;
|
||||||
|
uriParams.contentName = name;
|
||||||
|
uriParams.claimId = claimId;
|
||||||
|
const uri = buildURI(uriParams);
|
||||||
|
|
||||||
|
items.push(uri);
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FlatList
|
||||||
|
style={style}
|
||||||
|
data={items}
|
||||||
|
keyExtractor={(item, index) => item}
|
||||||
|
renderItem={({item}) => (
|
||||||
|
<FileItem style={discoverStyle.fileItem}
|
||||||
|
uri={item}
|
||||||
|
navigation={navigation} />
|
||||||
|
)} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default FileList;
|
|
@ -1,19 +1,22 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import {
|
import {
|
||||||
|
doFetchClaimsByChannel,
|
||||||
|
doFetchClaimCountByChannel,
|
||||||
makeSelectClaimForUri,
|
makeSelectClaimForUri,
|
||||||
makeSelectClaimsInChannelForCurrentPage,
|
makeSelectClaimsInChannelForPage,
|
||||||
makeSelectFetchingChannelClaims,
|
makeSelectFetchingChannelClaims,
|
||||||
} from 'lbry-redux';
|
} from 'lbry-redux';
|
||||||
import ChannelPage from './view';
|
import ChannelPage from './view';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
claim: makeSelectClaimForUri(props.uri)(state),
|
claim: makeSelectClaimForUri(props.uri)(state),
|
||||||
claimsInChannel: makeSelectClaimsInChannelForCurrentPage(props.uri)(state),
|
claimsInChannel: makeSelectClaimsInChannelForPage(props.uri, props.page || 1)(state),
|
||||||
fetching: makeSelectFetchingChannelClaims(props.uri)(state),
|
fetching: makeSelectFetchingChannelClaims(props.uri)(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = dispatch => ({
|
||||||
|
fetchClaims: (uri, page) => dispatch(doFetchClaimsByChannel(uri, page)),
|
||||||
|
fetchClaimCount: uri => dispatch(doFetchClaimCountByChannel(uri)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(ChannelPage);
|
export default connect(select, perform)(ChannelPage);
|
||||||
|
|
|
@ -1,20 +1,54 @@
|
||||||
// @flow
|
// @flow
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { ScrollView, Text, View } from 'react-native';
|
import { ActivityIndicator, Text, View } from 'react-native';
|
||||||
|
import Colors from '../../styles/colors';
|
||||||
|
import FileList from '../../component/fileList';
|
||||||
|
import PageHeader from '../../component/pageHeader';
|
||||||
import UriBar from '../../component/uriBar';
|
import UriBar from '../../component/uriBar';
|
||||||
import channelPageStyle from '../../styles/channelPage';
|
import channelPageStyle from '../../styles/channelPage';
|
||||||
|
|
||||||
class ChannelPage extends React.PureComponent {
|
class ChannelPage extends React.PureComponent {
|
||||||
|
componentDidMount() {
|
||||||
|
const { uri, page, claimsInChannel, fetchClaims, fetchClaimCount } = this.props;
|
||||||
|
|
||||||
|
if (!claimsInChannel || !claimsInChannel.length) {
|
||||||
|
fetchClaims(uri, page || 1);
|
||||||
|
fetchClaimCount(uri);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { claim, navigation, uri } = this.props;
|
const { fetching, claimsInChannel, claim, navigation, uri } = this.props;
|
||||||
const { name } = claim;
|
const { name, permanent_url: permanentUrl } = claim;
|
||||||
|
|
||||||
|
let contentList;
|
||||||
|
if (fetching) {
|
||||||
|
contentList = (
|
||||||
|
<View style={channelPageStyle.busyContainer}>
|
||||||
|
<ActivityIndicator size="large" color={Colors.LbryGreen} />
|
||||||
|
<Text style={channelPageStyle.infoText}>Fetching content...</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
contentList =
|
||||||
|
claimsInChannel && claimsInChannel.length ? (
|
||||||
|
<FileList sortByHeight
|
||||||
|
hideFilter
|
||||||
|
fileInfos={claimsInChannel}
|
||||||
|
navigation={navigation}
|
||||||
|
style={channelPageStyle.fileList} />
|
||||||
|
) : (
|
||||||
|
<View style={channelPageStyle.busyContainer}>
|
||||||
|
<Text style={channelPageStyle.infoText}>No content found.</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={channelPageStyle.container}>
|
<View style={channelPageStyle.container}>
|
||||||
<Text style={channelPageStyle.title}>{name}</Text>
|
<PageHeader title={name} onBackPressed={() => { this.props.navigation.goBack(); }} />
|
||||||
<ScrollView style={channelPageStyle.content}>
|
{contentList}
|
||||||
|
|
||||||
</ScrollView>
|
|
||||||
<UriBar value={uri} navigation={navigation} />
|
<UriBar value={uri} navigation={navigation} />
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
|
|
@ -9,11 +9,27 @@ const channelPageStyle = StyleSheet.create({
|
||||||
content: {
|
content: {
|
||||||
flex: 1
|
flex: 1
|
||||||
},
|
},
|
||||||
|
fileList: {
|
||||||
|
paddingTop: 30,
|
||||||
|
flex: 1
|
||||||
|
},
|
||||||
title: {
|
title: {
|
||||||
color: Colors.LbryGreen,
|
color: Colors.LbryGreen,
|
||||||
fontFamily: 'Metropolis-SemiBold',
|
fontFamily: 'Metropolis-SemiBold',
|
||||||
fontSize: 30,
|
fontSize: 30,
|
||||||
margin: 16
|
margin: 16
|
||||||
|
},
|
||||||
|
busyContainer: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
flexDirection: 'row'
|
||||||
|
},
|
||||||
|
infoText: {
|
||||||
|
fontFamily: 'Metropolis-Regular',
|
||||||
|
fontSize: 20,
|
||||||
|
textAlign: 'center',
|
||||||
|
marginLeft: 10
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue