Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-21 11:42:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

href removed from useSearch hook

Browse source
This commit is contained in:
nklhrstv 2020-03-28 19:27:07 +02:00
parent d709e57f97
commit 22ec152cee
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/routes/Search/Search.js
View file

@ -46,6 +46,8 @@ const Search = ({ queryParams }) => {
</div> </div>
: :
search.catalog_resources.map((catalog_resource, index) => { search.catalog_resources.map((catalog_resource, index) => {
const queryString = new URLSearchParams([['search', query]]).toString();
const href = `#/discover/${encodeURIComponent(catalog_resource.request.base)}/${encodeURIComponent(catalog_resource.request.path.type_name)}/${encodeURIComponent(catalog_resource.request.path.id)}?${queryString}`;
const title = `${catalog_resource.origin} - ${catalog_resource.request.path.id} ${catalog_resource.request.path.type_name}`; const title = `${catalog_resource.origin} - ${catalog_resource.request.path.id} ${catalog_resource.request.path.type_name}`;
switch (catalog_resource.content.type) { switch (catalog_resource.content.type) {
case 'Ready': { case 'Ready': {
@ -56,7 +58,7 @@ const Search = ({ queryParams }) => {
title={title} title={title}
items={catalog_resource.content.content} items={catalog_resource.content.content}
itemComponent={MetaItem} itemComponent={MetaItem}
href={catalog_resource.href} href={href}
/> />
); );
} }
@ -68,7 +70,7 @@ const Search = ({ queryParams }) => {
className={styles['search-row']} className={styles['search-row']}
title={title} title={title}
message={message} message={message}
href={catalog_resource.href} href={href}
/> />
); );
} }
@ -78,7 +80,7 @@ const Search = ({ queryParams }) => {
key={index} key={index}
className={styles['search-row']} className={styles['search-row']}
title={title} title={title}
href={catalog_resource.href} href={href}
/> />
); );
} }

7
src/routes/Search/useSearch.js
View file

@ -7,10 +7,6 @@ const initSearchState = () => ({
}); });
const mapSearchStateWithCtx = (search, ctx) => { const mapSearchStateWithCtx = (search, ctx) => {
const queryString = search.selected !== null ?
new URLSearchParams(search.selected.extra).toString()
:
'';
const selected = search.selected; const selected = search.selected;
const catalog_resources = search.catalog_resources.map((catalog_resource) => { const catalog_resources = search.catalog_resources.map((catalog_resource) => {
const request = catalog_resource.request; const request = catalog_resource.request;
@ -37,8 +33,7 @@ const mapSearchStateWithCtx = (search, ctx) => {
return origin; return origin;
}, catalog_resource.request.base); }, catalog_resource.request.base);
const href = `#/discover/${encodeURIComponent(catalog_resource.request.base)}/${encodeURIComponent(catalog_resource.request.path.type_name)}/${encodeURIComponent(catalog_resource.request.path.id)}?${queryString}`; return { request, content, origin };
return { request, content, origin, href };
}); });
return { selected, catalog_resources }; return { selected, catalog_resources };
}; };