Sprint#23/search history

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.8.1] - 2018-XX-XX
+### Added
+- [Search] History
+
 ## [0.8.0] - 2018-06-29
 ### Added
 - Push Notifications

src/graphql/mutations/local/searchHistoryAdd.js

@@ -0,0 +1,7 @@
+import gql from "graphql-tag";
+
+export default gql`
+  mutation searchHistoryAdd($term: String!) {
+    searchHistoryAdd(term: $term) @client
+  }
+`;

src/graphql/queries/local/searchHistory.js

@@ -0,0 +1,9 @@
+import gql from "graphql-tag";
+
+export default gql`
+  query {
+    searchHistory @client {
+      term
+    }
+  }
+`;

src/graphql/resolvers/index.js

@@ -1,6 +1,7 @@
 import VOTES_LOCAL from "../queries/votesLocal";
 import IS_INSTRUCTIONS_SHOWN from "../queries/isInstructionShown";
 import GET_NETWORK_STATUS from "../queries/getNetworkStatus";
+import SEARCH_HISTORY from "../queries/local/searchHistory";
 
 import ViewedProcedures from "../../services/ViewedProcedures";
 
@@ -16,7 +17,8 @@ export const defaults = {
   searchTerm: {
     __typename: "SearchTerm",
     term: ""
-  }
+  },
+  searchHistory: []
 };
 
 export const resolvers = {
@@ -88,6 +90,39 @@ export const resolvers = {
           term
         }
       };
+      cache.writeData({ data });
+      return null;
+    },
+    searchHistoryAdd: (_, { term }, { cache }) => {
+      let previous = cache.readQuery({ query: SEARCH_HISTORY });
+
+      if (!previous) {
+        previous = { searchHistory: [] };
+      }
+
+      const index = previous.searchHistory.findIndex(
+        ({ term: t }) => t === term
+      );
+
+      let data;
+
+      if (index === -1) {
+        data = {
+          searchHistory: [
+            { term, __typename: "SearchHistoryTerm" },
+            ...previous.searchHistory
+          ].slice(0, 3)
+        };
+      } else {
+        previous.searchHistory.splice(index, 1);
+        data = {
+          searchHistory: [
+            { term, __typename: "SearchHistoryTerm" },
+            ...previous.searchHistory
+          ].slice(0, 3)
+        };
+      }
+
       cache.writeData({ data });
       return null;
     }

src/graphql/schemas/index.js

