yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run prettier

Browse Source
This commit is contained in:
Aurélien Georget 2024-02-19 16:17:10 +01:00
parent 9569d5fb80
commit 16eabd438b
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/core/admin/ee/server/src/services/metrics.ts
View File

@ -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 };

4
packages/core/content-releases/server/src/services/release.ts
View File

@ -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;