diff --git a/src/reducers/DispensaryReducer.js b/src/reducers/DispensaryReducer.js index 63798e178..e06d76397 100644 --- a/src/reducers/DispensaryReducer.js +++ b/src/reducers/DispensaryReducer.js @@ -58,23 +58,31 @@ export const DispensaryReducer = (state = initialState(), action) => { const { usingAdverseDrugReactions } = payload; const { dataSet } = state; + // Default to patient + let sortBy = 'createdDate'; + let isAscending = false; + const patientDataSet = usingAdverseDrugReactions ? 'patientWithAdverseDrugReactions' : 'patient'; const prescriberDataSet = 'prescriber'; const newDataSet = dataSet === patientDataSet ? prescriberDataSet : patientDataSet; - const newColumns = getColumns(newDataSet); + if (newDataSet === 'prescriber') { + sortBy = 'firstName'; + isAscending = true; + } + const newData = UIDatabase.objects(newDataSet === patientDataSet ? 'Patient' : 'Prescriber'); return { ...state, dataSet: newDataSet, columns: newColumns, - sortKey: 'createdDate', - isAscending: false, + sortKey: sortBy, + isAscending, searchTerm: '', data: newData, };