Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Mobile
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
196
Issues
196
List
Boards
Labels
Service Desk
Milestones
Merge Requests
18
Merge Requests
18
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Minds
Minds Mobile
Compare Revisions
2a03ec569d311e05e6453d0a3ea5ae9a433e858c...b3632a950b7c936ff6d67e4ddda4aa05af04c1d3
Source
b3632a950b7c936ff6d67e4ddda4aa05af04c1d3
Select Git revision
...
Target
2a03ec569d311e05e6453d0a3ea5ae9a433e858c
Select Git revision
Compare
Commits (4)
(fix) channel's subscribers list error
· d5107cca
Martin Santangelo
authored
2 hours ago
d5107cca
(fix) groups member list error
· e070dcb9
Martin Santangelo
authored
1 hour ago
e070dcb9
(chore) update test snapshot
· c2175c9e
Martin Santangelo
authored
1 hour ago
c2175c9e
(feat) log errors on feed store's refresh
· b3632a95
Martin Santangelo
authored
1 hour ago
b3632a95
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
40 deletions
+44
-40
__tests__/channel/subscribers/__snapshots__/ChannelSubscribers.js.snap
...nnel/subscribers/__snapshots__/ChannelSubscribers.js.snap
+33
-33
src/channel/subscribers/ChannelSubscribers.js
src/channel/subscribers/ChannelSubscribers.js
+1
-1
src/channel/subscribers/ChannelSubscribersStore.js
src/channel/subscribers/ChannelSubscribersStore.js
+5
-0
src/common/stores/FeedStore.js
src/common/stores/FeedStore.js
+2
-0
src/groups/GroupViewScreen.js
src/groups/GroupViewScreen.js
+1
-1
src/groups/GroupViewStore.js
src/groups/GroupViewStore.js
+2
-5
No files found.
__tests__/channel/subscribers/__snapshots__/ChannelSubscribers.js.snap
View file @
b3632a95
...
...
@@ -375,7 +375,17 @@ exports[`channel subscribers component should render correctly 1`] = `
style={null}
>
<DiscoveryUser
entity={
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
row={
Object {
"index": 0,
"item": Object {
...
...
@@ -464,16 +474,6 @@ exports[`channel subscribers component should render correctly 1`] = `
},
}
}
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
store={
Object {
"filter": "subscribers",
...
...
@@ -752,7 +752,17 @@ exports[`channel subscribers component should render correctly 1`] = `
style={null}
>
<DiscoveryUser
entity={
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
row={
Object {
"index": 1,
"item": Object {
...
...
@@ -841,16 +851,6 @@ exports[`channel subscribers component should render correctly 1`] = `
},
}
}
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
store={
Object {
"filter": "subscribers",
...
...
@@ -1129,7 +1129,17 @@ exports[`channel subscribers component should render correctly 1`] = `
style={null}
>
<DiscoveryUser
entity={
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
row={
Object {
"index": 2,
"item": Object {
...
...
@@ -1218,16 +1228,6 @@ exports[`channel subscribers component should render correctly 1`] = `
},
}
}
navigation={
Object {
"navigate": [MockFunction],
"state": Object {
"params": Object {
"guid": 1,
},
},
}
}
store={
Object {
"filter": "subscribers",
...
...
This diff is collapsed.
Click to expand it.
src/channel/subscribers/ChannelSubscribers.js
View file @
b3632a95
...
...
@@ -124,7 +124,7 @@ export default class ChannelSubscribers extends Component {
*/
renderRow
=
(
row
)
=>
{
return
(
<
DiscoveryUser
store
=
{
this
.
props
.
channelSubscribersStore
}
entity
=
{
row
}
navigation
=
{
this
.
props
.
navigation
}
/
>
<
DiscoveryUser
store
=
{
this
.
props
.
channelSubscribersStore
}
row
=
{
row
}
navigation
=
{
this
.
props
.
navigation
}
/
>
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/channel/subscribers/ChannelSubscribersStore.js
View file @
b3632a95
...
...
@@ -5,13 +5,17 @@ import {
import
OffsetListStore
from
'
../../common/stores/OffsetListStore
'
;
import
channelService
from
'
../ChannelService
'
;
import
UserModel
from
'
../UserModel
'
;
/**
* Subscribers Store
*/
class
ChannelSubscribersStore
{
list
=
new
OffsetListStore
();
@
observable
filter
=
'
subscribers
'
;
guid
=
''
;
loading
=
false
;
...
...
@@ -38,6 +42,7 @@ class ChannelSubscribersStore {
return
channelService
.
getSubscribers
(
this
.
guid
,
this
.
filter
,
this
.
list
.
offset
)
.
then
(
feed
=>
{
feed
.
entities
=
UserModel
.
createMany
(
feed
.
entities
);
this
.
list
.
setList
(
feed
);
})
.
finally
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
src/common/stores/FeedStore.js
View file @
b3632a95
...
...
@@ -403,6 +403,8 @@ export default class FeedStore {
this
.
refreshing
=
true
;
try
{
await
this
.
fetchRemoteOrLocal
(
true
);
}
catch
(
err
)
{
logService
.
exception
(
'
[FeedStore]
'
,
err
);
}
finally
{
this
.
refreshing
=
false
;
}
...
...
This diff is collapsed.
Click to expand it.
src/groups/GroupViewScreen.js
View file @
b3632a95
...
...
@@ -276,7 +276,7 @@ export default class GroupViewScreen extends Component {
return
(
<
GroupUser
store
=
{
this
.
props
.
groupView
}
entity
=
{
row
}
row
=
{
row
}
navigation
=
{
this
.
props
.
navigation
}
onRightIconPress
=
{
this
.
memberMenuPress
}
isOwner
=
{
this
.
props
.
groupView
.
group
[
'
is:owner
'
]}
...
...
This diff is collapsed.
Click to expand it.
src/groups/GroupViewStore.js
View file @
b3632a95
...
...
@@ -2,7 +2,6 @@ import { observable, action } from 'mobx'
import
groupsService
from
'
./GroupsService
'
;
import
{
setViewed
}
from
'
../newsfeed/NewsfeedService
'
;
import
OffsetFeedListStore
from
'
../common/stores/OffsetFeedListStore
'
;
import
OffsetListStore
from
'
../common/stores/OffsetListStore
'
;
import
UserModel
from
'
../channel/UserModel
'
;
...
...
@@ -11,8 +10,6 @@ import logService from '../common/services/log.service';
import
entitiesService
from
'
../common/services/entities.service
'
;
import
GroupModel
from
'
./GroupModel
'
;
import
FeedStore
from
'
../common/stores/FeedStore
'
;
import
featuresService
from
'
../common/services/features.service
'
;
import
{
isNetworkFail
}
from
'
../common/helpers/abortableFetch
'
;
/**
* Groups store
...
...
@@ -139,8 +136,8 @@ class GroupViewStore {
data
.
offset
=
data
[
'
load-next
'
];
this
.
members
.
setList
(
data
);
this
.
assignRowKeys
(
data
);
}
catch
(
err
or
)
{
}
catch
(
err
)
{
logService
.
exception
(
err
)
}
finally
{
this
.
setLoading
(
false
);
}
...
...
This diff is collapsed.
Click to expand it.