Ryan/appeals 15566 merge conflict

client/app/2.0/utils/reader/format.js

@@ -24,6 +24,7 @@ export const formatFilterCriteria = (filterCriteria) => {
     category: Object.keys(filterCriteria.category).filter((cat) => filterCriteria.category[cat] === true).
       map((key) => formatCategoryName(key)),
     tag: Object.keys(filterCriteria.tag).filter((tag) => filterCriteria.tag[tag] === true),
+    docType: Object.keys(filterCriteria.docType),
     searchQuery: filterCriteria.searchQuery.toLowerCase()
   };
 

client/app/reader/DocumentList/DocumentListActions.js

@@ -143,6 +143,23 @@ export const clearTagFilters = () => (dispatch) => {
   dispatch(updateFilteredIdsAndDocs());
 };
 
+export const setRecieptDateFilter = (recieptFilterType, recieptDatesHash) => (dispatch) => {
+  dispatch({
+    type: Constants.SET_RECIEPT_DATE_FILTER,
+    payload: {
+      recieptFilterType,
+      recieptDatesHash
+    },
+    meta: {
+      analytics: {
+        category: CATEGORIES.CLAIMS_FOLDER_PAGE,
+        action: 'set RecieptFilterType-' + recieptFilterType,
+        label: 'setRecieptFilter'
+      }
+    }
+  });
+  dispatch(updateFilteredIdsAndDocs());
+}
 // Scrolling
 
 export const setDocListScrollPosition = (scrollTop) => ({

client/app/reader/DocumentList/DocumentListReducer.js

@@ -45,15 +45,22 @@ const initialState = {
     category: {},
     tag: {},
     document: {},
-    searchQuery: ''
+    searchQuery: '',
+    recieptFilterType: '',
+    recieptFilterDates: {
+      fromDate: '',
+      toDate: '',
+      onDate: ''
+    },
   },
   pdfList: {
     scrollTop: null,
     lastReadDocId: null,
     dropdowns: {
       tag: false,
       category: false,
-      document: false
+      document: false,
+      receiptDate: false
     }
   },
   manifestVbmsFetchedAt: null,
@@ -134,6 +141,19 @@ const documentListReducer = (state = initialState, action = {}) => {
         }
       }
     });
+
+    // Reciept date filter
+  case Constants.SET_RECIEPT_DATE_FILTER:
+    return update(state, {
+      docFilterCriteria: {
+        recieptFilterType: {
+          $set: action.payload.recieptFilterType
+        },
+        recieptFilterDates: {
+          $set: action.payload.recieptDatesHash
+        }
+      },
+    });
     // Scrolling
   case Constants.SET_DOC_LIST_SCROLL_POSITION:
     return update(state, {

client/app/reader/DocumentList/actionTypes.js

@@ -17,6 +17,7 @@ export const CLEAR_CATEGORY_FILTER = 'CLEAR_CATEGORY_FILTER';
 export const SET_CATEGORY_FILTER = 'SET_CATEGORY_FILTER';
 export const UPDATE_FILTERED_RESULTS = 'UPDATE_FILTERED_RESULTS';
 export const TOGGLE_FILTER_DROPDOWN = 'TOGGLE_FILTER_DROPDOWN';
+export const SET_RECIEPT_DATE_FILTER = 'SET_RECIEPT_DATE_FILTER';
 
 // Document filter
 export const SET_DOC_FILTER = 'SET_DOC_FILTER';