Merge 91434cf into 7878147

superdesk · Nov 5, 2018 · ccfa712 · ccfa712
2 parents 7878147 + 91434cf
commit ccfa712
Show file tree

Hide file tree

Showing 7 changed files with 234 additions and 10 deletions.
diff --git a/client/actions/events/api.js b/client/actions/events/api.js
@@ -204,6 +204,15 @@ const getCriteria = (
                 must.push({terms: {'subject.qcode': codes}});
             },
         },
+        {
+            condition: () => (Array.isArray(advancedSearch.place) &&
+            advancedSearch.place.length > 0),
+            do: () => {
+                const codes = advancedSearch.place.map((p) => p.qcode);
+
+                must.push({terms: {'place.qcode': codes}});
+            },
+        },
         {
             condition: () => (get(advancedSearch, 'dates')),
             do: () => {

diff --git a/client/actions/eventsPlanning/api.js b/client/actions/eventsPlanning/api.js
@@ -26,6 +26,8 @@ const query = (
                 JSON.stringify(get(advancedSearch, 'anpa_category', []).map((c) => c.qcode)) : null,
             subject: get(advancedSearch, 'subject.length', 0) ?
                 JSON.stringify(get(advancedSearch, 'subject', []).map((s) => s.qcode)) : null,
+            place: get(advancedSearch, 'place.length', 0) > 0 ?
+                JSON.stringify(get(advancedSearch, 'place', []).map((p) => p.qcode)) : null,
             slugline: advancedSearch.slugline,
             state: get(advancedSearch, 'state.length', 0) ?
                 JSON.stringify(get(advancedSearch, 'state', []).map((c) => c.qcode)) : null,

diff --git a/client/actions/planning/api.js b/client/actions/planning/api.js
@@ -300,6 +300,15 @@ const getCriteria = ({
                 must.push({term: {featured: true}});
             },
         },
+        {
+            condition: () => (Array.isArray(advancedSearch.place) &&
+            advancedSearch.place.length > 0),
+            do: () => {
+                const codes = advancedSearch.place.map((p) => p.qcode);
+
+                must.push({terms: {'place.qcode': codes}});
+            },
+        },
     ].forEach((action) => {
         if (action.condition()) {
             action.do();

diff --git a/client/components/AdvancedSearch/index.jsx b/client/components/AdvancedSearch/index.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {get} from 'lodash';
+import {get, sortBy} from 'lodash';
 import {gettext} from '../../utils';
 import {ContentBlock} from '../UI/SidePanel';
 import {MAIN, SPIKED_STATE} from '../../constants';
@@ -104,6 +104,8 @@ export class AdvancedSearch extends React.Component {
             onChange,
             workflowStateOptions,
             popupContainer,
+            searchProfile,
+            locators,
         } = this.props;
 
         // Change spikeState options based on workflow-state selection in the from
@@ -135,6 +137,7 @@ export class AdvancedSearch extends React.Component {
                         value: get(diff, 'advancedSearch.name', ''),
                     },
                     component: TextInput,
+                    ...get(searchProfile, 'name'),
                 },
                 slugline: {
                     props: {
@@ -143,6 +146,7 @@ export class AdvancedSearch extends React.Component {
                         value: get(diff, 'advancedSearch.slugline', ''),
                     },
                     component: TextInput,
+                    ...get(searchProfile, 'slugline'),
                 },
                 location: {
                     props: {
@@ -152,6 +156,7 @@ export class AdvancedSearch extends React.Component {
                         disableSearch: true,
                     },
                     component: GeoLookupInput,
+                    ...get(searchProfile, 'location'),
                 },
                 state: {
                     props: {
@@ -162,6 +167,7 @@ export class AdvancedSearch extends React.Component {
                         popupContainer: popupContainer,
                     },
                     component: SelectMetaTermsInput,
+                    ...get(searchProfile, 'state'),
                 },
                 anpa_category: {
                     props: {
@@ -172,6 +178,7 @@ export class AdvancedSearch extends React.Component {
                         popupContainer: popupContainer,
                     },
                     component: SelectMetaTermsInput,
+                    ...get(searchProfile, 'anpa_category'),
                 },
                 subject: {
                     props: {
@@ -182,6 +189,7 @@ export class AdvancedSearch extends React.Component {
                         popupContainer: popupContainer,
                     },
                     component: SelectMetaTermsInput,
+                    ...get(searchProfile, 'subject'),
                 },
                 source: {
                     props: {
@@ -192,6 +200,7 @@ export class AdvancedSearch extends React.Component {
                         valueKey: 'id',
                     },
                     component: SelectMetaTermsInput,
+                    ...get(searchProfile, 'source'),
                 },
                 urgency: {
                     props: {
@@ -202,6 +211,7 @@ export class AdvancedSearch extends React.Component {
                         iconName: 'urgency-label',
                     },
                     component: ColouredValueInput,
+                    ...get(searchProfile, 'urgency'),
                 },
                 noCoverage: {
                     props: {
@@ -211,6 +221,7 @@ export class AdvancedSearch extends React.Component {
                         labelLeft: true,
                     },
                     component: ToggleInput,
+                    ...get(searchProfile, 'no_coverage'),
                 },
                 featured: {
                     props: {
@@ -220,6 +231,7 @@ export class AdvancedSearch extends React.Component {
                         labelLeft: true,
                     },
                     component: ToggleInput,
+                    ...get(searchProfile, 'featured'),
                 },
                 contentType: {
                     props: {
@@ -231,6 +243,7 @@ export class AdvancedSearch extends React.Component {
                         clearable: true,
                     },
                     component: SelectInput,
+                    ...get(searchProfile, 'content_type'),
                 },
                 pubstatus: {
                     props: {
@@ -240,6 +253,7 @@ export class AdvancedSearch extends React.Component {
                         labelLeft: true,
                     },
                     component: ToggleInput,
+                    ...get(searchProfile, 'pub_status'),
                 },
                 startDateTime: {
                     props: {
@@ -252,6 +266,7 @@ export class AdvancedSearch extends React.Component {
                     },
                     component: DateTimeInput,
                     onChange: this.onDateChange,
+                    ...get(searchProfile, 'start_date_time'),
                 },
                 endDateTime: {
                     props: {
@@ -265,6 +280,7 @@ export class AdvancedSearch extends React.Component {
                     },
                     component: DateTimeInput,
                     onChange: this.onDateChange,
+                    ...get(searchProfile, 'end_date_time'),
                 },
                 spikeState: {
                     props: {
@@ -275,6 +291,7 @@ export class AdvancedSearch extends React.Component {
                         options: spikedStateOptions,
                     },
                     component: RadioButtonInput,
+                    ...get(searchProfile, 'spike_state'),
                 },
                 dateFilters: {
                     props: {
@@ -303,6 +320,19 @@ export class AdvancedSearch extends React.Component {
                     },
                     component: RadioButtonInput,
                     onChange: this.onDateChange,
+                    ...get(searchProfile, 'date_filter'),
+                },
+                place: {
+                    props: {
+                        field: 'advancedSearch.place',
+                        label: gettext('Place'),
+                        value: get(diff, 'advancedSearch.place', []),
+                        options: locators,
+                        popupContainer: popupContainer,
+                        groupField: 'group',
+                    },
+                    component: SelectMetaTermsInput,
+                    ...get(searchProfile, 'place'),
                 },
             };
 
@@ -312,27 +342,29 @@ export class AdvancedSearch extends React.Component {
                 [MAIN.FILTERS.COMBINED]: [
                     fields.slugline, fields.anpa_category, fields.subject, fields.state,
                     fields.pubstatus, fields.spikeState,
-                    fields.startDateTime, fields.endDateTime,
-                    fields.dateFilters,
+                    fields.startDateTime, fields.endDateTime, fields.dateFilters,
                 ],
                 [MAIN.FILTERS.EVENTS]: [
-                    fields.name, fields.slugline,
-                    fields.anpa_category, fields.subject, fields.source, fields.location, fields.state,
-                    fields.pubstatus, fields.spikeState,
-                    fields.startDateTime, fields.endDateTime,
+                    fields.name, fields.slugline, fields.anpa_category, fields.subject,
+                    fields.source, fields.location, fields.state, fields.pubstatus,
+                    fields.spikeState, fields.startDateTime, fields.endDateTime,
                     fields.dateFilters,
                 ],
                 [MAIN.FILTERS.PLANNING]: [
                     fields.slugline, fields.contentType, fields.noCoverage, fields.featured,
                     fields.anpa_category, fields.subject, fields.urgency, fields.state,
                     fields.pubstatus, fields.spikeState,
-                    fields.startDateTime, fields.endDateTime, fields.dateFilters,
+                    fields.startDateTime, fields.endDateTime, fields.dateFilters, fields.place,
                 ],
             };
 
             if (activeFilter in searchForm) {
-                return searchForm[activeFilter]
+                return sortBy(searchForm[activeFilter], 'index')
                     .map((field, index) => {
+                        if (!get(field, 'enabled')) {
+                            return null;
+                        }
+
                         const props = {
                             ...field.props,
                             onChange: field.onChange || onChange,
@@ -365,6 +397,7 @@ AdvancedSearch.propTypes = {
     diff: PropTypes.object.isRequired,
     categories: PropTypes.array,
     subjects: PropTypes.array,
+    locators: PropTypes.array,
     urgencies: PropTypes.array,
     contentTypes: PropTypes.array,
     ingestProviders: PropTypes.array,

diff --git a/client/components/Main/SearchPanel.jsx b/client/components/Main/SearchPanel.jsx
@@ -67,6 +67,8 @@ export class SearchPanelComponent extends React.Component {
             isViewFiltered,
             workflowStateOptions,
             popupContainer,
+            searchProfile,
+            locators,
         } = this.props;
 
         const {
@@ -94,6 +96,8 @@ export class SearchPanelComponent extends React.Component {
             onChange: this.onChangeHandler,
             workflowStateOptions: workflowStateOptions || getWorkFlowStateAsOptions(activeFilter),
             popupContainer: popupContainer,
+            searchProfile: searchProfile,
+            locators: locators,
         };
 
         return (
@@ -155,6 +159,8 @@ const mapStateToProps = (state) => ({
     dateFormat: selectors.config.getDateFormat(state),
     timeFormat: selectors.config.getTimeFormat(state),
     isViewFiltered: selectors.main.isViewFiltered(state),
+    searchProfile: selectors.forms.searchProfile(state),
+    locators: selectors.vocabs.locators(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({

diff --git a/client/selectors/forms.js b/client/selectors/forms.js
@@ -1,6 +1,6 @@
 import {createSelector} from 'reselect';
 import {get, filter} from 'lodash';
-import {ITEM_TYPE} from '../constants';
+import {ITEM_TYPE, MAIN} from '../constants';
 import {sessionId as getSessionId} from './general';
 import {isExistingItem} from '../utils';
 
@@ -20,10 +20,28 @@ const getcurrentItem = (itemId, itemType, events, plannings, isLoading, values,
 };
 
 /** Profiles **/
+export const activeFilter = (state) => get(state, 'main.filter', MAIN.FILTERS.COMBINED);
 export const profiles = (state) => get(state, 'forms.profiles', {});
 export const coverageProfile = createSelector([profiles], (p) => get(p, 'coverage', {}));
 export const eventProfile = createSelector([profiles], (p) => get(p, 'event', {}));
 export const planningProfile = createSelector([profiles], (p) => get(p, 'planning', {}));
+export const searchProfile = createSelector(
+    [profiles, activeFilter],
+    (p, filter) => {
+        if (filter === MAIN.FILTERS.EVENTS) {
+            return get(p, 'advanced_search.editor.event', {});
+        }
+
+        if (filter === MAIN.FILTERS.PLANNING) {
+            return get(p, 'advanced_search.editor.planning', {});
+        }
+
+        if (filter === MAIN.FILTERS.COMBINED) {
+            return get(p, 'advanced_search.editor.combined', {});
+        }
+
+        return null;
+    });
 
 export const listFields = createSelector([profiles], (p) => {
     const fields = {};