scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-14 15:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make search urls consistent

Browse source 
in search urls:
* use %20 for spaces everywhere
* encode search term strings
* hide ‘q’ key if it has no value
This commit is contained in:
Ben Wheeler 2019-05-10 22:58:33 -04:00
parent e67ce6c6cb
commit f6cb3d5078
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/navigation/www/navigation.jsx
View file

@ -78,7 +78,11 @@ class Navigation extends React.Component {
return `/users/${this.props.user.username}/`;
}
handleSearchSubmit (formData) {
window.location.href = `/search/projects?q=${encodeURIComponent(formData.q)}`;
let targetUrl = '/search/projects';
if (formData.q) {
targetUrl += `?q=${encodeURIComponent(formData.q)}`;
}
window.location.href = targetUrl;
}
render () {
const createLink = this.props.user ? '/projects/editor/' : '/projects/editor/?tutorial=getStarted';

40
src/views/search/search.jsx
View file

@ -57,7 +57,9 @@ class Search extends React.Component {
}
componentDidMount () {
const query = decodeURIComponent(window.location.search);
// just in case there's a URL in the wild with pluses to indicate spaces,
// convert pluses to url-encoded spaces before decoding.
const query = decodeURIComponent(window.location.search.split('+').join('%20'));
let term = query;
const stripQueryValue = function (queryTerm) {
@ -91,6 +93,13 @@ class Search extends React.Component {
this.handleGetSearchMore();
}
}
encodeSearchTerm () {
let termText = '';
if (this.props.searchTerm) {
termText = encodeURIComponent(this.props.searchTerm);
}
return termText;
}
getSearchState () {
let pathname = window.location.pathname.toLowerCase();
if (pathname[pathname.length - 1] === '/') {
@ -105,21 +114,24 @@ class Search extends React.Component {
}
handleChangeSortMode (name, value) {
if (ACCEPTABLE_MODES.indexOf(value) !== -1) {
const term = this.props.searchTerm.split(' ').join('+');
window.location =
`${window.location.origin}/search/${this.state.tab}?q=${term}&mode=${value}`;
const termText = this.encodeSearchTerm();
let newLocation = `${window.location.origin}/search/${this.state.tab}?mode=${value}`;
if (termText) {
newLocation += `&q=${termText}`;
}
window.location = newLocation;
}
}
handleGetSearchMore () {
let termText = '';
if (this.props.searchTerm !== '') {
termText = `&q=${encodeURIComponent(this.props.searchTerm.split(' ').join('+'))}`;
}
const termText = this.encodeSearchTerm();
const locale = this.props.intl.locale;
const loadNumber = this.state.loadNumber;
const offset = this.state.offset;
const mode = this.state.mode;
const queryString = `limit=${loadNumber}&offset=${offset}&language=${locale}&mode=${mode}${termText}`;
let queryString = `limit=${loadNumber}&offset=${offset}&language=${locale}&mode=${mode}`;
if (termText) {
queryString += `&q=${termText}`;
}
api({
uri: `/search/${this.state.tab}?${queryString}`
@ -137,9 +149,13 @@ class Search extends React.Component {
});
}
getTab (type) {
const term = this.props.searchTerm.split(' ').join('+');
const termText = this.encodeSearchTerm();
let targetUrl = `/search/${type}`;
if (termText) {
targetUrl += `?q=${termText}`;
}
let allTab = (
<a href={`/search/${type}?q=${term}/`}>
<a href={targetUrl}>
<li>
<img
className={`tab-icon ${type}`}
@ -151,7 +167,7 @@ class Search extends React.Component {
);
if (this.state.tab === type) {
allTab = (
<a href={`/search/${type}?q=${term}/`}>
<a href={targetUrl}>
<li className="active">
<img
className={`tab-icon ${type}`}