From 864e0a4d0aedf1187a921cc869e8397a139adb42 Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Wed, 15 May 2019 17:06:06 +0100
Subject: [PATCH] sort notes by timestamp
---
.../src/app/src/containers/NoteListing.js | 14 ++++++++------
.../src/app/src/redux/selectors/notes.js | 5 +++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/opentech/static_src/src/app/src/containers/NoteListing.js b/opentech/static_src/src/app/src/containers/NoteListing.js
index bab1ad31c..9a6654f07 100644
--- a/opentech/static_src/src/app/src/containers/NoteListing.js
+++ b/opentech/static_src/src/app/src/containers/NoteListing.js
@@ -10,13 +10,13 @@ import Note from '@containers/Note';
import {
getNotesErrorState,
getNotesErrorMessage,
- getNoteIDsForSubmissionOfID,
+ getNotesForSubmission,
getNotesFetchState,
getNoteEditingStateForSubmission
} from '@selectors/notes';
-const NoteListing = ({ loadNotes, submissionID, noteIDs, isErrored, errorMessage, isLoading, editing }) => {
+const NoteListing = ({ loadNotes, submissionID, notes, isErrored, errorMessage, isLoading, editing }) => {
const fetchNotes = () => loadNotes(submissionID)
const {start, stop } = useInterval(fetchNotes, 30000)
@@ -37,7 +37,9 @@ const NoteListing = ({ loadNotes, submissionID, noteIDs, isErrored, errorMessage
}
}
- const renderItem = noteID => <Note key={`note-${noteID}`} noteID={noteID} submissionID={submissionID} disabled={!!editing} />;
+ const orderedNotes = notes.sort((a,b) => a.timestamp - b.timestamp);
+
+ const renderItem = note => <Note key={`note-${note.id}`} noteID={note.id} submissionID={submissionID} disabled={!!editing} />;
return (
<Listing
@@ -46,7 +48,7 @@ const NoteListing = ({ loadNotes, submissionID, noteIDs, isErrored, errorMessage
errorMessage={ errorMessage }
handleRetry={ handleRetry }
renderItem={ renderItem }
- items={ noteIDs }
+ items={ orderedNotes }
column="notes"
/>
);
@@ -55,7 +57,7 @@ const NoteListing = ({ loadNotes, submissionID, noteIDs, isErrored, errorMessage
NoteListing.propTypes = {
loadNotes: PropTypes.func,
submissionID: PropTypes.number,
- noteIDs: PropTypes.array,
+ notes: PropTypes.array,
isErrored: PropTypes.bool,
errorMessage: PropTypes.string,
isLoading: PropTypes.bool,
@@ -68,7 +70,7 @@ const mapDispatchToProps = dispatch => ({
});
const mapStateToProps = (state, ownProps) => ({
- noteIDs: getNoteIDsForSubmissionOfID(ownProps.submissionID)(state),
+ notes: getNotesForSubmission(ownProps.submissionID)(state),
isLoading: getNotesFetchState(state),
isErrored: getNotesErrorState(state),
errorMessage: getNotesErrorMessage(state),
diff --git a/opentech/static_src/src/app/src/redux/selectors/notes.js b/opentech/static_src/src/app/src/redux/selectors/notes.js
index d7102bb14..ed06944e5 100644
--- a/opentech/static_src/src/app/src/redux/selectors/notes.js
+++ b/opentech/static_src/src/app/src/redux/selectors/notes.js
@@ -24,6 +24,11 @@ export const getLatestNoteForSubmissionOfID = submissionID => createSelector(
notes => notes[0] || null
);
+export const getNotesForSubmission = submissionID => createSelector(
+ [getNoteIDsForSubmissionOfID(submissionID), getNotes],
+ (noteIDs, notes) => noteIDs.map(noteID => notes[noteID])
+);
+
const getNoteCreatingErrors = state => state.notes.createError;
export const getNoteCreatingErrorForSubmission = submissionID => createSelector(
--
GitLab