{(searchDone || isFetchingSearchResults) && (
{
expect(resourceMap.prop('selectedUnitId')).toBe(props.selectedUnitId);
});
+ test('renders an Row element', () => {
+ expect(getWrapper().find(Row)).toHaveLength(1);
+ });
+
+ test('renders a Sort component with correct props', () => {
+ const sort = getWrapper().find(Sort);
+ expect(sort).toHaveLength(1);
+ expect(typeof sort.prop('onChange')).toBe('function');
+ });
+
describe('SearchResults', () => {
function getSearchResults(props) {
return getWrapper(props).find(SearchResults);
@@ -214,6 +226,23 @@ describe('pages/search/SearchPage', () => {
});
});
+ describe('sortResource', () => {
+ const pushMock = simple.mock();
+ beforeAll(() => {
+ const instance = getWrapper(
+ {
+ history: { push: pushMock }
+ }
+ ).instance();
+ instance.sortResource('name');
+ });
+
+ test('changes history with correct queryString', () => {
+ expect(pushMock.callCount).toBe(1);
+ expect(pushMock.lastCall.args[0]).toContain('name');
+ });
+ });
+
describe('if search filters did change and url has query part', () => {
let nextProps;
diff --git a/app/pages/search/Sort.js b/app/pages/search/Sort.js
new file mode 100644
index 000000000..3c06a5cc1
--- /dev/null
+++ b/app/pages/search/Sort.js
@@ -0,0 +1,50 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import { injectT } from 'i18n';
+import CONSTANTS from '../../constants/AppConstants';
+import SelectControl from './controls/SelectControl';
+
+export class UnconnectedSort extends Component {
+ getSortOptions = () => {
+ const { lang, t } = this.props;
+
+ return [
+ { label: t('SortBy.name.label'), value: CONSTANTS.SORT_BY_OPTIONS.NAME.replace('lang', lang) },
+ { label: t('SortBy.type.label'), value: CONSTANTS.SORT_BY_OPTIONS.TYPE.replace('lang', lang) },
+ { label: t('SortBy.premise.label'), value: CONSTANTS.SORT_BY_OPTIONS.PREMISES.replace('lang', lang) },
+ { label: t('SortBy.people.label'), value: CONSTANTS.SORT_BY_OPTIONS.PEOPLE },
+ ];
+ }
+
+ render() {
+ return (
+ this.props.onChange(value)}
+ options={this.getSortOptions()}
+ value={this.props.sortValue}
+ />
+ );
+ }
+}
+
+const mapStateToProps = state => ({
+ lang: state.intl.locale
+});
+
+export default connect(
+ mapStateToProps,
+ {}
+)(injectT(UnconnectedSort));
+
+
+UnconnectedSort.propTypes = {
+ lang: PropTypes.string.isRequired,
+ t: PropTypes.func.isRequired,
+ onChange: PropTypes.func.isRequired,
+ sortValue: PropTypes.string,
+};
diff --git a/app/pages/search/Sort.spec.js b/app/pages/search/Sort.spec.js
new file mode 100644
index 000000000..45b33bad6
--- /dev/null
+++ b/app/pages/search/Sort.spec.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import SelectControl from './controls/SelectControl';
+import { UnconnectedSort as Sort } from './Sort';
+
+describe('pages/search/Sort', () => {
+ const defaultProps = {
+ sortValue: '',
+ t: value => value,
+ lang: 'en',
+ onChange: () => {},
+ };
+
+ function getWrapper(props) {
+ return shallow(
+
{resource.description}
- 
-
- {resource.type ? resource.type.name : '\u00A0'}
-
-
-
- 
-
- {t('ResourceCard.peopleCapacity', { people: resource.peopleCapacity })}
-
-
-
- 
-
- {resource.distance ? this.renderDistance(resource.distance) : '\u00A0'}
-
-
-
+
+
+
+
+
+ {resource.distance ? this.renderDistance(resource.distance) : '\u00A0'}
+
+
+
+ {isLoggedIn
+ && (
+ actions.unfavoriteResource(resource.id)
+ : () => actions.favoriteResource(resource.id)
+ }
+ />
+ )
+ }
);
@@ -188,6 +190,22 @@ ResourceCard.propTypes = {
stacked: PropTypes.bool,
t: PropTypes.func.isRequired,
unit: PropTypes.object.isRequired,
+ actions: PropTypes.object,
+ isLoggedIn: PropTypes.bool,
};
-export default injectT(ResourceCard);
+const UnconnectedResourceCard = injectT(ResourceCard);
+
+
+function mapDispatchToProps(dispatch) {
+ const actionCreators = {
+ favoriteResource,
+ unfavoriteResource,
+ };
+
+ return { actions: bindActionCreators(actionCreators, dispatch) };
+}
+
+export { UnconnectedResourceCard };
+
+export default connect(resourceCardSelector, mapDispatchToProps)(UnconnectedResourceCard);
diff --git a/app/shared/resource-card/ResourceCard.spec.js b/app/shared/resource-card/ResourceCard.spec.js
index 5f09bc6c0..9d6f3d193 100644
--- a/app/shared/resource-card/ResourceCard.spec.js
+++ b/app/shared/resource-card/ResourceCard.spec.js
@@ -2,6 +2,7 @@ import React from 'react';
import { Link } from 'react-router-dom';
import Immutable from 'seamless-immutable';
import simple from 'simple-mock';
+import iconHeart from 'hel-icons/dist/shapes/heart-o.svg';
import BackgroundImage from 'shared/background-image';
import Image from 'utils/fixtures/Image';
@@ -9,9 +10,11 @@ import Resource from 'utils/fixtures/Resource';
import Unit from 'utils/fixtures/Unit';
import { getResourcePageUrlComponents } from 'utils/resourceUtils';
import { shallowWithIntl } from 'utils/testUtils';
-import ResourceAvailability from './ResourceAvailability';
-import ResourceCard from './ResourceCard';
+import ResourceAvailability from './label/ResourceAvailability';
+import { UnconnectedResourceCard } from './ResourceCard';
import UnpublishedLabel from 'shared/label/Unpublished';
+import ResourceCardInfoCell from './info';
+import iconHeartWhite from 'assets/icons/heart-white.svg';
describe('shared/resource-card/ResourceCard', () => {
function getResource(extra) {
@@ -44,6 +47,10 @@ describe('shared/resource-card/ResourceCard', () => {
};
const defaultProps = {
+ actions: {
+ favoriteResource: jest.fn(),
+ unfavoriteResource: jest.fn(),
+ },
history,
date: '2015-10-10',
isLoggedIn: false,
@@ -67,7 +74,7 @@ describe('shared/resource-card/ResourceCard', () => {
};
function getWrapper(extraProps) {
- return shallowWithIntl(
- 
-
- {getHourlyPrice(t, resource) || '\u00A0'}
-
-
-
-
- 
-
+
+
+ {resource.type ? resource.type.name : '\u00A0'}
+
+
+
+
+
+ {t('ResourceCard.peopleCapacity', { people: resource.peopleCapacity })}
+
+
+
+
+
+ {getHourlyPrice(t, resource) || '\u00A0'}
+
+
+
+
+
+
{unit.streetAddress}
-
+
{unit.addressZip}
{' '}
{unit.municipality}
-
-
-