yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(logo-customization): refactored service function params

Browse Source
This commit is contained in:
vincentbpro 2022-04-07 11:41:32 +02:00
parent 02b14f2bb4
commit bbed67982c
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/server/controllers/admin.js
View File

@ -61,7 +61,7 @@ module.exports = {
const formatedFiles = await projectSettingsService.parseFilesData(files);
await validateUpdateProjectSettingsImagesDimensions(formatedFiles);
return projectSettingsService.updateProjectSettings(body, formatedFiles);
return projectSettingsService.updateProjectSettings({ body, files: formatedFiles });
},
async information() {

14
packages/core/admin/server/services/__tests__/project-settings.test.js
View File

@ -133,7 +133,7 @@ describe('Project setting', () => {
},
};
await deleteOldFiles(previousSettings, newSettings);
await deleteOldFiles({ previousSettings, newSettings });
expect(unlinkSync).not.toBeCalled();
});
@ -150,7 +150,7 @@ describe('Project setting', () => {
const newSettings = previousSettings;
await deleteOldFiles(previousSettings, newSettings);
await deleteOldFiles({ previousSettings, newSettings });
expect(unlinkSync).not.toBeCalled();
});
@ -167,7 +167,7 @@ describe('Project setting', () => {
const newSettings = { menuLogo: null };
await deleteOldFiles(previousSettings, newSettings);
await deleteOldFiles({ previousSettings, newSettings });
expect(unlinkSync).toBeCalledTimes(1);
expect(unlinkSync).toBeCalledWith(previousSettings.menuLogo.path);
@ -190,7 +190,7 @@ describe('Project setting', () => {
},
};
await deleteOldFiles(previousSettings, newSettings);
await deleteOldFiles({ previousSettings, newSettings });
expect(unlinkSync).toBeCalledTimes(1);
expect(unlinkSync).toBeCalledWith(previousSettings.menuLogo.path);
@ -228,7 +228,7 @@ describe('Project setting', () => {
},
};
await updateProjectSettings(body, files);
await updateProjectSettings({ body, files });
expect(storeSet).toBeCalledTimes(1);
expect(storeSet).toBeCalledWith({
@ -245,7 +245,7 @@ describe('Project setting', () => {
menuLogo: null,
};
await updateProjectSettings(body, files);
await updateProjectSettings({ body, files });
expect(storeSet).toBeCalledTimes(1);
expect(storeSet).toBeCalledWith({
@ -268,7 +268,7 @@ describe('Project setting', () => {
},
};
await updateProjectSettings(body, files);
await updateProjectSettings({ body, files });
expect(storeSet).toBeCalledTimes(1);
expect(storeSet).toBeCalledWith({

11
packages/core/admin/server/services/project-settings.js
View File

@ -73,7 +73,7 @@ const uploadFiles = async files => {
return Promise.all(Object.values(files).map(strapi.plugin('upload').provider.uploadStream));
};
const deleteOldFiles = async (previousSettings, newSettings) => {
const deleteOldFiles = async ({ previousSettings, newSettings }) => {
return Promise.all(
PROJECT_SETTINGS_FILE_INPUTS.map(async inputName => {
// Skip if there was no previous file
@ -96,7 +96,7 @@ const deleteOldFiles = async (previousSettings, newSettings) => {
);
};
const updateProjectSettings = async (body, files) => {
const updateProjectSettings = async ({ body, files }) => {
const store = await strapi.store({ type: 'core', name: 'admin' });
const previousSettings = await store.get({ key: 'project-settings' });
@ -126,9 +126,12 @@ const updateProjectSettings = async (body, files) => {
// No await to proceed asynchronously
uploadFiles(files);
deleteOldFiles(previousSettings, newSettings);
deleteOldFiles({ previousSettings, newSettings });
store.set({ key: 'project-settings', value: { ...previousSettings, ...newSettings } });
await store.set({
key: 'project-settings',
value: { ...previousSettings, ...newSettings },
});
return getProjectSettings();
};