From 044477ba0de35236e9c53d57792fa71ad61d7e31 Mon Sep 17 00:00:00 2001
From: mbalint <magyarb0201@gmail.com>
Date: Tue, 23 Mar 2021 10:01:34 +0100
Subject: [PATCH] Desktop: Fixes #4683: Updating a disabled plugin enables it
 (#4711)

---
 .../plugins/useOnInstallHandler.test.ts       | 86 +++++++++++++++++++
 .../controls/plugins/useOnInstallHandler.ts   |  5 +-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.ts

diff --git a/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.ts b/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.ts
new file mode 100644
index 000000000..cbc58c4e8
--- /dev/null
+++ b/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.ts
@@ -0,0 +1,86 @@
+import useOnInstallHandler from './useOnInstallHandler';
+import { renderHook } from '@testing-library/react-hooks';
+
+import PluginService, { defaultPluginSetting } from '@joplin/lib/services/plugins/PluginService';
+import { ItemEvent } from './PluginBox';
+
+jest.mock('@joplin/lib/services/plugins/PluginService');
+
+const pluginServiceInstance = {
+	updatePluginFromRepo: jest.fn(),
+	installPluginFromRepo: jest.fn(),
+};
+
+const pluginId = 'test.plugin';
+const setInstallingPluginIds = jest.fn();
+const repoApi = jest.fn();
+const onPluginSettingsChange = jest.fn();
+const itemEvent = ({
+	item: { manifest: { id: pluginId } },
+} as ItemEvent);
+const callHook = (isUpdate: boolean, pluginEnabled = true) => () => useOnInstallHandler(
+	setInstallingPluginIds,
+	{
+		[pluginId]: {
+			enabled: pluginEnabled,
+			deleted: false,
+			hasBeenUpdated: false,
+		},
+	},
+	repoApi,
+	onPluginSettingsChange,
+	isUpdate
+);
+
+describe('useOnInstallHandler', () => {
+
+	beforeAll(() => {
+		(PluginService.instance as jest.Mock).mockReturnValue(pluginServiceInstance);
+		(defaultPluginSetting as jest.Mock).mockImplementation(
+			jest.requireActual('@joplin/lib/services/plugins/PluginService').defaultPluginSetting
+		);
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	test('should report that the plugin is being updated', async () => {
+		const { result: { current: onUpdate } } = renderHook(callHook(true));
+		await onUpdate(itemEvent);
+
+		expect(setInstallingPluginIds).toHaveBeenCalledTimes(2);
+		expect(setInstallingPluginIds.mock.calls[0][0]({})).toMatchObject({ [pluginId]: true });
+		expect(setInstallingPluginIds.mock.calls[1][0]({})).toMatchObject({ [pluginId]: false });
+	});
+
+	test('should update the plugin when there is an update', async () => {
+		const { result: { current: onUpdate } } = renderHook(callHook(true));
+		await onUpdate(itemEvent);
+
+		expect(pluginServiceInstance.updatePluginFromRepo).toHaveBeenCalledWith(undefined, pluginId);
+	});
+
+	test('should install the plugin when it is not yet installed', async () => {
+		const { result: { current: onInstall } } = renderHook(callHook(false));
+		await onInstall(itemEvent);
+
+		expect(pluginServiceInstance.installPluginFromRepo).toHaveBeenCalledWith(undefined, pluginId);
+	});
+
+	test('should preserve the enabled flag when plugin is updated', async () => {
+		const { result: { current: onUpdate } } = renderHook(callHook(true, false));
+		await onUpdate(itemEvent);
+
+		const newSettings = onPluginSettingsChange.mock.calls[0][0].value;
+		expect(newSettings[pluginId].enabled).toBe(false);
+	});
+
+	test('should indicate it when plugin has been updated', async () => {
+		const { result: { current: onUpdate } } = renderHook(callHook(true));
+		await onUpdate(itemEvent);
+
+		const newSettings = onPluginSettingsChange.mock.calls[0][0].value;
+		expect(newSettings[pluginId].hasBeenUpdated).toBe(true);
+	});
+});
diff --git a/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.ts b/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.ts
index 3031b0c56..9c0768904 100644
--- a/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.ts
+++ b/packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.ts
@@ -39,7 +39,10 @@ export default function(setInstallingPluginIds: Function, pluginSettings: Plugin
 		if (!installError) {
 			const newSettings = produce(pluginSettings, (draft: PluginSettings) => {
 				draft[pluginId] = defaultPluginSetting();
-				if (isUpdate) draft[pluginId].hasBeenUpdated = true;
+				if (isUpdate) {
+					draft[pluginId].enabled = pluginSettings[pluginId].enabled;
+					draft[pluginId].hasBeenUpdated = true;
+				}
 			});
 
 			onPluginSettingsChange({ value: newSettings });