diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123c53477..a856749b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* Changed the File page to make it clearer how to to open the folder for a file
* The upgrade message is now friendlier and includes a link to the release notes.
* Improved Discover page load time by batching all URIs into one API call
+ * Local settings refactored and no longer intermixed with LBRY API library.
### Fixed
* Improve layout (and implementation) of the icon panel in file tiles and cards
diff --git a/ui/js/actions/search.js b/ui/js/actions/search.js
index 2d6be08ee..a83ce60bb 100644
--- a/ui/js/actions/search.js
+++ b/ui/js/actions/search.js
@@ -1,6 +1,5 @@
import * as types from "constants/action_types";
import lbryuri from "lbryuri";
-import lighthouse from "lighthouse";
import { doResolveUri } from "actions/content";
import { doNavigate } from "actions/navigation";
import { selectCurrentPage } from "selectors/navigation";
@@ -25,28 +24,41 @@ export function doSearch(query) {
if (page != "search") {
dispatch(doNavigate("search", { query: query }));
} else {
- lighthouse.search(query).then(results => {
- const actions = [];
+ fetch("https://lighthouse.lbry.io/search?s=" + query)
+ .then(response => {
+ return response.status === 200
+ ? Promise.resolve(response.json())
+ : Promise.reject(new Error(response.statusText));
+ })
+ .then(data => {
+ console.log(data);
+ let uris = [];
+ let actions = [];
- results.forEach(result => {
- const uri = lbryuri.build({
- channelName: result.channel_name,
- contentName: result.name,
- claimId: result.channel_id || result.claim_id,
+ data.forEach(result => {
+ const uri = lbryuri.build({
+ name: result.name,
+ claimId: result.claimId,
+ });
+ actions.push(doResolveUri(uri));
+ uris.push(uri);
});
- actions.push(doResolveUri(uri));
- });
- actions.push({
- type: types.SEARCH_COMPLETED,
- data: {
- query,
- results,
- },
+ actions.push({
+ type: types.SEARCH_COMPLETED,
+ data: {
+ query,
+ uris,
+ },
+ });
+ dispatch(batchActions(...actions));
+ })
+ .catch(err => {
+ console.log(err);
+ dispatch({
+ type: types.SEARCH_CANCELLED,
+ });
});
-
- dispatch(batchActions(...actions));
- });
}
};
}
diff --git a/ui/js/component/channelTile/index.js b/ui/js/component/channelTile/index.js
new file mode 100644
index 000000000..2e4c438f7
--- /dev/null
+++ b/ui/js/component/channelTile/index.js
@@ -0,0 +1,19 @@
+import React from "react";
+import { connect } from "react-redux";
+import { doFetchClaimCountByChannel } from "actions/content";
+import { makeSelectClaimForUri } from "selectors/claims";
+import { doNavigate } from "actions/navigation";
+import { makeSelectTotalItemsForChannel } from "selectors/content";
+import ChannelTile from "./view";
+
+const select = (state, props) => ({
+ claim: makeSelectClaimForUri(props.uri)(state),
+ totalItems: makeSelectTotalItemsForChannel(props.uri)(state),
+});
+
+const perform = dispatch => ({
+ fetchClaimCount: uri => dispatch(doFetchClaimCountByChannel(uri)),
+ navigate: (path, params) => dispatch(doNavigate(path, params)),
+});
+
+export default connect(select, perform)(ChannelTile);
diff --git a/ui/js/component/channelTile/view.jsx b/ui/js/component/channelTile/view.jsx
new file mode 100644
index 000000000..973d1dff5
--- /dev/null
+++ b/ui/js/component/channelTile/view.jsx
@@ -0,0 +1,50 @@
+import React from "react";
+import { TruncatedText, BusyMessage } from "component/common.js";
+
+class ChannelTile extends React.PureComponent {
+ componentDidMount() {
+ const { uri, fetchClaimCount } = this.props;
+
+ fetchClaimCount(uri);
+ }
+
+ componentWillReceiveProps(nextProps) {
+ const { uri, fetchClaimCount } = this.props;
+
+ if (nextProps.uri != uri) {
+ fetchClaimCount(uri);
+ }
+ }
+
+ render() {
+ const { navigate, totalItems, uri } = this.props;
+
+ let onClick = () => navigate("/show", { uri });
+
+ return (
+
+
+
+
+
+ {uri}
+
+
+
+ {isNaN(totalItems) &&
+ }
+ {totalItems > 0 &&
+
+ This is a channel with over {totalItems} items inside of it.
+ }
+ {totalItems === 0 &&
+ This is an empty channel.}
+
+
+
+
+ );
+ }
+}
+
+export default ChannelTile;
diff --git a/ui/js/component/fileListSearch/index.js b/ui/js/component/fileListSearch/index.js
index bdb88faab..6d70fe190 100644
--- a/ui/js/component/fileListSearch/index.js
+++ b/ui/js/component/fileListSearch/index.js
@@ -1,22 +1,15 @@
import React from "react";
import { connect } from "react-redux";
import { doSearch } from "actions/search";
-import {
- selectIsSearching,
- selectCurrentSearchResults,
- selectSearchQuery,
-} from "selectors/search";
-import { doNavigate } from "actions/navigation";
+import { selectIsSearching, makeSelectSearchUris } from "selectors/search";
import FileListSearch from "./view";
-const select = state => ({
+const select = (state, props) => ({
isSearching: selectIsSearching(state),
- query: selectSearchQuery(state),
- results: selectCurrentSearchResults(state),
+ uris: makeSelectSearchUris(props.query)(state),
});
const perform = dispatch => ({
- navigate: path => dispatch(doNavigate(path)),
search: search => dispatch(doSearch(search)),
});
diff --git a/ui/js/component/fileListSearch/view.jsx b/ui/js/component/fileListSearch/view.jsx
index 59884da8e..224c48d6a 100644
--- a/ui/js/component/fileListSearch/view.jsx
+++ b/ui/js/component/fileListSearch/view.jsx
@@ -1,52 +1,23 @@
import React from "react";
-import lbry from "lbry";
-import lbryio from "lbryio";
-import lbryuri from "lbryuri";
-import lighthouse from "lighthouse";
import FileTile from "component/fileTile";
+import ChannelTile from "component/channelTile";
import Link from "component/link";
-import { ToolTip } from "component/tooltip.js";
import { BusyMessage } from "component/common.js";
+import lbryuri from "lbryuri";
const SearchNoResults = props => {
- const { navigate, query } = props;
+ const { query } = props;
return (
{(__("No one has checked anything in for %s yet."), query)} {" "}
- navigate("/publish")} />
+
);
};
-const FileListSearchResults = props => {
- const { results } = props;
-
- const rows = [],
- seenNames = {}; //fix this when the search API returns claim IDs
-
- for (let {
- name,
- claim,
- claim_id,
- channel_name,
- channel_id,
- txid,
- nout,
- } of results) {
- const uri = lbryuri.build({
- channelName: channel_name,
- contentName: name,
- claimId: channel_id || claim_id,
- });
-
- rows.push();
- }
- return