From 16eabd438bc4a975b6b555df46f17e5ef6afbe5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Mon, 19 Feb 2024 16:17:10 +0100 Subject: [PATCH] Run prettier --- .../admin/ee/server/src/services/metrics.ts | 62 ++++++++++--------- .../server/src/services/release.ts | 4 +- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/packages/core/admin/ee/server/src/services/metrics.ts b/packages/core/admin/ee/server/src/services/metrics.ts index 3bebfb640a..09d72dd198 100644 --- a/packages/core/admin/ee/server/src/services/metrics.ts +++ b/packages/core/admin/ee/server/src/services/metrics.ts @@ -4,38 +4,49 @@ import EE from '@strapi/strapi/dist/utils/ee'; import { getService } from '../utils'; const getSSOProvidersList = async () => { - const { providerRegistry } = strapi.admin.services.passport; + const { providerRegistry } = strapi.admin.services.passport; - return providerRegistry.getAll().map(({ uid }: { uid: string }) => uid); -} + return providerRegistry.getAll().map(({ uid }: { uid: string }) => uid); +}; const sendUpdateProjectInformation = async () => { - let groupProperties = {}; + let groupProperties = {}; - const numberOfActiveAdminUsers = await getService('user').count({ isActive: true }); - const numberOfAdminUsers = await getService('user').count(); + const numberOfActiveAdminUsers = await getService('user').count({ isActive: true }); + const numberOfAdminUsers = await getService('user').count(); - if (EE.features.isEnabled('sso')) { - const SSOProviders = await getSSOProvidersList(); + if (EE.features.isEnabled('sso')) { + const SSOProviders = await getSSOProvidersList(); - groupProperties = assign(groupProperties, { SSOProviders, isSSOConfigured: SSOProviders.length !== 0 }); - } + groupProperties = assign(groupProperties, { + SSOProviders, + isSSOConfigured: SSOProviders.length !== 0, + }); + } - if (EE.features.isEnabled('cms-content-releases')) { - const numberOfContentReleases = await strapi.entityService.count('plugin::content-releases.release'); - const numberOfPublishedContentReleases = await strapi.entityService.count('plugin::content-releases.release', { - filters: { $not: { releasedAt: null } } - }); + if (EE.features.isEnabled('cms-content-releases')) { + const numberOfContentReleases = await strapi.entityService.count( + 'plugin::content-releases.release' + ); + const numberOfPublishedContentReleases = await strapi.entityService.count( + 'plugin::content-releases.release', + { + filters: { $not: { releasedAt: null } }, + } + ); - groupProperties = assign(groupProperties, { numberOfContentReleases, numberOfPublishedContentReleases }); - } + groupProperties = assign(groupProperties, { + numberOfContentReleases, + numberOfPublishedContentReleases, + }); + } - groupProperties = assign(groupProperties, { numberOfActiveAdminUsers, numberOfAdminUsers }); + groupProperties = assign(groupProperties, { numberOfActiveAdminUsers, numberOfAdminUsers }); - strapi.telemetry.send('didUpdateProjectInformation', { - groupProperties - }); -} + strapi.telemetry.send('didUpdateProjectInformation', { + groupProperties, + }); +}; const startCron = (strapi: Strapi) => { strapi.cron.add({ @@ -43,9 +54,4 @@ const startCron = (strapi: Strapi) => { }); }; -export { - startCron, - getSSOProvidersList, - sendUpdateProjectInformation, -}; - +export { startCron, getSSOProvidersList, sendUpdateProjectInformation }; diff --git a/packages/core/content-releases/server/src/services/release.ts b/packages/core/content-releases/server/src/services/release.ts index 99340cca51..037bbdc3bb 100644 --- a/packages/core/content-releases/server/src/services/release.ts +++ b/packages/core/content-releases/server/src/services/release.ts @@ -454,12 +454,12 @@ const createReleaseService = ({ strapi }: { strapi: LoadedStrapi }) => ({ }); await strapi.entityService.delete(RELEASE_MODEL_UID, releaseId); }); - + if (strapi.features.future.isEnabled('contentReleasesScheduling') && release.scheduledAt) { const schedulingService = getService('scheduling', { strapi }); await schedulingService.cancel(release.id); } - + strapi.telemetry.send('didDeleteContentRelease'); return release;