From 2ef973000e1aed9e3ade674302904d8776952d7b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 23 Nov 2020 16:58:50 +0100 Subject: [PATCH] Show user and actors media usage in admin Signed-off-by: Thomas Citharel --- js/src/graphql/actor.ts | 2 ++ js/src/graphql/group.ts | 1 + js/src/graphql/user.ts | 1 + js/src/i18n/en_US.json | 3 ++- js/src/i18n/fr_FR.json | 3 ++- js/src/types/actor/actor.model.ts | 3 +++ js/src/types/current-user.model.ts | 1 + js/src/utils/datetime.ts | 15 ++++++++++++++- js/src/views/Admin/AdminGroupProfile.vue | 5 +++++ js/src/views/Admin/AdminProfile.vue | 18 +++++++++++------- js/src/views/Admin/AdminUserProfile.vue | 11 ++++++++++- 11 files changed, 52 insertions(+), 11 deletions(-) diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts index 6c9f68e6c..958d16f9b 100644 --- a/js/src/graphql/actor.ts +++ b/js/src/graphql/actor.ts @@ -10,6 +10,7 @@ export const FETCH_PERSON = gql` summary preferredUsername suspended + mediaSize avatar { id name @@ -51,6 +52,7 @@ export const GET_PERSON = gql` summary preferredUsername suspended + mediaSize avatar { id name diff --git a/js/src/graphql/group.ts b/js/src/graphql/group.ts index 4815d5e4b..4c946b89d 100644 --- a/js/src/graphql/group.ts +++ b/js/src/graphql/group.ts @@ -84,6 +84,7 @@ export const GROUP_FIELDS_FRAGMENTS = gql` id url } + mediaSize organizedEvents( afterDatetime: $afterDateTime beforeDatetime: $beforeDateTime diff --git a/js/src/graphql/user.ts b/js/src/graphql/user.ts index c6fc40776..4f85f388a 100644 --- a/js/src/graphql/user.ts +++ b/js/src/graphql/user.ts @@ -200,6 +200,7 @@ export const GET_USER = gql` currentSignInAt locale disabled + mediaSize defaultActor { id } diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 918c1a7d6..d03b83648 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -799,5 +799,6 @@ "Mobilizon uses a system of profiles to compartiment your activities. You will be able to create as many profiles as you want.": "Mobilizon uses a system of profiles to compartiment your activities. You will be able to create as many profiles as you want.", "Mobilizon is a federated software, meaning you can interact - depending on your admin's federation settings - with content from other instances, such as joining groups or events that were created elsewhere.": "Mobilizon is a federated software, meaning you can interact - depending on your admin federation settings - with content from other instances, such as joining groups or events that were created elsewhere.", "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.": "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.", - "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:" + "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:", + "Uploaded media size": "Uploaded media size" } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 34663c42c..1e52c9b99 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -887,5 +887,6 @@ "Mobilizon uses a system of profiles to compartiment your activities. You will be able to create as many profiles as you want.": "Mobilizon utilise un système de profils pour compartimenter vos activités. Vous pourrez créer autant de profils que vous voulez.", "Mobilizon is a federated software, meaning you can interact - depending on your admin's federation settings - with content from other instances, such as joining groups or events that were created elsewhere.": "Mobilizon est un logiciel fédéré, ce qui signifie que vous pouvez interagir - en fonction des paramètres de fédération de votre administrateur·ice - avec du contenu d'autres instances, comme par exemple rejoindre des groupes ou des événements ayant été créés ailleurs.", "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.": "Cette instance, {instanceName} ({domain}), héberge votre profil, donc notez bien son nom.", - "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "Si l'on vous demande votre identité fédérée, elle est composée de votre nom d'utilisateur·ice et de votre instance. Par exemple, l'identité fédérée de votre premier profil est :" + "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "Si l'on vous demande votre identité fédérée, elle est composée de votre nom d'utilisateur·ice et de votre instance. Par exemple, l'identité fédérée de votre premier profil est :", + "Uploaded media size": "Taille des médias téléversés" } diff --git a/js/src/types/actor/actor.model.ts b/js/src/types/actor/actor.model.ts index 65c838f22..7b11331f7 100644 --- a/js/src/types/actor/actor.model.ts +++ b/js/src/types/actor/actor.model.ts @@ -13,6 +13,7 @@ export interface IActor { url: string; name: string; domain: string | null; + mediaSize: number; summary: string; preferredUsername: string; suspended: boolean; @@ -30,6 +31,8 @@ export class Actor implements IActor { domain: string | null = null; + mediaSize = 0; + name = ""; preferredUsername = ""; diff --git a/js/src/types/current-user.model.ts b/js/src/types/current-user.model.ts index eed7d9eb9..3b2a29ea0 100644 --- a/js/src/types/current-user.model.ts +++ b/js/src/types/current-user.model.ts @@ -39,6 +39,7 @@ export interface IUser extends ICurrentUser { actors: IPerson[]; disabled: boolean; participations: Paginate; + mediaSize: number; drafts: IEvent[]; settings: IUserSettings; locale: string; diff --git a/js/src/utils/datetime.ts b/js/src/utils/datetime.ts index f55420d5f..e0b3210a3 100644 --- a/js/src/utils/datetime.ts +++ b/js/src/utils/datetime.ts @@ -18,4 +18,17 @@ function localeShortWeekDayNames(): string[] { return weekDayNames; } -export { localeMonthNames, localeShortWeekDayNames }; +// https://stackoverflow.com/a/18650828/10204399 +function formatBytes(bytes: number, decimals = 2): string { + if (bytes === 0) return "0 Bytes"; + + const k = 1024; + const dm = decimals < 0 ? 0 : decimals; + const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]; + + const i = Math.floor(Math.log(bytes) / Math.log(k)); + + return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`; +} + +export { localeMonthNames, localeShortWeekDayNames, formatBytes }; diff --git a/js/src/views/Admin/AdminGroupProfile.vue b/js/src/views/Admin/AdminGroupProfile.vue index 8a27d06f7..6b7cb9279 100644 --- a/js/src/views/Admin/AdminGroupProfile.vue +++ b/js/src/views/Admin/AdminGroupProfile.vue @@ -198,6 +198,7 @@