Merge branch 'lists' into 'develop'

Fix issues related to lists

See merge request soapbox-pub/soapbox-fe!567
actually-fix-tabs-bar
Alex Gleason 2021-07-01 20:01:42 +00:00
commit 91fdec9d3c
2 zmienionych plików z 2 dodań i 8 usunięć

Wyświetl plik

@ -42,7 +42,8 @@ class NewListForm extends React.PureComponent {
this.props.onSubmit(); this.props.onSubmit();
} }
handleClick = () => { handleClick = e => {
e.preventDefault();
this.props.onSubmit(); this.props.onSubmit();
} }

Wyświetl plik

@ -1,7 +1,6 @@
import { SETTING_CHANGE, SETTING_SAVE, FE_NAME } from '../actions/settings'; import { SETTING_CHANGE, SETTING_SAVE, FE_NAME } from '../actions/settings';
import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications'; import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
import { EMOJI_USE } from '../actions/emojis'; import { EMOJI_USE } from '../actions/emojis';
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
import { ME_FETCH_SUCCESS } from 'soapbox/actions/me'; import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
@ -15,8 +14,6 @@ const initialState = ImmutableMap({
const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmojis', ImmutableMap(), map => map.update(emoji.id, 0, count => count + 1)).set('saved', false); const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmojis', ImmutableMap(), map => map.update(emoji.id, 0, count => count + 1)).set('saved', false);
const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
const importSettings = (state, account) => { const importSettings = (state, account) => {
account = fromJS(account); account = fromJS(account);
const prefs = account.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap()); const prefs = account.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap());
@ -36,10 +33,6 @@ export default function settings(state = initialState, action) {
return updateFrequentEmojis(state, action.emoji); return updateFrequentEmojis(state, action.emoji);
case SETTING_SAVE: case SETTING_SAVE:
return state.set('saved', true); return state.set('saved', true);
case LIST_FETCH_FAIL:
return action.error.response.status === 404 ? filterDeadListColumns(state, action.id) : state;
case LIST_DELETE_SUCCESS:
return filterDeadListColumns(state, action.id);
default: default:
return state; return state;
} }