Progress

app/javascript/gabsocial/reducers/index.js

@@ -1,42 +1,42 @@
-import { combineReducers } from 'redux-immutable';
-import popover from './popover';
-import timelines from './timelines';
-import meta from './meta';
-import { loadingBarReducer } from 'react-redux-loading-bar';
-import modal from './modal';
-import user_lists from './user_lists';
-import domain_lists from './domain_lists';
-import accounts from './accounts';
-import accounts_counters from './accounts_counters';
-import statuses from './statuses';
-import relationships from './relationships';
-import settings from './settings';
-import push_notifications from './push_notifications';
-import status_lists from './status_lists';
-import mutes from './mutes';
-import reports from './reports';
-import contexts from './contexts';
-import compose from './compose';
-import search from './search';
-import media_attachments from './media_attachments';
-import notifications from './notifications';
-import height_cache from './height_cache';
-import custom_emojis from './custom_emojis';
-import lists from './lists';
-import listEditor from './list_editor';
-import listAdder from './list_adder';
-import filters from './filters';
-import conversations from './conversations';
-import suggestions from './suggestions';
-import polls from './polls';
-import identity_proofs from './identity_proofs';
-import hashtags from './hashtags';
-import groups from './groups';
-import group_relationships from './group_relationships';
-import group_lists from './group_lists';
-import group_editor from './group_editor';
-import sidebar from './sidebar';
-import status_revision_list from './status_revision_list';
+import { combineReducers } from 'redux-immutable'
+import popover from './popover'
+import timelines from './timelines'
+import meta from './meta'
+import { loadingBarReducer } from 'react-redux-loading-bar'
+import modal from './modal'
+import user_lists from './user_lists'
+import domain_lists from './domain_lists'
+import accounts from './accounts'
+import accounts_counters from './accounts_counters'
+import statuses from './statuses'
+import relationships from './relationships'
+import settings from './settings'
+import push_notifications from './push_notifications'
+import status_lists from './status_lists'
+import mutes from './mutes'
+import reports from './reports'
+import contexts from './contexts'
+import compose from './compose'
+import search from './search'
+import media_attachments from './media_attachments'
+import notifications from './notifications'
+import height_cache from './height_cache'
+import custom_emojis from './custom_emojis'
+import lists from './lists'
+import listEditor from './list_editor'
+import listAdder from './list_adder'
+import filters from './filters'
+import conversations from './conversations'
+import suggestions from './suggestions'
+import polls from './polls'
+import identity_proofs from './identity_proofs'
+import hashtags from './hashtags'
+import groups from './groups'
+import group_relationships from './group_relationships'
+import group_lists from './group_lists'
+import group_editor from './group_editor'
+import sidebar from './sidebar'
+import status_revisions from './status_revisions'
 
 const reducers = {
   popover,
@@ -76,7 +76,7 @@ const reducers = {
   group_lists,
   group_editor,
   sidebar,
-  status_revision_list,
-};
+  status_revisions,
+}
 
-export default combineReducers(reducers);
+export default combineReducers(reducers)

app/javascript/gabsocial/reducers/status_revision_list.js

@@ -1,31 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-import {
-    STATUS_REVISION_LIST_LOAD,
-    STATUS_REVISION_LIST_LOAD_SUCCESS,
-    STATUS_REVISION_LIST_LOAD_FAIL
-} from '../actions/status_revision_list';
-
-const initialState = ImmutableMap({
-    loading: false,
-    error: null,
-    data: null
-});
-
-export default function statusRevisionList(state = initialState, action) {
-    switch(action.type) {
-    case STATUS_REVISION_LIST_LOAD:
-        return initialState;
-    case STATUS_REVISION_LIST_LOAD_SUCCESS:
-        return state.withMutations(mutable => {
-            mutable.set('loading', false);
-            mutable.set('data', action.payload);
-        });
-    case STATUS_REVISION_LIST_LOAD_FAIL:
-        return state.withMutations(mutable => {
-            mutable.set('loading', false);
-            mutable.set('error', action.payload);
-        });
-    default:
-        return state;
-    }
-};

app/javascript/gabsocial/reducers/status_revisions.js

@@ -0,0 +1,31 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'
+import {
+  STATUS_REVISIONS_LOAD,
+  STATUS_REVISIONS_LOAD_SUCCESS,
+  STATUS_REVISIONS_LOAD_FAIL
+} from '../actions/status_revisions'
+
+const initialState = ImmutableMap({
+  loading: false,
+  error: null,
+  revisions: ImmutableList(),
+})
+
+export default function statusRevisions(state = initialState, action) {
+  switch (action.type) {
+    case STATUS_REVISIONS_LOAD:
+      return initialState
+    case STATUS_REVISIONS_LOAD_SUCCESS:
+      return state.withMutations(mutable => {
+        mutable.set('loading', false)
+        mutable.set('revisions', fromJS(action.revisions).reverse())
+      })
+    case STATUS_REVISIONS_LOAD_FAIL:
+      return state.withMutations(mutable => {
+        mutable.set('loading', false)
+        mutable.set('error', action.error)
+      })
+    default:
+      return state
+  }
+}