LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

switched show and channel components back to inernal state

Browse source
This commit is contained in:
bill bittner 2018-02-02 12:46:18 -08:00
parent 1cbe9edf21
commit 7600ff5c54
14 changed files with 147 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
helpers/errorHandlers.js
View file

@ -5,25 +5,25 @@ module.exports = {
let status, message;
// check for daemon being turned off
if (error.code === 'ECONNREFUSED') {
status = 503;
status = 200;
message = 'Connection refused. The daemon may not be running.';
// check for errors from the daemon
} else if (error.response) {
status = error.response.status || 500;
if (error.response.data) {
if (error.response.data.message) {
message = error.response.data.message;
} else if (error.response.data.error) {
message = error.response.data.error.message;
} else {
message = error.response.data;
}
} else {
message = error.response;
}
// // check for errors from the daemon
// } else if (error.response) {
// status = error.response.status || 500;
// if (error.response.data) {
// if (error.response.data.message) {
// message = error.response.data.message;
// } else if (error.response.data.error) {
// message = error.response.data.error.message;
// } else {
// message = error.response.data;
// }
// } else {
// message = error.response;
// }
// check for thrown errors
} else if (error.message) {
status = 400;
status = 200;
message = error.message;
// fallback for everything else
} else {

4
helpers/lbryApi.js
View file

@ -10,13 +10,13 @@ function handleLbrynetResponse ({ data }, resolve, reject) {
// check for an error
if (data.result.error) {
logger.debug('Lbrynet api error:', data.result.error);
reject(data.result.error);
reject(new Error(data.result.error));
return;
};
resolve(data.result);
return;
}
// fallback in case the just timed out
// fallback in case it just timed out
reject(JSON.stringify(data));
}

26
react/actions/show.js
View file

@ -19,29 +19,3 @@ export function updateRequestWithAssetRequest (name, id, channelName, channelId,
extension,
};
};
export function updateChannelData (name, longId, shortId) {
return {
type: actions.CHANNEL_DATA_UPDATE,
name,
longId,
shortId,
};
};
export function updateChannelClaimsData (claims, currentPage, totalPages, totalClaims) {
return {
type: actions.CHANNEL_CLAIMS_DATA_UPDATE,
claims,
currentPage,
totalPages,
totalClaims,
};
};
export function updateAssetData (data) {
return {
type: actions.ASSET_DATA_UPDATE,
data,
};
};

21
react/components/AssetDisplay/index.js
View file

