LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues95 Pull requests2 Projects Releases4 Packages Wiki Activity

consolidated requests into one list

Browse source
This commit is contained in:
bill bittner 2018-02-14 12:09:57 -08:00
parent 4a2fbb402f
commit 0cecc84dde
12 changed files with 52 additions and 58 deletions
react/components
AssetDisplay
index.js
AssetInfo
index.js
AssetTitle
index.js
ShowAssetDetails
index.js
ShowAssetLite
index.js
ShowChannel
index.js

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

@ -7,8 +7,8 @@ const mapStateToProps = ({ show }) => {
const error = show.displayAsset.error;
const status = show.displayAsset.status;
// select asset
const request = show.assetRequests[show.request.id];
const assetKey = `a#${request.name}#${request.claimId}`;
const request = show.previousRequests[show.request.id];
const assetKey = request.key;
const asset = show.assetList[assetKey];
// return props
return {

4
react/components/AssetInfo/index.js
View file

@ -3,8 +3,8 @@ import View from './view';
const mapStateToProps = ({ show }) => {
// select asset
const request = show.assetRequests[show.request.id];
const assetKey = `a#${request.name}#${request.claimId}`;
const request = show.previousRequests[show.request.id];
const assetKey = request.key;
const asset = show.assetList[assetKey];
// return props
return {

4
react/components/AssetTitle/index.js
View file

@ -3,8 +3,8 @@ import View from './view';
const mapStateToProps = ({ show }) => {
// select title
const request = show.assetRequests[show.request.id];
const assetKey = `a#${request.name}#${request.claimId}`;
const request = show.previousRequests[show.request.id];
const assetKey = request.key;
const asset = show.assetList[assetKey];
let title;
if (asset) {

6
react/components/ShowAssetDetails/index.js
View file

@ -7,10 +7,10 @@ const mapStateToProps = ({ show }) => {
const requestId = show.request.id;
// select asset info
let asset;
const previousRequest = show.assetRequests[requestId] || null;
const request = show.previousRequests[requestId] || null;
const assetList = show.assetList;
if (previousRequest) {
const assetKey = `a#${previousRequest.name}#${previousRequest.claimId}`; // note: just store this in the request
if (request && assetList) {
const assetKey = request.key; // note: just store this in the request
asset = assetList[assetKey] || null;
};
// return props

7
react/components/ShowAssetLite/index.js
View file

@ -7,11 +7,10 @@ const mapStateToProps = ({ show }) => {
const requestId = show.request.id;
// select asset info
let asset;
const previousRequest = show.assetRequests[requestId] || null;
console.log('previous request:', previousRequest);
const request = show.previousRequests[requestId] || null;
const assetList = show.assetList;
if (previousRequest) {
const assetKey = `a#${previousRequest.name}#${previousRequest.claimId}`; // note: just store this in the request
if (request && assetList) {
const assetKey = request.key; // note: just store this in the request
asset = assetList[assetKey] || null;
};
// return props

4
react/components/ShowChannel/index.js
View file

@ -5,11 +5,11 @@ const mapStateToProps = ({ show }) => {
// select request info
const requestId = show.request.id;
// select request
const previousRequest = show.channelRequests[requestId] || null;
const previousRequest = show.previousRequests[requestId] || null;
// select channel
let channel;
if (previousRequest) {
const channelKey = `c#${previousRequest.name}#${previousRequest.longId}`;
const channelKey = previousRequest.key;
channel = show.channelList[channelKey] || null;
}
return {