From 4f770ec83e15ec362cb78633e001b3adc2ba44e8 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 17 Sep 2020 13:11:19 -0400 Subject: [PATCH] redirect to channel page if no channels when trying to repost --- ui/component/fileActions/index.js | 13 ++++++++++- ui/component/fileActions/view.jsx | 37 ++++++++++++++++++++++++++++--- ui/modal/modalRepost/view.jsx | 1 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/ui/component/fileActions/index.js b/ui/component/fileActions/index.js index b57c78062..f0c2bdeea 100644 --- a/ui/component/fileActions/index.js +++ b/ui/component/fileActions/index.js @@ -1,6 +1,14 @@ import { connect } from 'react-redux'; -import { makeSelectClaimIsMine, makeSelectFileInfoForUri, makeSelectClaimForUri, doPrepareEdit } from 'lbry-redux'; +import { + makeSelectClaimIsMine, + makeSelectFileInfoForUri, + makeSelectClaimForUri, + doPrepareEdit, + selectMyChannelClaims, +} from 'lbry-redux'; import { makeSelectCostInfoForUri } from 'lbryinc'; +import { doSetPlayingUri } from 'redux/actions/content'; +import { doToast } from 'redux/actions/notifications'; import { doOpenModal } from 'redux/actions/app'; import fs from 'fs'; import FileActions from './view'; @@ -12,11 +20,14 @@ const select = (state, props) => ({ fileInfo: makeSelectFileInfoForUri(props.uri)(state), renderMode: makeSelectFileRenderModeForUri(props.uri)(state), costInfo: makeSelectCostInfoForUri(props.uri)(state), + myChannels: selectMyChannelClaims(state), }); const perform = dispatch => ({ openModal: (modal, props) => dispatch(doOpenModal(modal, props)), prepareEdit: (publishData, uri, fileInfo) => dispatch(doPrepareEdit(publishData, uri, fileInfo, fs)), + clearPlayingUri: () => dispatch(doSetPlayingUri(null)), + doToast: options => dispatch(doToast(options)), }); export default connect(select, perform)(FileActions); diff --git a/ui/component/fileActions/view.jsx b/ui/component/fileActions/view.jsx index e3dd3ba1e..2400c5994 100644 --- a/ui/component/fileActions/view.jsx +++ b/ui/component/fileActions/view.jsx @@ -1,5 +1,5 @@ // @flow -import { SIMPLE_SITE } from 'config'; +import { SIMPLE_SITE, SITE_NAME } from 'config'; import * as PAGES from 'constants/pages'; import * as CS from 'constants/claim_search'; import * as MODALS from 'constants/modal_types'; @@ -11,6 +11,7 @@ import { buildURI } from 'lbry-redux'; import * as RENDER_MODES from 'constants/file_render_modes'; import { useIsMobile } from 'effects/use-screensize'; import ClaimSupportButton from 'component/claimSupportButton'; +import { useHistory } from 'react-router'; type Props = { uri: string, @@ -21,13 +22,33 @@ type Props = { fileInfo: FileListItem, costInfo: ?{ cost: number }, renderMode: string, + myChannels: ?Array, + doToast: ({ message: string }) => void, + clearPlayingUri: () => void, }; function FileActions(props: Props) { - const { fileInfo, uri, openModal, claimIsMine, claim, costInfo, renderMode, prepareEdit } = props; + const { + fileInfo, + uri, + openModal, + claimIsMine, + claim, + costInfo, + renderMode, + prepareEdit, + myChannels, + clearPlayingUri, + doToast, + } = props; + const { + push, + location: { pathname }, + } = useHistory(); const isMobile = useIsMobile(); const webShareable = costInfo && costInfo.cost === 0 && RENDER_MODES.WEB_SHAREABLE_MODES.includes(renderMode); const showDelete = claimIsMine || (fileInfo && (fileInfo.written_bytes > 0 || fileInfo.blobs_completed > 0)); + const hasChannels = myChannels && myChannels.length > 0; const claimId = claim && claim.claim_id; const { signing_channel: signingChannel } = claim; const channelName = signingChannel && signingChannel.name; @@ -47,6 +68,16 @@ function FileActions(props: Props) { editUri = buildURI(uriObject); } + function handleRepostClick() { + if (!hasChannels) { + clearPlayingUri(); + push(`/$/${PAGES.CHANNEL_NEW}?redirect=${pathname}`); + doToast({ message: __('A channel is required to repost on %SITE_NAME%', { SITE_NAME }) }); + } else { + openModal(MODALS.REPOST, { uri }); + } + } + const lhsSection = ( <>