Fix spurious error and incorrect state change when adding a reaction twice (#12957)
* Fix spurious error and incorrect state change when adding a reaction twice * Remove superfluous top border for announcements box
This commit is contained in:
parent
48c55b6392
commit
c06d2ff437
2 changed files with 18 additions and 4 deletions
|
@ -56,12 +56,27 @@ export const updateAnnouncements = announcement => ({
|
||||||
});
|
});
|
||||||
|
|
||||||
export const addReaction = (announcementId, name) => (dispatch, getState) => {
|
export const addReaction = (announcementId, name) => (dispatch, getState) => {
|
||||||
dispatch(addReactionRequest(announcementId, name));
|
const announcement = getState().getIn(['announcements', 'items']).find(x => x.get('id') === announcementId);
|
||||||
|
|
||||||
|
let alreadyAdded = false;
|
||||||
|
|
||||||
|
if (announcement) {
|
||||||
|
const reaction = announcement.get('reactions').find(x => x.get('name') === name);
|
||||||
|
if (reaction && reaction.get('me')) {
|
||||||
|
alreadyAdded = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!alreadyAdded) {
|
||||||
|
dispatch(addReactionRequest(announcementId, name, alreadyAdded));
|
||||||
|
}
|
||||||
|
|
||||||
api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
|
api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
|
||||||
dispatch(addReactionSuccess(announcementId, name));
|
dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
dispatch(addReactionFail(announcementId, name, err));
|
if (!alreadyAdded) {
|
||||||
|
dispatch(addReactionFail(announcementId, name, err));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6632,7 +6632,6 @@ noscript {
|
||||||
|
|
||||||
.announcements {
|
.announcements {
|
||||||
background: lighten($ui-base-color, 8%);
|
background: lighten($ui-base-color, 8%);
|
||||||
border-top: 1px solid $ui-base-color;
|
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-end;
|
align-items: flex-end;
|
||||||
|
|
Loading…
Reference in a new issue