@@ -17,9 +17,14 @@ export default `
         status: String!
     }
 
+    type SearchTerm {
+        term: String!
+    }
+
     type Mutation {
         voteLocal(procedure: ID!, selection: VoteSelection!): VoteSelection
         viewProcedure(procedureId: String!, status: String!): ListStatus
+        searchHistoryAdd(term: String!): [SearchTerm]
     }
 
     type Query {

src/screens/Search/Header.android.js

@@ -8,6 +8,7 @@ import { graphql, compose } from "react-apollo";
 import client from "../../graphql/client";
 
 import finishSearch from "../../graphql/mutations/finishSearch";
+import SEARCH_HISTORY_ADD from "../../graphql/mutations/local/searchHistoryAdd";
 import searchTerm from "../../graphql/queries/local/searchTerm";
 import changeSearchTerm from "../../graphql/mutations/local/changeSearchTerm";
 
@@ -85,6 +86,12 @@ class Header extends Component {
         term: this.state.term
       }
     });
+    client.mutate({
+      mutation: SEARCH_HISTORY_ADD,
+      variables: {
+        term: this.state.term
+      }
+    });
   };
 
   render() {

src/screens/Search/Header.ios.js

@@ -8,6 +8,7 @@ import { graphql, compose } from "react-apollo";
 import client from "../../graphql/client";
 
 import finishSearch from "../../graphql/mutations/finishSearch";
+import SEARCH_HISTORY_ADD from "../../graphql/mutations/local/searchHistoryAdd";
 import searchTerm from "../../graphql/queries/local/searchTerm";
 import changeSearchTerm from "../../graphql/mutations/local/changeSearchTerm";
 
@@ -88,6 +89,12 @@ class Header extends Component {
         term: this.state.term
       }
     });
+    client.mutate({
+      mutation: SEARCH_HISTORY_ADD,
+      variables: {
+        term: this.state.term
+      }
+    });
   };
 
   render() {

src/screens/Search/index.js

@@ -14,9 +14,11 @@ import client from "../../graphql/client";
 
 import searchProcedures from "../../graphql/queries/searchProcedures";
 import mostSearched from "../../graphql/queries/mostSearched";
-import finishSearch from "../../graphql/mutations/finishSearch";
 import searchTerm from "../../graphql/queries/local/searchTerm";
+import SEARCH_HISTORY from "../../graphql/queries/local/searchHistory";
+import finishSearch from "../../graphql/mutations/finishSearch";
 import changeSearchTerm from "../../graphql/mutations/local/changeSearchTerm";
+import SEARCH_HISTORY_ADD from "../../graphql/mutations/local/searchHistoryAdd";
 
 import preventNavStackDuplicate from "../../hocs/preventNavStackDuplicate";
 
@@ -143,6 +145,11 @@ class SearchScreen extends Component {
           term: item
         }
       });
+      this.props.addToSearchHistory({
+        variables: {
+          term: item
+        }
+      });
       this.onChangeTerm(item);
     }
   };
@@ -166,7 +173,7 @@ class SearchScreen extends Component {
 
   render() {
     const { loading } = this.state;
-    const { mostSearchedTerms, searchTerm: term } = this.props;
+    const { mostSearchedTerms, searchTerm: term, searchHistory } = this.props;
 
     if (loading) {
       return (
@@ -179,6 +186,10 @@ class SearchScreen extends Component {
     let sectionData = [];
     if (!term) {
       sectionData = [
+        {
+          title: "Zuletzt gesucht",
+          data: searchHistory
+        },
         {
           title: "Meistgesucht",
           data: mostSearchedTerms
@@ -206,6 +217,7 @@ class SearchScreen extends Component {
                 {title === "Ergebnisse" && (
                   <VoteListItem {...item} date={item.voteDate} />
                 )}
+                {title === "Zuletzt gesucht" && <ListText>{item}</ListText>}
                 {title === "Vorschläge" && <ListText>{item}</ListText>}
                 {title === "Meistgesucht" && <ListText>{item}</ListText>}
               </ListRow>
@@ -236,12 +248,15 @@ SearchScreen.propTypes = {
   finishSearch: PropTypes.func.isRequired,
   updateSearchTerm: PropTypes.func.isRequired,
   mostSearchedTerms: PropTypes.arrayOf(PropTypes.shape()),
-  searchTerm: PropTypes.string.isRequired
+  searchTerm: PropTypes.string.isRequired,
+  addToSearchHistory: PropTypes.func.isRequired,
+  searchHistory: PropTypes.arrayOf(PropTypes.string )
 };
 
 SearchScreen.defaultProps = {
   navigator: undefined,
-  mostSearchedTerms: []
+  mostSearchedTerms: [],
+  searchHistory: []
 };
 
 export default withApollo(
@@ -269,10 +284,18 @@ export default withApollo(
             ? { searchTerm: searchTermData.term }
             : { searchTerm: "" }
       }),
+      graphql(SEARCH_HISTORY, {
+        props: ({ data: { searchHistory } }) => ({
+          searchHistory: searchHistory
+            ? searchHistory.map(({ term }) => term)
+            : []
+        })
+      }),
 
       // Mutations
       graphql(finishSearch, { name: "finishSearch" }),
-      graphql(changeSearchTerm, { name: "updateSearchTerm" })
+      graphql(changeSearchTerm, { name: "updateSearchTerm" }),
+      graphql(SEARCH_HISTORY_ADD, { name: "addToSearchHistory" })
     )(SearchScreen)
   )
 );