From e7189d25789ff68d61b0473f02cfff5584c04fe4 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Wed, 17 Feb 2021 16:59:46 +0100 Subject: [PATCH] Fix typos & remove unecessary parameter --- packages/strapi-database/lib/lifecycle-manager.js | 4 +--- packages/strapi-plugin-i18n/config/functions/bootstrap.js | 4 ++-- .../services/__tests__/localizations.test.js | 8 ++++---- packages/strapi-plugin-i18n/services/localizations.js | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/strapi-database/lib/lifecycle-manager.js b/packages/strapi-database/lib/lifecycle-manager.js index 2781618633..1c7d9540a2 100644 --- a/packages/strapi-database/lib/lifecycle-manager.js +++ b/packages/strapi-database/lib/lifecycle-manager.js @@ -30,6 +30,4 @@ class LifecycleManager { } } -module.exports = strapi => { - return new LifecycleManager(strapi); -}; +module.exports = () => new LifecycleManager(); diff --git a/packages/strapi-plugin-i18n/config/functions/bootstrap.js b/packages/strapi-plugin-i18n/config/functions/bootstrap.js index 891009e0ed..e5e4595a50 100644 --- a/packages/strapi-plugin-i18n/config/functions/bootstrap.js +++ b/packages/strapi-plugin-i18n/config/functions/bootstrap.js @@ -31,7 +31,7 @@ module.exports = async () => { strapi.db.lifecycles.register({ model: model.uid, async beforeCreate(data) { - await getService('lcoalizations').assignDefaultLocale(data); + await getService('localizations').assignDefaultLocale(data); }, async afterCreate(entry) { await getService('localizations').addLocalizations(entry, { model }); @@ -40,7 +40,7 @@ module.exports = async () => { await getService('localizations').updateNonLocalizedFields(entry, { model }); }, async afterDelete(entry) { - await getService('localizations').removeEntryFromLocalizations(entry, { model }); + await getService('localizations').removeEntryFromRelatedLocalizations(entry, { model }); }, }); }); diff --git a/packages/strapi-plugin-i18n/services/__tests__/localizations.test.js b/packages/strapi-plugin-i18n/services/__tests__/localizations.test.js index e28f25895a..7051142fa9 100644 --- a/packages/strapi-plugin-i18n/services/__tests__/localizations.test.js +++ b/packages/strapi-plugin-i18n/services/__tests__/localizations.test.js @@ -4,7 +4,7 @@ const { assignDefaultLocale, addLocalizations, updateNonLocalizedFields, - removeEntryFromLocalizations, + removeEntryFromRelatedLocalizations, } = require('../localizations'); const model = { @@ -164,7 +164,7 @@ describe('localizations service', () => { }); }); - describe('removeEntryFromLocalizations', () => { + describe('removeEntryFromRelatedLocalizations', () => { test('Does nothing if no localizations set', async () => { const update = jest.fn(); global.strapi = { @@ -175,7 +175,7 @@ describe('localizations service', () => { const entry = { id: 1, locale: 'test' }; - await removeEntryFromLocalizations(entry, { model }); + await removeEntryFromRelatedLocalizations(entry, { model }); expect(update).not.toHaveBeenCalled(); }); @@ -197,7 +197,7 @@ describe('localizations service', () => { ], }; - await removeEntryFromLocalizations(entry, { model }); + await removeEntryFromRelatedLocalizations(entry, { model }); expect(update).toHaveBeenCalledTimes(1); expect(update).toHaveBeenCalledWith( diff --git a/packages/strapi-plugin-i18n/services/localizations.js b/packages/strapi-plugin-i18n/services/localizations.js index 3425996536..1b772f9a25 100644 --- a/packages/strapi-plugin-i18n/services/localizations.js +++ b/packages/strapi-plugin-i18n/services/localizations.js @@ -50,11 +50,12 @@ const updateNonLocalizedFields = async (entry, { model }) => { /** * Remove entry from localizations & udpate realted localizations + * This method should be used only after an entry is deleted * @param {Object} entry entry to remove from localizations * @param {Object} options * @param {Object} options.model corresponding model */ -const removeEntryFromLocalizations = async (entry, { model }) => { +const removeEntryFromRelatedLocalizations = async (entry, { model }) => { if (Array.isArray(entry.localizations)) { const newLocalizations = entry.localizations.filter(({ id }) => id != entry.id); @@ -70,5 +71,5 @@ module.exports = { assignDefaultLocale, addLocalizations, updateNonLocalizedFields, - removeEntryFromLocalizations, + removeEntryFromRelatedLocalizations, };