Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 1cdf508

Browse files
mydearxymmydearxym
committed
chore: merge branch 'renaming/markState' into dev
2 parents 06a7159 + 73ef2b9 commit 1cdf508

File tree

124 files changed

+387
-395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+387
-395
lines changed

‎containers/AccountEditor/logic.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ export const socialOnChange = R.curry((part, e) => {
3636
const { editUserData: editUser } = store
3737
editUser.social[part] = e.target.value
3838

39-
store.markState({ editUser })
39+
store.mark({ editUser })
4040
})
4141

4242
export const updateBackground = R.curry((key, part, { target: { value } }) =>
43-
store.markState({ [key]: R.merge(store[key], { [part]: value }) })
43+
store.mark({ [key]: R.merge(store[key], { [part]: value }) })
4444
)
4545

4646
/* eslint-disable no-unused-vars */
@@ -88,7 +88,7 @@ export const updateConfirm = () => {
8888
if (!R.isEmpty(workBackgrounds)) args.workBackgrounds = workBackgrounds
8989
if (!R.isEmpty(social)) args.social = social
9090

91-
store.markState({ updating: true })
91+
store.mark({ updating: true })
9292
log('args: ', args)
9393
sr71$.mutate(S.updateProfile, args)
9494
}
@@ -101,9 +101,9 @@ export const updateDone = () => {
101101
}
102102

103103
export const toggleSocials = () =>
104-
store.markState({ showSocials: !store.showSocials })
104+
store.mark({ showSocials: !store.showSocials })
105105

106-
const cancleLoading = () => store.markState({ updating: false })
106+
const cancleLoading = () => store.mark({ updating: false })
107107

108108
// ###############################
109109
// Data & Error handlers

‎containers/AccountEditor/store.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const AccountEditorStore = t
115115

116116
updateEditing(sobj) {
117117
const editUser = R.merge(self.editUser, { ...sobj })
118-
self.markState({ editUser })
118+
self.mark({ editUser })
119119
},
120120

121121
addBackground(type) {
@@ -126,7 +126,7 @@ const AccountEditorStore = t
126126
workBackgrounds = R.concat([self.workBgData], workBackgrounds)
127127

128128
self.updateEditing({ workBackgrounds })
129-
return self.markState({ workBg: { company: '', title: '' } })
129+
return self.mark({ workBg: { company: '', title: '' } })
130130
}
131131

132132
let educationBackgrounds = R.clone(self.editUserData.educationBackgrounds)
@@ -135,9 +135,9 @@ const AccountEditorStore = t
135135
educationBackgrounds
136136
)
137137
self.updateEditing({ educationBackgrounds })
138-
self.markState({ educationBg: { school: '', major: '' } })
138+
self.mark({ educationBg: { school: '', major: '' } })
139139
},
140-
markState(sobj) {
140+
mark(sobj) {
141141
markStates(sobj, self)
142142
},
143143
}))

‎containers/AccountViewer/logic.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ let store = null
1818
let sub$ = null
1919

2020
export const loadAccount = () => {
21-
store.markState({ viewingType: 'account', loading: true })
21+
store.mark({ viewingType: 'account', loading: true })
2222
return sr71$.query(S.user, {})
2323
}
2424

2525
export const loadUser = user => {
26-
store.markState({ viewingType: 'user', viewingUser: user })
26+
store.mark({ viewingType: 'user', viewingUser: user })
2727
sr71$.query(S.user, { login: user.login })
2828
}
2929

