self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Fixes #9725: Fix warning logged when uninstalling multiple plugins (#9726)

Browse Source
This commit is contained in:
Henry Heino 2024-01-18 03:24:44 -08:00 committed by GitHub
parent bdc970d718
commit d8d0e705f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/app-cli/tests/services/plugins/PluginService.ts
View File

@ -1,5 +1,5 @@
import PluginRunner from '../../../app/services/plugins/PluginRunner'; import PluginRunner from '../../../app/services/plugins/PluginRunner';
import PluginService from '@joplin/lib/services/plugins/PluginService'; import PluginService, { PluginSettings } from '@joplin/lib/services/plugins/PluginService';
import { ContentScriptType } from '@joplin/lib/services/plugins/api/types'; import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
import MdToHtml from '@joplin/renderer/MdToHtml'; import MdToHtml from '@joplin/renderer/MdToHtml';
import shim from '@joplin/lib/shim'; import shim from '@joplin/lib/shim';
@ -304,4 +304,33 @@ describe('services_PluginService', () => {
expect(JSON.parse(folders[0].title)).toBe(expectedPath); expect(JSON.parse(folders[0].title)).toBe(expectedPath);
})); }));
it('should uninstall multiple plugins', async () => {
const service = newPluginService();
const pluginId1 = 'org.joplinapp.FirstJplPlugin';
const pluginId2 = 'org.joplinapp.plugins.TocDemo';
const pluginPath1 = `${testPluginDir}/jpl_test/${pluginId1}.jpl`;
const pluginPath2 = `${testPluginDir}/toc/${pluginId2}.jpl`;
await service.installPlugin(pluginPath1);
await service.installPlugin(pluginPath2);
// Both should be installed
expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId1}.jpl`)).toBe(true);
expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId2}.jpl`)).toBe(true);
const pluginSettings: PluginSettings = {
[pluginId1]: { enabled: true, deleted: true, hasBeenUpdated: false },
[pluginId2]: { enabled: true, deleted: true, hasBeenUpdated: false },
};
const newPluginSettings = await service.uninstallPlugins(pluginSettings);
// Should have deleted plugins
expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId1}.jpl`)).toBe(false);
expect(await fs.pathExists(`${Setting.value('pluginDir')}${pluginId2}.jpl`)).toBe(false);
// Should clear deleted plugins from settings
expect(newPluginSettings[pluginId1]).toBe(undefined);
expect(newPluginSettings[pluginId2]).toBe(undefined);
});
}); });

2
packages/lib/services/plugins/PluginService.ts
View File

@ -505,7 +505,7 @@ export default class PluginService extends BaseService {
for (const pluginId in settings) { for (const pluginId in settings) {
if (settings[pluginId].deleted) { if (settings[pluginId].deleted) {
await this.uninstallPlugin(pluginId); await this.uninstallPlugin(pluginId);
newSettings = { ...settings }; newSettings = { ...newSettings };
delete newSettings[pluginId]; delete newSettings[pluginId];
} }
} }