Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[mobile] Fix users and comments stores according to mobx v. 6

Browse source
This commit is contained in:
JuliaSvinareva 2021-03-09 15:27:26 +03:00
parent 48c50b145b
commit 1cf1bb5df3
2 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
apps/common/mobile/lib/store/comments.js
View file

@ -1,11 +1,35 @@
import {observable, action, computed} from 'mobx';
import {makeObservable, observable, action, computed} from 'mobx';
export class storeComments {
@observable collectionComments = [];
@observable groupCollectionComments = [];
constructor() {
makeObservable(this, {
collectionComments: observable,
groupCollectionComments: observable,
filter: observable,
groupCollectionFilter: observable,
@action addComment (comment) {
addComment: action,
removeComment: action,
changeFilter: action,
sortComments: computed,
isOpenEditComment: observable,
openEditComment: action,
isOpenAddReply: observable,
openAddReply: action,
isOpenEditReply: observable,
openEditReply: action
})
}
collectionComments = [];
groupCollectionComments = [];
filter = undefined;
groupCollectionFilter = []; // for sse
addComment (comment) {
comment.groupName ? this.addCommentToGroupCollection(comment) : this.addCommentToCollection(comment);
}
@ -24,7 +48,7 @@ export class storeComments {
}
}
@action removeComment (id) {
removeComment (id) {
if (this.collectionComments.length > 0) {
this.removeCommentFromCollection(id);
} else {
@ -57,10 +81,7 @@ export class storeComments {
}
}
@observable filter; // for sse
@observable groupCollectionFilter = []; // for sse
@action changeFilter (filter) {
changeFilter (filter) {
let comments = [];
this.filter = filter;
filter.forEach((item) => {
@ -94,7 +115,7 @@ export class storeComments {
return model;
}
@computed get sortComments () {
get sortComments () {
const comments = (this.groupCollectionFilter.length !== 0) ? this.groupCollectionFilter : (this.collectionComments.length !== 0 ? this.collectionComments : false);
if (comments.length > 0) {
return [...comments].sort((a, b) => a.time > b.time ? 1 : -1);
@ -104,8 +125,8 @@ export class storeComments {
// Edit comment
currentComment = null;
@observable isOpenEditComment = false;
@action openEditComment (open, comment) {
isOpenEditComment = false;
openEditComment (open, comment) {
if (open !== this.isOpenEditComment) {
this.currentComment = open ? comment : null;
this.isOpenEditComment = open;
@ -113,16 +134,16 @@ export class storeComments {
}
currentReply = null;
@observable isOpenAddReply = false;
@action openAddReply (open, comment) {
isOpenAddReply = false;
openAddReply (open, comment) {
if (open !== this.isOpenAddReply) {
this.currentComment = open ? comment : null;
this.isOpenAddReply = open;
}
}
@observable isOpenEditReply = false;
@action openEditReply (open, comment, reply) {
isOpenEditReply = false;
openEditReply (open, comment, reply) {
if (open !== this.isOpenEditReply) {
this.currentComment = open ? comment : null;
this.currentReply = open ? reply : null;

23
apps/common/mobile/lib/store/users.js
View file

@ -1,16 +1,25 @@
import {observable, action, computed} from 'mobx';
import {makeObservable, observable, action} from 'mobx';
export class storeUsers {
@observable users = [];
constructor() {
makeObservable(this, {
users: observable,
reset: action,
currentUser: observable,
setCurrentUser: action,
connection: action
})
}
@action reset(users) {
users = [];
currentUser;
reset (users) {
this.users = Object.values(users)
}
@observable currentUser;
@action setCurrentUser(id) {
setCurrentUser (id) {
this.users.forEach((item) => {
if (item.asc_getIdOriginal() === id) {
this.currentUser = item;
@ -18,7 +27,7 @@ export class storeUsers {
});
}
@action connection (change) {
connection (change) {
let changed = false;
for (let uid in this.users) {
if (undefined !== uid) {