ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into deployment-secrets

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-03-14 13:05:38 +01:00 committed by GitHub
commit 14b79c9aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/features/ProfileList/FollowList.spec.js
View File

@ -74,7 +74,9 @@ describe('FollowList.vue', () => {
expect(wrapper.vm.allConnectionsCount).toBe(user.followingCount)
expect(wrapper.findAll('.user-teaser')).toHaveLength(user.following.length)
expect(wrapper.emitted('fetchAllConnections')).toEqual([['following']])
expect(wrapper.emitted('fetchAllConnections')).toEqual([
['following', user.followingCount],
])
})
})
@ -85,7 +87,9 @@ describe('FollowList.vue', () => {
expect(wrapper.vm.allConnectionsCount).toBe(user.followedByCount)
expect(wrapper.findAll('.user-teaser')).toHaveLength(user.followedBy.length)
expect(wrapper.emitted('fetchAllConnections')).toEqual([['followedBy']])
expect(wrapper.emitted('fetchAllConnections')).toEqual([
['followedBy', user.followedByCount],
])
})
})
})

2
webapp/components/features/ProfileList/FollowList.vue
View File

@ -6,7 +6,7 @@
:allProfilesCount="allConnectionsCount"
:profiles="connections"
:loading="loading"
@fetchAllProfiles="$emit('fetchAllConnections', type)"
@fetchAllProfiles="$emit('fetchAllConnections', type, allConnectionsCount)"
/>
</template>

6
webapp/pages/profile/_id/_slug.vue
View File

@ -384,9 +384,9 @@ export default {
this.user.followedByCurrentUser = followedByCurrentUser
this.user.followedBy = followedBy
},
fetchAllConnections(type) {
if (type === 'following') this.followingCount = Infinity
if (type === 'followedBy') this.followedByCount = Infinity
fetchAllConnections(type, count) {
if (type === 'following') this.followingCount = count
if (type === 'followedBy') this.followedByCount = count
},
},
apollo: {