mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Fix Cannot read property countUser of null
This commit message is a great example of why you should explain
**the reason** of your commit.
When I came across this bug I had a quick look into the code where it
came from. I could see that the bug only happened after a timer and
apparently reverting the biggest part of d84892930295dcfd3f6687fc33c7234446127099
would fix the bug. However I have no idea what the following commit
message means:
```
commit d84892930295dcfd3f6687fc33c7234446127099
Author: Grzegorz Leoniec <greg@app-interactive.de>
Date: Wed Mar 6 18:45:57 2019 +0100
Improved countTo component
```
I just don't know why the code is there - like what is it's purpose
@appinteractive? I can only guess: I believe that it's supposed to
update the counters in-place (without starting from 0 everytime).
Because apollo was set to poll the data every second.
Taking that into account I would rather remove this polling feature
completely and have less code and less complexity. Admins can still
refresh the page.
This commit is contained in:
parent
1c1d74e30d
commit
3d4724e314
@ -2,7 +2,7 @@
|
|||||||
<span>
|
<span>
|
||||||
<no-ssr placeholder="0" tag="span">
|
<no-ssr placeholder="0" tag="span">
|
||||||
<count-to
|
<count-to
|
||||||
:start-val="lastEndVal || startVal"
|
:start-val="startVal"
|
||||||
:end-val="endVal"
|
:end-val="endVal"
|
||||||
:duration="duration"
|
:duration="duration"
|
||||||
:autoplay="autoplay"
|
:autoplay="autoplay"
|
||||||
@ -25,23 +25,5 @@ export default {
|
|||||||
autoplay: { type: Boolean, default: true },
|
autoplay: { type: Boolean, default: true },
|
||||||
separator: { type: String, default: '.' },
|
separator: { type: String, default: '.' },
|
||||||
},
|
},
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
lastEndVal: null,
|
|
||||||
isReady: false,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
watch: {
|
|
||||||
endVal(endVal) {
|
|
||||||
if (this.isReady && this.startVal === 0 && !this.lastEndVal) {
|
|
||||||
this.lastEndVal = this.endVal
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
setTimeout(() => {
|
|
||||||
this.isReady = true
|
|
||||||
}, 500)
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<ds-space margin="small">
|
<ds-space margin="small">
|
||||||
<ds-number :count="0" :label="$t('admin.dashboard.users')" size="x-large" uppercase>
|
<ds-number :count="0" :label="$t('admin.dashboard.users')" size="x-large" uppercase>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countUsers || 0" />
|
<hc-count-to :end-val="statistics.countUsers || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<ds-space margin="small">
|
<ds-space margin="small">
|
||||||
<ds-number :count="0" :label="$t('admin.dashboard.posts')" size="x-large" uppercase>
|
<ds-number :count="0" :label="$t('admin.dashboard.posts')" size="x-large" uppercase>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countPosts || 0" />
|
<hc-count-to :end-val="statistics.countPosts || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -30,7 +30,7 @@
|
|||||||
uppercase
|
uppercase
|
||||||
>
|
>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countComments || 0" />
|
<hc-count-to :end-val="statistics.countComments || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -44,7 +44,7 @@
|
|||||||
uppercase
|
uppercase
|
||||||
>
|
>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countNotifications || 0" />
|
<hc-count-to :end-val="statistics.countNotifications || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -58,7 +58,7 @@
|
|||||||
uppercase
|
uppercase
|
||||||
>
|
>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countOrganizations || 0" />
|
<hc-count-to :end-val="statistics.countOrganizations || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -72,7 +72,7 @@
|
|||||||
uppercase
|
uppercase
|
||||||
>
|
>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countProjects || 0" />
|
<hc-count-to :end-val="statistics.countProjects || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -81,7 +81,7 @@
|
|||||||
<ds-space margin="small">
|
<ds-space margin="small">
|
||||||
<ds-number :count="0" :label="$t('admin.dashboard.invites')" size="x-large" uppercase>
|
<ds-number :count="0" :label="$t('admin.dashboard.invites')" size="x-large" uppercase>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countInvites || 0" />
|
<hc-count-to :end-val="statistics.countInvites || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -90,7 +90,7 @@
|
|||||||
<ds-space margin="small">
|
<ds-space margin="small">
|
||||||
<ds-number :count="0" :label="$t('admin.dashboard.follows')" size="x-large" uppercase>
|
<ds-number :count="0" :label="$t('admin.dashboard.follows')" size="x-large" uppercase>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countFollows || 0" />
|
<hc-count-to :end-val="statistics.countFollows || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -99,7 +99,7 @@
|
|||||||
<ds-space margin="small">
|
<ds-space margin="small">
|
||||||
<ds-number :count="0" :label="$t('admin.dashboard.shouts')" size="x-large" uppercase>
|
<ds-number :count="0" :label="$t('admin.dashboard.shouts')" size="x-large" uppercase>
|
||||||
<no-ssr slot="count">
|
<no-ssr slot="count">
|
||||||
<hc-count-to :start-val="0" :end-val="statistics.countShouts || 0" />
|
<hc-count-to :end-val="statistics.countShouts || 0" />
|
||||||
</no-ssr>
|
</no-ssr>
|
||||||
</ds-number>
|
</ds-number>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
@ -128,9 +128,6 @@ export default {
|
|||||||
return process.client
|
return process.client
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
|
||||||
this.$apollo.queries.statistics.startPolling(5000)
|
|
||||||
},
|
|
||||||
apollo: {
|
apollo: {
|
||||||
statistics: {
|
statistics: {
|
||||||
query: gql`
|
query: gql`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user