@ -39,9 +39,12 @@ class AssetDisplay extends React.Component {
const url = `/api/file-is-available/${this.props.name}/${this.props.claimId}`;
return new Promise((resolve, reject) => {
Request(url)
.then(isAvailable => {
.then(({success, message, data: isAvailable}) => {
if (success) {
console.log('/api/file-is-available response:', isAvailable);
resolve(isAvailable);
return resolve(isAvailable);
}
reject(new Error(message));
})
.catch(error => {
reject(error);
@ -53,9 +56,12 @@ class AssetDisplay extends React.Component {
const url = `/api/claim-get/${this.props.name}/${this.props.claimId}`;
return new Promise((resolve, reject) => {
Request(url)
.then(response => {
console.log('/api/claim-get response:', response);
resolve(true);
.then(({success, message}) => {
console.log('/api/claim-get response:', success, message);
if (success) {
return resolve(true);
}
reject(new Error(message));
})
.catch(error => {
reject(error);
@ -65,6 +71,11 @@ class AssetDisplay extends React.Component {
render () {
return (
<div id="asset-display-component">
{(this.state.status === LOCAL_CHECK) &&
<div>
<p>Checking to see if Spee.ch has your asset locally...</p>
</div>
}
{(this.state.status === SEARCHING) &&
<div>
<p>Sit tight, we're searching the LBRY blockchain for your asset!</p>

79
react/components/ChannelClaimsDisplay/index.js Normal file
View file

@ -0,0 +1,79 @@
import React from 'react/index';
import AssetPreview from 'components/AssetPreview';
import request from 'utils/request';
class ChannelClaimsDisplay extends React.Component {
constructor (props) {
super(props);
this.state = {
error : null,
claims : null,
currentPage: null,
totalPages : null,
totalClaims: null,
};
this.updateClaimsData = this.updateClaimsData.bind(this);
}
componentDidMount () {
this.updateClaimsData(1);
}
updateClaimsData (page) {
const name = this.props.name;
const longId = this.props.longId;
const url = `/api/channel-claims/${name}/${longId}/${page}`;
const that = this;
return request(url)
.then(({ success, message, data }) => {
console.log('api/channel-claims response:', data);
if (!success) {
return that.setState({error: message});
}
this.setState({
claims : data.claims,
currentPage: data.currentPage,
totalPages : data.totalPages,
totalClaims: data.totalResults,
});
})
.catch((error) => {
that.setState({error: error.message});
});
}
render () {
return (
<div>
{this.state.error ? (
<div className="row">
<div className="column column--10">
<p>{this.state.error}</p>
</div>
</div>
) : (
<div className="row row--tall">
<p>total pages: {this.state.totalPages}</p>
<p>total claims: {this.state.totalClaims}</p>
{this.state.claims &&
<div>
{this.state.claims.map((claim, index) => <AssetPreview
name={claim.name}
claimId={claim.claimId}
contentType={claim.contentType}
key={index}
/>)}
{(this.state.currentPage > 1) && <button onClick={this.updateClaimsData(this.state.currentPage - 1)}>Previous Page</button>}
<p>current page: {this.state.currentPage}</p>
{(this.state.currentPage < this.state.totalPages) && <button onClick={this.updateClaimsData(this.state.currentPage + 1)}>Next Page</button>}
</div>
}
</div>
)}
</div>
);
}
};
// PropTypes
// name
// id
export default ChannelClaimsDisplay;

3
react/constants/show_action_types.js
View file

@ -1,5 +1,2 @@
export const REQUEST_UPDATE_CHANNEL = 'REQUEST_UPDATE_CHANNEL';
export const REQUEST_UPDATE_CLAIM = 'REQUEST_UPDATE_CLAIM';
export const CHANNEL_DATA_UPDATE = 'CHANNEL_DATA_UPDATE';
export const CHANNEL_CLAIMS_DATA_UPDATE = 'CHANNEL_CLAIMS_DATA_UPDATE';
export const ASSET_DATA_UPDATE = 'ASSET_DATA_UPDATE';

24
react/containers/ChannelClaimsDisplay/index.js
View file

@ -1,24 +0,0 @@
import { connect } from 'react-redux';
import View from './view';
import {updateChannelClaimsData} from 'actions/show';
const mapStateToProps = ({ show }) => {
return {
name : show.channelData.name,
longId : show.channelData.longId,
claims : show.channelClaimsData.claims,
currentPage: show.channelClaimsData.currentPage,
totalPages : show.channelClaimsData.totalPages,
totalClaims: show.channelClaimsData.totalClaims,
};
};
const mapDispatchToProps = dispatch => {
return {
onClaimsDataChange: (claims, currentPage, totalPages, totalClaims) => {
dispatch(updateChannelClaimsData(claims, currentPage, totalPages, totalClaims));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(View);

63
react/containers/ChannelClaimsDisplay/view.jsx
View file

@ -1,63 +0,0 @@
import React from 'react';
import AssetPreview from 'components/AssetPreview/index';
import request from 'utils/request';
class ChannelClaimsDisplay extends React.Component {
constructor (props) {
super(props);
this.state = {
error: null,
};
this.getAndStoreChannelClaims = this.getAndStoreChannelClaims.bind(this);
}
componentDidMount () {
this.getAndStoreChannelClaims(this.props.name, this.props.longId, this.props.currentPage);
}
getAndStoreChannelClaims (name, id, page) {
if (!id) id = 'none';
const url = `/api/channel-claims/${name}/${id}/${page}`;
const that = this;
return request(url)
.then(({ success, message, data }) => {
console.log('api/channel-claims response:', data);
if (!success) {
return that.setState({error: message});
}
this.props.onClaimsDataChange(data.claims, data.currentPage, data.totalPages, data.totalResults);
})
.catch((error) => {
that.setState({error: error.message});
});
}
render () {
return (
<div>
{this.state.error ? (
<div className="row">
<div className="column column--10">
<p>{this.state.error}</p>
</div>
</div>
) : (
<div className="row row--tall">
{this.props.claims &&
<div>
{this.props.claims.map((claim, index) => <AssetPreview
name={claim.name}
claimId={claim.claimId}
contentType={claim.contentType}
key={index}
/>)}
<p>current page: {this.props.currentPage}</p>
<p>total pages: {this.props.totalPages}</p>
<p>total claims: {this.props.totalClaims}</p>
</div>
}
</div>
)}
</div>
);
}
};
export default ChannelClaimsDisplay;

12
react/containers/ShowAsset/index.js
View file

@ -1,5 +1,4 @@
import { connect } from 'react-redux';
import { updateAssetData } from 'actions/show';
import View from './view';
const mapStateToProps = ({ show }) => {
@ -7,16 +6,7 @@ const mapStateToProps = ({ show }) => {
modifier : show.assetRequest.modifier,
claim : show.assetRequest.name,
extension: show.assetRequest.extension,
claimData: show.assetData,
};
};
const mapDispatchToProps = dispatch => {
return {
onAssetDataUpdate: (data) => {
dispatch(updateAssetData(data));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(View);
export default connect(mapStateToProps, null)(View);

7
react/containers/ShowAsset/view.jsx
View file

@ -8,6 +8,7 @@ class ShowAsset extends React.Component {
super(props);
this.state = {
error : null,
claimData: null,
};
this.getLongClaimId = this.getLongClaimId.bind(this);
this.getClaimData = this.getClaimData.bind(this);
@ -42,7 +43,7 @@ class ShowAsset extends React.Component {
return that.getClaimData(name, claimLongId);
})
.then(claimData => {
this.props.onAssetDataUpdate(claimData);
this.setState({claimData});
})
.catch(error => {
this.setState({error});
@ -86,14 +87,14 @@ class ShowAsset extends React.Component {
return (
<ShowAssetLite
error={this.state.error}
claimData={this.props.claimData}
claimData={this.state.claimData}
/>
);
}
return (
<ShowAssetDetails
error={this.state.error}
claimData={this.props.claimData}
claimData={this.state.claimData}
/>
);
}

22
react/containers/ShowChannel/index.js
View file

@ -1,27 +1,11 @@
import { connect } from 'react-redux';
import { updateChannelData } from 'actions/show';
import View from './view';
const mapStateToProps = ({ show }) => {
return {
request: {
name: show.channelRequest.name,
id : show.channelRequest.id,
},
channel: {
name : show.channelData.name,
shortId: show.channelData.shortId,
longId : show.channelData.longId,
},
requestName: show.channelRequest.name,
requestId : show.channelRequest.id,
};
};
const mapDispatchToProps = dispatch => {
return {
onChannelDataChange: (name, longId, shortId) => {
dispatch(updateChannelData(name, longId, shortId));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(View);
export default connect(mapStateToProps, null)(View);

26
react/containers/ShowChannel/view.jsx
View file

@ -1,6 +1,6 @@
import React from 'react';
import NavBar from 'containers/NavBar';
import ChannelClaimsDisplay from 'containers/ChannelClaimsDisplay';
import ChannelClaimsDisplay from 'components/ChannelClaimsDisplay';
import request from 'utils/request';
class ShowChannel extends React.Component {
@ -8,11 +8,14 @@ class ShowChannel extends React.Component {
super(props);
this.state = {
error : null,
name : null,
shortId: null,
longId : null,
};
this.getAndStoreChannelData = this.getAndStoreChannelData.bind(this);
}
componentDidMount () {
this.getAndStoreChannelData(this.props.request.name, this.props.request.id);
this.getAndStoreChannelData(this.props.requestName, this.props.requestId);
}
getAndStoreChannelData (name, id) {
if (!id) id = 'none';
@ -24,7 +27,11 @@ class ShowChannel extends React.Component {
if (!success) {
return that.setState({error: message});
}
this.props.onChannelDataChange(data.channelName, data.longChannelClaimId, data.shortChannelClaimId);
this.setState({
name : data.channelName,
longId : data.longChannelClaimId,
shortId: data.shortChannelClaimId,
});
})
.catch((error) => {
that.setState({error: error.message});
@ -43,12 +50,17 @@ class ShowChannel extends React.Component {
) : (
<div className="row row--tall row--padded">
<div className="column column--10">
<h2>channel name: {this.props.channel.name}</h2>
<p>full channel id: {this.props.channel.longId ? this.props.channel.longId : 'loading...'}</p>
<p>short channel id: {this.props.channel.shortId ? this.props.channel.shortId : 'loading...'}</p>
<h2>channel name: {this.state.name ? this.state.name : 'loading...'}</h2>
<p>full channel id: {this.state.longId ? this.state.longId : 'loading...'}</p>
<p>short channel id: {this.state.shortId ? this.state.shortId : 'loading...'}</p>
</div>
<div className="column column--10">
{this.props.channel.name && <ChannelClaimsDisplay/>}
{(this.state.name && this.state.longId) &&
<ChannelClaimsDisplay
name={this.state.name}
longId={this.state.longId}
/>
}
</div>
</div>
)}

33
react/reducers/show.js
View file

@ -18,18 +18,6 @@ const initialState = {
},
extension: null,
},
channelData: {
name : null,
shortId: null,
longId : null,
},
channelClaimsData: {
claims : null,
currentPage: 1,
totalPages : null,
totalClaims: null,
},
assetData: null,
};
/*
@ -61,27 +49,6 @@ export default function (state = initialState, action) {
extension: action.extension,
},
});
case actions.CHANNEL_DATA_UPDATE:
return Object.assign({}, state, {
channelData: Object.assign({}, state.channel, {
name : action.name,
shortId: action.shortId,
longId : action.longId,
}),
});
case actions.CHANNEL_CLAIMS_DATA_UPDATE:
return Object.assign({}, state, {
channelClaimsData: {
claims : action.claims,
currentPage: action.currentPage,
totalPages : action.totalPages,
totalClaims: action.totalClaims,
},
});
case actions.ASSET_DATA_UPDATE:
return Object.assign({}, state, {
assetData: action.data,
});
default:
return state;
}

8
routes/api-routes.js
View file

@ -29,13 +29,13 @@ module.exports = (app) => {
app.get('/api/file-is-available/:name/:claimId', ({ ip, originalUrl, params }, res) => {
const name = params.name;
const claimId = params.claimId;
let isLocalFileAvailable = false;
let isAvailable = false;
db.File.findOne({where: {name, claimId}})
.then(result => {
if (result) {
isLocalFileAvailable = true;
isAvailable = true;
}
res.status(200).json({status: 'success', message: isLocalFileAvailable});
res.status(200).json({success: true, data: isAvailable});
})
.catch(error => {
errorHandlers.handleApiError(originalUrl, ip, error, res);
@ -61,7 +61,7 @@ module.exports = (app) => {
return Promise.all([db.upsert(db.File, fileData, {name, claimId}, 'File'), getResult]);
})
.then(([ fileRecord, {message, completed} ]) => {
res.status(200).json({ status: 'success', message, completed });
res.status(200).json({ success: true, message, completed });
})
.catch(error => {
errorHandlers.handleApiError(originalUrl, ip, error, res);