Merge pull request #1781 from emlys/bugfix/1692

Close any open plugin tabs before removing it

Author: emlys

workbench/src/renderer/app.jsx

@@ -379,6 +379,8 @@ export default class App extends React.Component {
                 }
                 <PluginModal
                   updateInvestList={this.updateInvestList}
+                  closeInvestModel={this.closeInvestModel}
+                  openJobs={openJobs}
                 />
                 <SettingsModal
                   className="mx-3"

workbench/src/renderer/components/PluginModal/index.jsx

@@ -13,7 +13,7 @@ import { ipcMainChannels } from '../../../main/ipcMainChannels';
 const { ipcRenderer } = window.Workbench.electron;
 
 export default function PluginModal(props) {
-  const { updateInvestList } = props;
+  const { updateInvestList, closeInvestModel, openJobs } = props;
   const [showPluginModal, setShowPluginModal] = useState(false);
   const [url, setURL] = useState(undefined);
   const [revision, setRevision] = useState(undefined);
@@ -52,6 +52,11 @@ export default function PluginModal(props) {
 
   const removePlugin = () => {
     setLoading(true);
+    Object.keys(openJobs).forEach((tabID) => {
+      if (openJobs[tabID].modelRunName === pluginToRemove) {
+        closeInvestModel(tabID);
+      }
+    });
     ipcRenderer.invoke(ipcMainChannels.REMOVE_PLUGIN, pluginToRemove).then(() => {
       updateInvestList();
       setLoading(false);
@@ -212,4 +217,8 @@ export default function PluginModal(props) {
 
 PluginModal.propTypes = {
   updateInvestList: PropTypes.func.isRequired,
+  closeInvestModel: PropTypes.func.isRequired,
+  openJobs: PropTypes.shape({
+    modelRunName: PropTypes.string,
+  }).isRequired,
 };

workbench/tests/renderer/plugin.test.js

@@ -142,9 +142,14 @@ describe('Add plugin modal', () => {
       return Promise.resolve();
     });
     const {
-      findByText, getByRole, findByLabelText, queryByRole,
+      findByText, findByRole, getByRole, findByLabelText, queryByRole,
     } = render(<App />);
 
+    // open the plugin first, to make sure it doesn't cause a crash when removing
+    const pluginButton = await findByRole('button', { name: /Foo/ });
+    await act(async () => {
+      userEvent.click(pluginButton);
+    });
     const managePluginsButton = await findByText('Manage plugins');
     userEvent.click(managePluginsButton);