From 79bfb618415e99e1a7748a27ef579d145be6e219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 21 Jun 2021 14:48:21 +0200 Subject: Support population count MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- src/components/AppNavigation/CircleNavigationItem.vue | 9 ++++++++- src/models/circle.d.ts | 4 ++++ src/models/circle.ts | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/components/AppNavigation/CircleNavigationItem.vue b/src/components/AppNavigation/CircleNavigationItem.vue index f1059f4f..9b4ec1d6 100644 --- a/src/components/AppNavigation/CircleNavigationItem.vue +++ b/src/components/AppNavigation/CircleNavigationItem.vue @@ -119,7 +119,14 @@ export default { computed: { memberCount() { - return Object.values(this.circle?.members || []).length + const count = Object.keys(this.circle?.members || []).length + + // If member list is empty, let's try the population initial count + if (count === 0 && this.circle.population > 0) { + return this.circle.population + } + + return count }, }, } diff --git a/src/models/circle.d.ts b/src/models/circle.d.ts index a51a56a8..badc2ced 100644 --- a/src/models/circle.d.ts +++ b/src/models/circle.d.ts @@ -58,6 +58,10 @@ export default class Circle { * Circle description */ set description(text: string); + /** + * Circle member count + */ + get population(): any; /** * Circle ini_initiator the current * user info for this circle diff --git a/src/models/circle.ts b/src/models/circle.ts index 3a5880e3..38e0ab0d 100644 --- a/src/models/circle.ts +++ b/src/models/circle.ts @@ -105,6 +105,13 @@ export default class Circle { this._data.description = text } + /** + * Circle member count + */ + get population() { + return this._data.population + } + // MEMBERSHIP ----------------------------------------- /** * Circle ini_initiator the current -- cgit v1.2.3