From 938a8e1b7e6d1dc3f80e5d7cd1f981640717f0ca Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Wed, 23 May 2018 00:35:34 -0400
Subject: [PATCH] allow channels on Discover page

---
 src/renderer/component/categoryList/index.js  | 18 +++++++++++++
 .../view.jsx}                                 | 27 +++++++++++++++++--
 src/renderer/page/discover/view.jsx           |  8 ++++--
 src/renderer/page/file/view.jsx               | 10 ++++++-
 src/renderer/redux/actions/content.js         |  8 +++---
 5 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 src/renderer/component/categoryList/index.js
 rename src/renderer/component/{common/category-list.jsx => categoryList/view.jsx} (91%)

diff --git a/src/renderer/component/categoryList/index.js b/src/renderer/component/categoryList/index.js
new file mode 100644
index 000000000..7e728b9f4
--- /dev/null
+++ b/src/renderer/component/categoryList/index.js
@@ -0,0 +1,18 @@
+import { connect } from 'react-redux';
+import { doFetchClaimsByChannel } from 'redux/actions/content';
+import {
+  makeSelectClaimsInChannelForCurrentPage,
+  makeSelectFetchingChannelClaims,
+} from 'lbry-redux';
+import CategoryList from './view';
+
+const select = (state, props) => ({
+  channelClaims: makeSelectClaimsInChannelForCurrentPage(props.categoryLink)(state),
+  fetching: makeSelectFetchingChannelClaims(props.categoryLink)(state),
+});
+
+const perform = dispatch => ({
+  fetchChannel: channel => dispatch(doFetchClaimsByChannel(channel)),
+});
+
+export default connect(select, perform)(CategoryList);
diff --git a/src/renderer/component/common/category-list.jsx b/src/renderer/component/categoryList/view.jsx
similarity index 91%
rename from src/renderer/component/common/category-list.jsx
rename to src/renderer/component/categoryList/view.jsx
index 4b1589cee..0afa57940 100644
--- a/src/renderer/component/common/category-list.jsx
+++ b/src/renderer/component/categoryList/view.jsx
@@ -5,11 +5,15 @@ import ToolTip from 'component/common/tooltip';
 import FileCard from 'component/fileCard';
 import Button from 'component/button';
 import * as icons from 'constants/icons';
+import Claim from 'types/claim';
 
 type Props = {
   category: string,
   names: Array<string>,
-  categoryLink?: string,
+  categoryLink: ?string,
+  fetching: boolean,
+  channelClaims: Array<Claim>,
+  fetchChannel: string => void,
 };
 
 type State = {
@@ -18,6 +22,11 @@ type State = {
 };
 
 class CategoryList extends React.PureComponent<Props, State> {
+  static defaultProps = {
+    names: [],
+    categoryLink: '',
+  };
+
   constructor() {
     super();
 
@@ -32,6 +41,11 @@ class CategoryList extends React.PureComponent<Props, State> {
   }
 
   componentDidMount() {
+    const { fetching, categoryLink, fetchChannel } = this.props;
+    if (!fetching) {
+      fetchChannel(categoryLink);
+    }
+
     const cardRow = this.rowItems;
     if (cardRow) {
       const cards = cardRow.getElementsByTagName('section');
@@ -109,6 +123,9 @@ class CategoryList extends React.PureComponent<Props, State> {
 
   // check if a card is fully visible horizontally
   isCardVisible = (section: HTMLElement) => {
+    if (!section) {
+      return false;
+    }
     const rect = section.getBoundingClientRect();
     const isVisible = rect.left >= 0 && rect.right <= window.innerWidth;
     return isVisible;
@@ -189,7 +206,7 @@ class CategoryList extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { category, names, categoryLink } = this.props;
+    const { category, categoryLink, names, channelClaims } = this.props;
     const { canScrollNext, canScrollPrevious } = this.state;
 
     // The lint was throwing an error saying we should use <button> instead of <a>
@@ -235,6 +252,12 @@ class CategoryList extends React.PureComponent<Props, State> {
           className="card-row__scrollhouse"
         >
           {names && names.map(name => <FileCard key={name} uri={normalizeURI(name)} />)}
+
+          {channelClaims && channelClaims.length
+            ? channelClaims.map(claim => (
+                <FileCard key={claim.claim_id} uri={`lbry://${claim.name}#${claim.claim_id}`} />
+              ))
+            : null}
         </div>
       </div>
     );
diff --git a/src/renderer/page/discover/view.jsx b/src/renderer/page/discover/view.jsx
index 28adf330c..123992dc8 100644
--- a/src/renderer/page/discover/view.jsx
+++ b/src/renderer/page/discover/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
 import Page from 'component/page';
-import CategoryList from 'component/common/category-list';
+import CategoryList from 'component/categoryList';
 
 type Props = {
   fetchFeaturedUris: () => void,
@@ -27,7 +27,11 @@ class DiscoverPage extends React.PureComponent<Props> {
               featuredUris[category].length ? (
                 <CategoryList key={category} category={category} names={featuredUris[category]} />
               ) : (
-                ''
+                <CategoryList
+                  key={category}
+                  category={category.split('#')[0]}
+                  categoryLink={category}
+                />
               )
           )}
         {failedToLoad && <div className="empty">{__('Failed to load landing content.')}</div>}
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index bf7c34846..5ebe44876 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -129,6 +129,14 @@ class FilePage extends React.Component<Props> {
       subscriptionUri = buildURI({ channelName, claimId: channelClaimId }, false);
     }
 
+    // We want to use the short form uri for editing
+    // This is what the user is used to seeing, they don't care about the claim id
+    // We will select the claim id before they publish
+    let editUri;
+    if (claimIsMine) {
+      editUri = buildURI({ channelName, contentName: claim.name });
+    }
+
     const isPlaying = playingUri === uri && !isPaused;
     return (
       <Page extraPadding>
@@ -170,7 +178,7 @@ class FilePage extends React.Component<Props> {
                       icon={icons.EDIT}
                       label={__('Edit')}
                       onClick={() => {
-                        prepareEdit(claim, uri);
+                        prepareEdit(claim, editUri);
                         navigate('/publish');
                       }}
                     />
diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js
index 8dae86f8f..7278beb3d 100644
--- a/src/renderer/redux/actions/content.js
+++ b/src/renderer/redux/actions/content.js
@@ -42,10 +42,10 @@ export function doFetchFeaturedUris() {
     });
 
     const success = ({ Uris }) => {
-      let urisToResolve = [];
-      Object.keys(Uris).forEach(category => {
-        urisToResolve = [...urisToResolve, ...Uris[category]];
-      });
+      const urisToResolve = Object.keys(Uris).reduce(
+        (resolve, category) => [...resolve, ...Uris[category]],
+        []
+      );
 
       const actions = [
         doResolveUris(urisToResolve),