|
|
@ -6,12 +6,13 @@ import AccountContainer from '../../../containers/account_container';
|
|
|
|
import StatusContainer from '../../../containers/status_container';
|
|
|
|
import StatusContainer from '../../../containers/status_container';
|
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
import Hashtag from '../../../components/hashtag';
|
|
|
|
import Hashtag from '../../../components/hashtag';
|
|
|
|
import LoadingIndicator from 'soapbox/components/loading_indicator';
|
|
|
|
|
|
|
|
import FilterBar from '../../search/components/filter_bar';
|
|
|
|
import FilterBar from '../../search/components/filter_bar';
|
|
|
|
import LoadMore from '../../../components/load_more';
|
|
|
|
|
|
|
|
import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
|
|
|
|
import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
|
|
|
|
import { WhoToFollowPanel } from 'soapbox/features/ui/util/async-components';
|
|
|
|
import { WhoToFollowPanel } from 'soapbox/features/ui/util/async-components';
|
|
|
|
import classNames from 'classnames';
|
|
|
|
import ScrollableList from 'soapbox/components/scrollable_list';
|
|
|
|
|
|
|
|
import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder_account';
|
|
|
|
|
|
|
|
import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder_hashtag';
|
|
|
|
|
|
|
|
import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status';
|
|
|
|
|
|
|
|
|
|
|
|
export default class SearchResults extends ImmutablePureComponent {
|
|
|
|
export default class SearchResults extends ImmutablePureComponent {
|
|
|
|
|
|
|
|
|
|
|
@ -32,13 +33,7 @@ export default class SearchResults extends ImmutablePureComponent {
|
|
|
|
render() {
|
|
|
|
render() {
|
|
|
|
const { value, results, submitted, selectedFilter, features } = this.props;
|
|
|
|
const { value, results, submitted, selectedFilter, features } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
if (submitted && results.isEmpty()) {
|
|
|
|
if (!submitted && features.suggestions && results.isEmpty()) {
|
|
|
|
return (
|
|
|
|
|
|
|
|
<div className='search-results'>
|
|
|
|
|
|
|
|
<LoadingIndicator />
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
} else if (features.suggestions && results.isEmpty()) {
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<BundleContainer fetchComponent={WhoToFollowPanel}>
|
|
|
|
<BundleContainer fetchComponent={WhoToFollowPanel}>
|
|
|
|
{Component => <Component limit={5} />}
|
|
|
|
{Component => <Component limit={5} />}
|
|
|
@ -48,68 +43,87 @@ export default class SearchResults extends ImmutablePureComponent {
|
|
|
|
|
|
|
|
|
|
|
|
let searchResults;
|
|
|
|
let searchResults;
|
|
|
|
let hasMore = false;
|
|
|
|
let hasMore = false;
|
|
|
|
|
|
|
|
let loaded;
|
|
|
|
|
|
|
|
let noResultsMessage;
|
|
|
|
|
|
|
|
let placeholderComponent = PlaceholderStatus;
|
|
|
|
|
|
|
|
|
|
|
|
if (selectedFilter === 'accounts' && results.get('accounts')) {
|
|
|
|
if (selectedFilter === 'accounts' && results.get('accounts')) {
|
|
|
|
hasMore = results.get('accountsHasMore');
|
|
|
|
hasMore = results.get('accountsHasMore');
|
|
|
|
|
|
|
|
loaded = results.get('accountsLoaded');
|
|
|
|
searchResults = results.get('accounts').size > 0 ? (
|
|
|
|
placeholderComponent = PlaceholderAccount;
|
|
|
|
<div className={classNames('search-results__section', { 'has-more': hasMore })}>
|
|
|
|
|
|
|
|
{results.get('accounts').map(accountId => <AccountContainer key={accountId} id={accountId} />)}
|
|
|
|
if (results.get('accounts').size > 0) {
|
|
|
|
</div>
|
|
|
|
searchResults = results.get('accounts').map(accountId => <AccountContainer key={accountId} id={accountId} />);
|
|
|
|
) : (
|
|
|
|
} else {
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
noResultsMessage = (
|
|
|
|
<FormattedMessage
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
id='empty_column.search.accounts'
|
|
|
|
<FormattedMessage
|
|
|
|
defaultMessage='There are no people results for "{term}"'
|
|
|
|
id='empty_column.search.accounts'
|
|
|
|
values={{ term: value }}
|
|
|
|
defaultMessage='There are no people results for "{term}"'
|
|
|
|
/>
|
|
|
|
values={{ term: value }}
|
|
|
|
</div>
|
|
|
|
/>
|
|
|
|
);
|
|
|
|
</div>
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (selectedFilter === 'statuses' && results.get('statuses')) {
|
|
|
|
if (selectedFilter === 'statuses' && results.get('statuses')) {
|
|
|
|
hasMore = results.get('statusesHasMore');
|
|
|
|
hasMore = results.get('statusesHasMore');
|
|
|
|
|
|
|
|
loaded = results.get('statusesLoaded');
|
|
|
|
searchResults = results.get('statuses').size > 0 ? (
|
|
|
|
|
|
|
|
<div className={classNames('search-results__section', { 'has-more': hasMore })}>
|
|
|
|
if (results.get('statuses').size > 0) {
|
|
|
|
{results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}
|
|
|
|
searchResults = results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />);
|
|
|
|
</div>
|
|
|
|
} else {
|
|
|
|
) : (
|
|
|
|
noResultsMessage = (
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
<FormattedMessage
|
|
|
|
<FormattedMessage
|
|
|
|
id='empty_column.search.statuses'
|
|
|
|
id='empty_column.search.statuses'
|
|
|
|
defaultMessage='There are no posts results for "{term}"'
|
|
|
|
defaultMessage='There are no posts results for "{term}"'
|
|
|
|
values={{ term: value }}
|
|
|
|
values={{ term: value }}
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (selectedFilter === 'hashtags' && results.get('hashtags')) {
|
|
|
|
if (selectedFilter === 'hashtags' && results.get('hashtags')) {
|
|
|
|
hasMore = results.get('hashtagsHasMore');
|
|
|
|
hasMore = results.get('hashtagsHasMore');
|
|
|
|
|
|
|
|
loaded = results.get('hashtagsLoaded');
|
|
|
|
searchResults = results.get('hashtags').size > 0 ? (
|
|
|
|
placeholderComponent = PlaceholderHashtag;
|
|
|
|
<div className={classNames('search-results__section', { 'has-more': hasMore })}>
|
|
|
|
|
|
|
|
{results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
|
|
|
|
if (results.get('hashtags').size > 0) {
|
|
|
|
</div>
|
|
|
|
searchResults = results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />);
|
|
|
|
) : (
|
|
|
|
} else {
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
noResultsMessage = (
|
|
|
|
<FormattedMessage
|
|
|
|
<div className='empty-column-indicator'>
|
|
|
|
id='empty_column.search.hashtags'
|
|
|
|
<FormattedMessage
|
|
|
|
defaultMessage='There are no hashtags results for "{term}"'
|
|
|
|
id='empty_column.search.hashtags'
|
|
|
|
values={{ term: value }}
|
|
|
|
defaultMessage='There are no hashtags results for "{term}"'
|
|
|
|
/>
|
|
|
|
values={{ term: value }}
|
|
|
|
</div>
|
|
|
|
/>
|
|
|
|
);
|
|
|
|
</div>
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<>
|
|
|
|
<>
|
|
|
|
{submitted && <FilterBar selectedFilter={submitted ? selectedFilter : null} selectFilter={this.handleSelectFilter} />}
|
|
|
|
{submitted && <FilterBar selectedFilter={submitted ? selectedFilter : null} selectFilter={this.handleSelectFilter} />}
|
|
|
|
|
|
|
|
|
|
|
|
{searchResults}
|
|
|
|
{noResultsMessage || (
|
|
|
|
|
|
|
|
<ScrollableList
|
|
|
|
{hasMore && <LoadMore visible onClick={this.handleLoadMore} />}
|
|
|
|
key={selectedFilter}
|
|
|
|
|
|
|
|
scrollKey={`${selectedFilter}:${value}`}
|
|
|
|
|
|
|
|
isLoading={submitted && !loaded}
|
|
|
|
|
|
|
|
showLoading={submitted && !loaded && results.isEmpty()}
|
|
|
|
|
|
|
|
hasMore={hasMore}
|
|
|
|
|
|
|
|
onLoadMore={this.handleLoadMore}
|
|
|
|
|
|
|
|
placeholderComponent={placeholderComponent}
|
|
|
|
|
|
|
|
placeholderCount={20}
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
{searchResults}
|
|
|
|
|
|
|
|
</ScrollableList>
|
|
|
|
|
|
|
|
)}
|
|
|
|
</>
|
|
|
|
</>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|