cuts release from staging #1073

Merged
jessopb merged 7 commits from staging into release 2020-06-11 18:45:14 +02:00
3 changed files with 20 additions and 9 deletions

View file

@ -3,7 +3,7 @@ import ErrorPage from '@pages/ErrorPage';
import ShowAssetLite from '@pages/ShowAssetLite';
import ShowAssetDetails from '@pages/ShowAssetDetails';
import ShowChannel from '@pages/ShowChannel';
import { withRouter } from 'react-router-dom';
import { withRouter, Redirect } from 'react-router-dom';
import {
CHANNEL,
@ -15,15 +15,24 @@ import {
class ContentPageWrapper extends React.Component {
componentDidMount () {
const { onHandleShowPageUri, match, homeChannel } = this.props;
onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
//onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
}
componentWillReceiveProps (nextProps) {
if (nextProps.match.params !== this.props.match.params) {
this.props.onHandleShowPageUri(nextProps.match.params);
//this.props.onHandleShowPageUri(nextProps.match.params);
}
}
render () {
const { error, requestType } = this.props;
const { error, requestType, match } = this.props;
const { params } = match;
const { claim, identifier } = params;
if (identifier && claim) {
return <Redirect to={`https://lbry.tv/${identifier}/${claim}`} />;
} else if (identifier) {
// return <Redirect to={`https://lbry.tv/${identifier}/`} />
} else {
return <Redirect to={`https://lbry.tv/${claim}`} />;
}
if (error) {
return (
<ErrorPage error={error} />
@ -31,13 +40,13 @@ class ContentPageWrapper extends React.Component {
}
switch (requestType) {
case CHANNEL:
return <ShowChannel />;
// return <ShowChannel />;
case ASSET_LITE:
return <ShowAssetLite />;
// return <ShowAssetLite />;
case ASSET_DETAILS:
return <ShowAssetDetails />;
// return <ShowAssetDetails />;
case SPECIAL_ASSET:
return <ShowChannel />;
// return <ShowChannel />;
default:
return <p>loading...</p>;
}

View file

@ -104,6 +104,7 @@ export default (db, table, sequelize) => ({
.findAll({
where: {
name: claimName,
claim_type: 1,
publisher_id: channelClaimId,
bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] },
},
@ -215,6 +216,7 @@ export default (db, table, sequelize) => ({
.findAll({
where: {
name: claimName,
claim_type: 1,
publisher_id: channelId,
},
})

View file

@ -2,6 +2,6 @@ module.exports = {
...require('./pages').default,
...require('./api').default,
...require('./auth').default,
...require('./assets').default,
// ...require('./assets').default,
...require('./fallback').default,
};