@@ -51,9 +51,9 @@ const DataSolver = [
5151
{
5252
match: asyncRes('user'),
5353
action: ({ user }) => {
54-
store.markState({ loading: false })
54+
store.mark({ loading: false })
5555
if (store.viewingType === 'user') {
56-
return store.markState({ viewingUser: user })
56+
return store.mark({ viewingUser: user })
5757
}
5858
return store.updateAccount(user)
5959
},
@@ -67,19 +67,19 @@ const DataSolver = [
6767
const ErrSolver = [
6868
{
6969
match: asyncErr(ERR.GRAPHQL),
70-
action: () => store.markState({ loading: false }),
70+
action: () => store.mark({ loading: false }),
7171
},
7272
{
7373
match: asyncErr(ERR.TIMEOUT),
7474
action: ({ details }) => {
75-
store.markState({ loading: false })
75+
store.mark({ loading: false })
7676
errRescue({ type: ERR.TIMEOUT, details, path: 'AccountViewer' })
7777
},
7878
},
7979
{
8080
match: asyncErr(ERR.NETWORK),
8181
action: () => {
82-
store.markState({ loading: false })
82+
store.mark({ loading: false })
8383
errRescue({ type: ERR.NETWORK, path: 'AccountViewer' })
8484
},
8585
},

‎containers/AccountViewer/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const AccountViewerStore = t
5555
updateAccount(data) {
5656
self.root.account.updateAccount(data)
5757
},
58-
markState(sobj) {
58+
mark(sobj) {
5959
markStates(sobj, self)
6060
},
6161
}))

‎containers/ArticleAuthorCard/logic.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ export const loadUser = user => {
1919
if (!store.isLogin) return false
2020
const { login } = user
2121

22-
store.markState({ user })
22+
store.mark({ user })
2323
sr71$.query(S.user, { login, userHasLogin: store.isLogin })
2424
}
2525

2626
export const onListUsers = (type, data) =>
2727
send(EVENT.USER_LISTER_OPEN, { type, data })
2828

2929
export const onFollow = userId => {
30-
store.markState({ following: true })
30+
store.mark({ following: true })
3131
sr71$.mutate(S.follow, { userId })
3232
}
3333
export const onUndoFollow = userId => {
34-
store.markState({ following: true })
34+
store.mark({ following: true })
3535
sr71$.mutate(S.undoFollow, { userId })
3636
}
3737

@@ -47,34 +47,34 @@ const DataSolver = [
4747
{
4848
match: asyncRes('follow'),
4949
action: ({ follow: user }) => {
50-
store.markState({ following: false })
50+
store.mark({ following: false })
5151
store.updateUser(user)
5252
},
5353
},
5454
{
5555
match: asyncRes('undoFollow'),
5656
action: ({ undoFollow: user }) => {
57-
store.markState({ following: false })
57+
store.mark({ following: false })
5858
store.updateUser(user)
5959
},
6060
},
6161
]
6262
const ErrSolver = [
6363
{
6464
match: asyncErr(ERR.GRAPHQL),
65-
action: () => store.markState({ following: false }),
65+
action: () => store.mark({ following: false }),
6666
},
6767
{
6868
match: asyncErr(ERR.TIMEOUT),
6969
action: ({ details }) => {
70-
store.markState({ following: false })
70+
store.mark({ following: false })
7171
errRescue({ type: ERR.TIMEOUT, details, path: 'ArticleAuthorCard' })
7272
},
7373
},
7474
{
7575
match: asyncErr(ERR.NETWORK),
7676
action: () => {
77-
store.markState({ following: false })
77+
store.mark({ following: false })
7878
errRescue({ type: ERR.NETWORK, path: 'ArticleAuthorCard' })
7979
},
8080
},

‎containers/ArticleAuthorCard/store.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ const ArticleAuthorCard = t
4343
},
4444
updateUser(sobj) {
4545
const user = R.merge(self.user, { ...sobj })
46-
self.markState({ user })
46+
self.mark({ user })
4747
},
48-
markState(sobj) {
48+
mark(sobj) {
4949
markStates(sobj, self)
5050
},
5151
}))

‎containers/ArticleBanner/logic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const onReaction = (action, userDid, { id }) => {
2222
if (store.loading) return false
2323
const thread = store.activeThread
2424

25-
store.markState({ action })
25+
store.mark({ action })
2626
/* log('onReaction thread: ', thread) */
2727
if (action === TYPE.FAVORITE) {
2828
// call favoriteSetter
@@ -62,7 +62,7 @@ const afterReaction = id => {
6262
}
6363
}
6464

65-
const markLoading = (maybe = true) => store.markState({ loading: maybe })
65+
const markLoading = (maybe = true) => store.mark({ loading: maybe })
6666

6767
// ###############################
6868
// Data & Error handlers

‎containers/ArticleBanner/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const ArticleBanner = t
5555
syncViewingItem(item) {
5656
self.root.viewing.syncViewingItem(item)
5757
},
58-
markState(sobj) {
58+
mark(sobj) {
5959
markStates(sobj, self)
6060
},
6161
}))

‎containers/ArticleBodyHeader/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const ArticleBodyHeader = t
4444
setViewing(sobj) {
4545
self.root.setViewing(sobj)
4646
},
47-
markState(sobj) {
47+
mark(sobj) {
4848
markStates(sobj, self)
4949
},
5050
}))

‎containers/ArticleViewerHeader/logic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const onReaction = (action, userDid, { id }) => {
2525

2626
const thread = store.activeThread
2727

28-
store.markState({ action })
28+
store.mark({ action })
2929
/* log('onReaction thread: ', thread) */
3030
if (action === TYPE.FAVORITE) {
3131
// call favoriteSetter
@@ -65,7 +65,7 @@ const afterReaction = id => {
6565
}
6666
}
6767

68-
const markLoading = (maybe = true) => store.markState({ loading: maybe })
68+
const markLoading = (maybe = true) => store.mark({ loading: maybe })
6969

7070
// ###############################
7171
// Data & Error handlers

0 commit comments

Comments
 (0)