✨ enhance search for proposal by title and speaker (#449)

src/firebase/proposals.js

@@ -1,7 +1,5 @@
 import firebase from 'firebase/app'
 import omit from 'lodash/omit'
-import toLower from 'lodash/toLower'
-import deburr from 'lodash/deburr'
 
 /**
  * Return the proposal with the given id
@@ -25,7 +23,7 @@ export const fetchEventProposals = async (
   eventId,
   uid,
   {
-    categories, formats, state, sortOrder, ratings, search,
+    categories, formats, state, sortOrder, ratings,
   } = {},
 ) => {
   let query = firebase
@@ -60,12 +58,6 @@ export const fetchEventProposals = async (
   const result = await query.get()
   let proposals = result.docs.map(ref => ({ id: ref.id, ...ref.data() }))
 
-  // add search by title (client filter)
-  if (search) {
-    const searchQuery = deburr(toLower(search))
-    proposals = proposals.filter(proposal => deburr(toLower(proposal.title)).includes(searchQuery))
-  }
-
   // add ratings filter (client filter)
   if (ratings === 'rated') {
     proposals = proposals.filter(proposal => proposal.usersRatings && !!proposal.usersRatings[uid])

src/screens/organizer/proposals/proposals.reactions.js

@@ -5,6 +5,8 @@ import over from 'lodash/fp/over'
 import pick from 'lodash/fp/pick'
 import update from 'lodash/fp/update'
 import pickBy from 'lodash/fp/pickBy'
+import toLower from 'lodash/toLower'
+import deburr from 'lodash/deburr'
 
 import * as firebase from 'firebase/proposals'
 import userCrud from 'firebase/user'
@@ -48,7 +50,7 @@ export const loadProposals = async (action, store, { router }) => {
 
   const filters = store.ui.organizer.proposals.get()
   const proposals = await firebase.fetchEventProposals(eventId, uid, filters)
-  const props = await Promise.all(proposals.map(async (proposal) => {
+  let props = await Promise.all(proposals.map(async (proposal) => {
     const prop = { ...proposal }
     const speakerList = Object.keys(prop.speakers)
     const speakerNameList = await Promise.all(speakerList.map(async (speakerUid) => {
@@ -63,6 +65,13 @@ export const loadProposals = async (action, store, { router }) => {
     prop.speakerName = speakerNameList.join(' & ')
     return prop
   }))
+  // Cross-fields search better handled in UI than firebase
+  const { search } = filters
+  if (search) {
+    const searchQuery = deburr(toLower(search))
+    props = props.filter(proposal => deburr(toLower(proposal.title)).includes(searchQuery)
+      || deburr(toLower(proposal.speakerName)).includes(searchQuery))
+  }
   store.data.proposals.set(props)
 }
 

src/screens/organizer/proposals/proposalsToolbar/proposalsToolbar.jsx

@@ -59,7 +59,7 @@ class ProposalToolbar extends Component {
           <input
             id="search"
             type="search"
-            placeholder="Search by proposal title"
+            placeholder="Search by title or speaker"
             onChange={this.debounceOnChange}
             defaultValue={filters.search}
           />