From 364ab625f8fb097b51d80e9c5bc3b69495acc1ea Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Tue, 21 Jan 2025 14:12:42 -0800
Subject: [PATCH 01/10] update plugin modal form to support branch or ref, and
 local path

---
 .../renderer/components/PluginModal/index.jsx | 93 ++++++++++++++++---
 1 file changed, 79 insertions(+), 14 deletions(-)

diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index d9b26a79d..87203a0f7 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import Button from 'react-bootstrap/Button';
+import Col from 'react-bootstrap/Col';
 import Form from 'react-bootstrap/Form';
 import Modal from 'react-bootstrap/Modal';
 import Spinner from 'react-bootstrap/Spinner';
@@ -15,20 +16,30 @@ export default function PluginModal(props) {
   const { updateInvestList } = props;
   const [showPluginModal, setShowPluginModal] = useState(false);
   const [url, setURL] = useState(undefined);
+  const [branch, setBranch] = useState(undefined);
+  const [path, setPath] = useState(undefined);
   const [err, setErr] = useState(undefined);
   const [pluginToRemove, setPluginToRemove] = useState(undefined);
   const [loading, setLoading] = useState(false);
   const [plugins, setPlugins] = useState({});
+  const [installFrom, setInstallFrom] = useState('Git URL');
 
   const handleModalClose = () => {
     setURL(undefined);
+    setBranch(undefined);
     setErr(false);
     setShowPluginModal(false);
   };
   const handleModalOpen = () => setShowPluginModal(true);
+
   const addPlugin = () => {
     setLoading(true);
-    ipcRenderer.invoke(ipcMainChannels.ADD_PLUGIN, url).then((addPluginErr) => {
+    ipcRenderer.invoke(ipcMainChannels.ADD_PLUGIN, {
+      installFrom: installFrom,
+      url: url,
+      branch: branch,
+      path: path,
+    }).then((addPluginErr) => {
       setLoading(false);
       updateInvestList();
       if (addPluginErr) {
@@ -61,20 +72,71 @@ export default function PluginModal(props) {
 
   const { t } = useTranslation();
 
+  let pluginFields;
+  if (installFrom === 'Git URL') {
+    pluginFields = (
+      <>
+        <Form.Row>
+          <Form.Group as={Col} xs={7} className="mb-1">
+            <Form.Label>Git URL</Form.Label>
+            <Form.Control
+              id="url"
+              type="text"
+              placeholder={t('https://github.com/foo/bar.git')}
+              onChange={(event) => setURL(event.currentTarget.value)}
+            />
+          </Form.Group>
+          <Form.Group as={Col} className="mb-1">
+            <Form.Label>Branch or ref</Form.Label>
+            <Form.Control
+              id="branch"
+              type="text"
+              placeholder={t('default')}
+              onChange={(event) => setBranch(event.currentTarget.value)}
+            />
+          </Form.Group>
+        </Form.Row>
+        <Form.Text className="text-muted mt-0">
+          {t('Default branch is used unless a branch or ref is specified')}
+        </Form.Text>
+      </>
+    );
+  } else {
+    pluginFields = (
+      <Form.Group className="px-0 mb-1">
+        <Form.Label>Local path</Form.Label>
+        <Form.Control
+          id="path"
+          type="text"
+          onChange={(event) => setPath(event.currentTarget.value)}
+        />
+        <Form.Text className="text-muted mt-0">
+          {t('Must be an absolute path')}
+        </Form.Text>
+      </Form.Group>
+    );
+  }
+
   let modalBody = (
     <Modal.Body>
       <Form>
         <Form.Group className="mb-3">
-          <Form.Label htmlFor="url">{t('Add a plugin')}</Form.Label>
-          <Form.Control
-            id="url"
-            type="text"
-            placeholder={t('Enter Git URL')}
-            onChange={(event) => setURL(event.currentTarget.value)}
-          />
-          <Form.Text className="text-muted">
-            {t('This may take several minutes')}
-          </Form.Text>
+          <Form.Label className="col-form-label-lg" htmlFor="url">{t('Add a plugin')}</Form.Label>
+          <Form.Group>
+            <Form.Row>
+              <Col>
+                <Form.Control
+                  as="select"
+                  onChange={(event) => setInstallFrom(event.target.value)}
+                  className="w-auto"
+                >
+                  <option value="Git URL">Install from Git URL</option>
+                  <option value="local path">Install from local path</option>
+                </Form.Control>
+              </Col>
+            </Form.Row>
+          </Form.Group>
+          {pluginFields}
           <Button
             disabled={loading}
             className="mt-2"
@@ -85,7 +147,7 @@ export default function PluginModal(props) {
         </Form.Group>
         <hr />
         <Form.Group className="mb-3">
-          <Form.Label htmlFor="plugin-select">{t('Remove a plugin')}</Form.Label>
+          <Form.Label className="col-form-label-lg" htmlFor="plugin-select">{t('Remove a plugin')}</Form.Label>
           <Form.Control
             id="plugin-select"
             as="select"
@@ -130,12 +192,15 @@ export default function PluginModal(props) {
         {t('Manage plugins')}
       </Button>
 
-      <Modal show={showPluginModal} onHide={handleModalClose}>
+      <Modal show={showPluginModal} onHide={handleModalClose} >
         <Modal.Header>
           <Modal.Title>{t('Manage plugins')}</Modal.Title>
           {loading && (
             <Spinner animation="border" role="status" className="m-2">
-              <span className="sr-only">Loading...</span>
+              <span className="sr-only">{t('Loading...')}</span>
+              <Form.Text className="text-muted">
+                {t('This may take several minutes')}
+              </Form.Text>
             </Spinner>
           )}
         </Modal.Header>

From ed7f006d6fd42e279547ab6b0b6bf16d696b2392 Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Tue, 21 Jan 2025 16:53:33 -0800
Subject: [PATCH 02/10] support installing from a specific revision on remote

---
 workbench/src/main/setupAddRemovePlugin.js    | 67 +++++++++++++------
 .../renderer/components/PluginModal/index.jsx | 30 ++++-----
 2 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/workbench/src/main/setupAddRemovePlugin.js b/workbench/src/main/setupAddRemovePlugin.js
index 7a0480ad0..c1f4abd87 100644
--- a/workbench/src/main/setupAddRemovePlugin.js
+++ b/workbench/src/main/setupAddRemovePlugin.js
@@ -52,32 +52,55 @@ function spawnWithLogging(cmd, args, options) {
 export function setupAddPlugin() {
   ipcMain.handle(
     ipcMainChannels.ADD_PLUGIN,
-    async (e, pluginURL) => {
+    async (e, url, revision, path) => {
       try {
-        logger.info('adding plugin at', pluginURL);
-        const micromamba = settingsStore.get('micromamba');
-        // Create a temporary directory and check out the plugin's pyproject.toml
-        const tmpPluginDir = fs.mkdtempSync(upath.join(tmpdir(), 'natcap-invest-'));
-        await spawnWithLogging(
-          'git',
-          ['clone', '--depth', '1', '--no-checkout', pluginURL, tmpPluginDir]
-        );
-        await spawnWithLogging(
-          'git',
-          ['checkout', 'HEAD', 'pyproject.toml'],
-          { cwd: tmpPluginDir }
-        );
-        // Read in the plugin's pyproject.toml, then delete it
-        const pyprojectTOML = toml.parse(fs.readFileSync(
-          upath.join(tmpPluginDir, 'pyproject.toml')
-        ).toString());
-        fs.rmSync(tmpPluginDir, { recursive: true, force: true });
+        let pyprojectTOML;
+        let installString;
+        if (url) { // install from git URL
+          if (revision) {
+            installString = `git+${url}@${revision}`;
+            logger.info(`adding plugin from ${installString}`);
+          } else {
+            installString = `git+${url}`;
+            logger.info(`adding plugin from ${installString} at default branch`);
+          }
+
+          // Create a temporary directory and check out the plugin's pyproject.toml,
+          // without downloading any extra files or git history
+          const tmpPluginDir = fs.mkdtempSync(upath.join(tmpdir(), 'natcap-invest-'));
+          await spawnWithLogging('git', ['clone', '--depth', 1, '--no-checkout', url, tmpPluginDir]);
+          let head = 'HEAD';
+          if (revision) {
+            head = 'FETCH_HEAD';
+            await spawnWithLogging(
+              'git',
+              ['fetch', 'origin', `${revision}`],
+              { cwd: tmpPluginDir }
+            );
+          }
+          await spawnWithLogging(
+            'git',
+            ['checkout', head, '--', 'pyproject.toml'],
+            { cwd: tmpPluginDir }
+          );
+          // Read in the plugin's pyproject.toml, then delete it
+          pyprojectTOML = toml.parse(fs.readFileSync(
+            upath.join(tmpPluginDir, 'pyproject.toml')
+          ).toString());
+          fs.rmSync(tmpPluginDir, { recursive: true, force: true });
+        } else { // install from local path
+          logger.info(`adding plugin from ${path}`);
+          // Read in the plugin's pyproject.toml, then delete it
+          pyprojectTOML = toml.parse(fs.readFileSync(
+            upath.join(path, 'pyproject.toml')
+          ).toString());
+        }
 
+        const micromamba = settingsStore.get('micromamba');
         // Access plugin metadata from the pyproject.toml
         const pluginID = pyprojectTOML.tool.natcap.invest.model_id;
         const pluginName = pyprojectTOML.tool.natcap.invest.model_name;
         const pluginPyName = pyprojectTOML.tool.natcap.invest.pyname;
-
         // Create a conda env containing the plugin and its dependencies
         const envName = `invest_plugin_${pluginID}`;
         await spawnWithLogging(
@@ -87,7 +110,7 @@ export function setupAddPlugin() {
         logger.info('created micromamba env for plugin');
         await spawnWithLogging(
           micromamba,
-          ['run', '--name', envName, 'pip', 'install', `git+${pluginURL}`]
+          ['run', '--name', envName, 'pip', 'install', installString]
         );
         logger.info('installed plugin into its env');
         // Write plugin metadata to the workbench's config.json
@@ -103,7 +126,7 @@ export function setupAddPlugin() {
             model_name: pluginName,
             pyname: pluginPyName,
             type: 'plugin',
-            source: pluginURL,
+            source: installString,
             env: envPath,
           }
         );
diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index 87203a0f7..df9772773 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -16,17 +16,17 @@ export default function PluginModal(props) {
   const { updateInvestList } = props;
   const [showPluginModal, setShowPluginModal] = useState(false);
   const [url, setURL] = useState(undefined);
-  const [branch, setBranch] = useState(undefined);
+  const [revision, setRevision] = useState(undefined);
   const [path, setPath] = useState(undefined);
   const [err, setErr] = useState(undefined);
   const [pluginToRemove, setPluginToRemove] = useState(undefined);
   const [loading, setLoading] = useState(false);
   const [plugins, setPlugins] = useState({});
-  const [installFrom, setInstallFrom] = useState('Git URL');
+  const [installFrom, setInstallFrom] = useState('url');
 
   const handleModalClose = () => {
     setURL(undefined);
-    setBranch(undefined);
+    setRevision(undefined);
     setErr(false);
     setShowPluginModal(false);
   };
@@ -34,12 +34,12 @@ export default function PluginModal(props) {
 
   const addPlugin = () => {
     setLoading(true);
-    ipcRenderer.invoke(ipcMainChannels.ADD_PLUGIN, {
-      installFrom: installFrom,
-      url: url,
-      branch: branch,
-      path: path,
-    }).then((addPluginErr) => {
+    ipcRenderer.invoke(
+      ipcMainChannels.ADD_PLUGIN,
+      installFrom === 'url' ? url : undefined, // url
+      installFrom === 'url' ? revision : undefined, // revision
+      installFrom === 'path' ? path : undefined // path
+    ).then((addPluginErr) => {
       setLoading(false);
       updateInvestList();
       if (addPluginErr) {
@@ -73,7 +73,7 @@ export default function PluginModal(props) {
   const { t } = useTranslation();
 
   let pluginFields;
-  if (installFrom === 'Git URL') {
+  if (installFrom === 'url') {
     pluginFields = (
       <>
         <Form.Row>
@@ -87,17 +87,17 @@ export default function PluginModal(props) {
             />
           </Form.Group>
           <Form.Group as={Col} className="mb-1">
-            <Form.Label>Branch or ref</Form.Label>
+            <Form.Label>Branch, tag, or commit</Form.Label>
             <Form.Control
               id="branch"
               type="text"
               placeholder={t('default')}
-              onChange={(event) => setBranch(event.currentTarget.value)}
+              onChange={(event) => setRevision(event.currentTarget.value)}
             />
           </Form.Group>
         </Form.Row>
         <Form.Text className="text-muted mt-0">
-          {t('Default branch is used unless a branch or ref is specified')}
+          {t('Default branch is used unless otherwise specified')}
         </Form.Text>
       </>
     );
@@ -130,8 +130,8 @@ export default function PluginModal(props) {
                   onChange={(event) => setInstallFrom(event.target.value)}
                   className="w-auto"
                 >
-                  <option value="Git URL">Install from Git URL</option>
-                  <option value="local path">Install from local path</option>
+                  <option value="URL">Install from git URL</option>
+                  <option value="path">Install from local path</option>
                 </Form.Control>
               </Col>
             </Form.Row>

From 31672ff8ded812d62c815aef10688d3a6f83c6e9 Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Tue, 21 Jan 2025 19:57:42 -0800
Subject: [PATCH 03/10] support installing plugin from local path

---
 workbench/src/main/setupAddRemovePlugin.js       |  1 +
 .../renderer/components/PluginModal/index.jsx    | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/workbench/src/main/setupAddRemovePlugin.js b/workbench/src/main/setupAddRemovePlugin.js
index c1f4abd87..a81c86553 100644
--- a/workbench/src/main/setupAddRemovePlugin.js
+++ b/workbench/src/main/setupAddRemovePlugin.js
@@ -90,6 +90,7 @@ export function setupAddPlugin() {
           fs.rmSync(tmpPluginDir, { recursive: true, force: true });
         } else { // install from local path
           logger.info(`adding plugin from ${path}`);
+          installString = path;
           // Read in the plugin's pyproject.toml, then delete it
           pyprojectTOML = toml.parse(fs.readFileSync(
             upath.join(path, 'pyproject.toml')
diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index df9772773..ada3f3c44 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -144,6 +144,9 @@ export default function PluginModal(props) {
           >
             {t('Add')}
           </Button>
+          <Form.Text className="text-muted">
+            {t('This may take several minutes')}
+          </Form.Text>
         </Form.Group>
         <hr />
         <Form.Group className="mb-3">
@@ -192,16 +195,15 @@ export default function PluginModal(props) {
         {t('Manage plugins')}
       </Button>
 
-      <Modal show={showPluginModal} onHide={handleModalClose} >
+      <Modal show={showPluginModal} onHide={handleModalClose}>
         <Modal.Header>
           <Modal.Title>{t('Manage plugins')}</Modal.Title>
           {loading && (
-            <Spinner animation="border" role="status" className="m-2">
-              <span className="sr-only">{t('Loading...')}</span>
-              <Form.Text className="text-muted">
-                {t('This may take several minutes')}
-              </Form.Text>
-            </Spinner>
+            <Form.Group>
+              <Spinner animation="border" role="status" className="m-2">
+                <span className="sr-only">{t('Loading...')}</span>
+              </Spinner>
+            </Form.Group>
           )}
         </Modal.Header>
         {modalBody}

From 26301f4bcc4504ad4eb657f06e16acb8d0548032 Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Wed, 22 Jan 2025 16:01:07 -0800
Subject: [PATCH 04/10] add platform-dependent placeholder text for local
 plugin path

---
 workbench/src/preload/api.js                         |  1 +
 .../src/renderer/components/PluginModal/index.jsx    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/workbench/src/preload/api.js b/workbench/src/preload/api.js
index 82ef57a6b..740875876 100644
--- a/workbench/src/preload/api.js
+++ b/workbench/src/preload/api.js
@@ -32,6 +32,7 @@ export default {
   ELECTRON_LOG_PATH: electronLogPath,
   USERGUIDE_PATH: userguidePath,
   LANGUAGE: ipcRenderer.sendSync(ipcMainChannels.GET_LANGUAGE),
+  OS: process.platform,
   logger: {
     debug: (message) => ipcRenderer.send(ipcMainChannels.LOGGER, 'debug', message),
     info: (message) => ipcRenderer.send(ipcMainChannels.LOGGER, 'info', message),
diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index ada3f3c44..413408dc6 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -82,7 +82,7 @@ export default function PluginModal(props) {
             <Form.Control
               id="url"
               type="text"
-              placeholder={t('https://github.com/foo/bar.git')}
+              placeholder="https://github.com/foo/bar.git"
               onChange={(event) => setURL(event.currentTarget.value)}
             />
           </Form.Group>
@@ -104,15 +104,15 @@ export default function PluginModal(props) {
   } else {
     pluginFields = (
       <Form.Group className="px-0 mb-1">
-        <Form.Label>Local path</Form.Label>
+        <Form.Label>Local absolute path</Form.Label>
         <Form.Control
           id="path"
           type="text"
+          placeholder={
+            window.Workbench.OS === 'darwin' ? '/Users/natcap/foo/bar/' : 'C:\\Documents\\foo\\bar\\'
+          }
           onChange={(event) => setPath(event.currentTarget.value)}
         />
-        <Form.Text className="text-muted mt-0">
-          {t('Must be an absolute path')}
-        </Form.Text>
       </Form.Group>
     );
   }
@@ -130,7 +130,7 @@ export default function PluginModal(props) {
                   onChange={(event) => setInstallFrom(event.target.value)}
                   className="w-auto"
                 >
-                  <option value="URL">Install from git URL</option>
+                  <option value="url">Install from git URL</option>
                   <option value="path">Install from local path</option>
                 </Form.Control>
               </Col>

From 8f9c9679628c03596bb9d2bfd0d39e15cac474be Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Fri, 24 Jan 2025 10:03:22 -0800
Subject: [PATCH 05/10] improve placeholder and label text in plugin modal form

---
 .../renderer/components/PluginModal/index.jsx | 58 +++++++++----------
 workbench/src/renderer/styles/style.css       |  5 ++
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index 413408dc6..99087e545 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -75,31 +75,31 @@ export default function PluginModal(props) {
   let pluginFields;
   if (installFrom === 'url') {
     pluginFields = (
-      <>
-        <Form.Row>
-          <Form.Group as={Col} xs={7} className="mb-1">
-            <Form.Label>Git URL</Form.Label>
-            <Form.Control
-              id="url"
-              type="text"
-              placeholder="https://github.com/foo/bar.git"
-              onChange={(event) => setURL(event.currentTarget.value)}
-            />
-          </Form.Group>
-          <Form.Group as={Col} className="mb-1">
-            <Form.Label>Branch, tag, or commit</Form.Label>
-            <Form.Control
-              id="branch"
-              type="text"
-              placeholder={t('default')}
-              onChange={(event) => setRevision(event.currentTarget.value)}
-            />
-          </Form.Group>
-        </Form.Row>
-        <Form.Text className="text-muted mt-0">
-          {t('Default branch is used unless otherwise specified')}
-        </Form.Text>
-      </>
+      <Form.Row>
+        <Form.Group as={Col} xs={7} className="mb-1">
+          <Form.Label>Git URL</Form.Label>
+          <Form.Control
+            id="url"
+            type="text"
+            placeholder="https://github.com/owner/repo.git"
+            onChange={(event) => setURL(event.currentTarget.value)}
+          />
+          <Form.Text className="text-muted mt-0 fst-italic">
+            <i>{t('Default branch used unless otherwise specified')}</i>
+          </Form.Text>
+        </Form.Group>
+        <Form.Group as={Col} className="mb-1">
+          <Form.Label>Branch, tag, or commit</Form.Label>
+          <Form.Control
+            id="branch"
+            type="text"
+            onChange={(event) => setRevision(event.currentTarget.value)}
+          />
+          <Form.Text className="text-muted mt-0">
+            <i>{t('Optional')}</i>
+          </Form.Text>
+        </Form.Group>
+      </Form.Row>
     );
   } else {
     pluginFields = (
@@ -108,9 +108,9 @@ export default function PluginModal(props) {
         <Form.Control
           id="path"
           type="text"
-          placeholder={
-            window.Workbench.OS === 'darwin' ? '/Users/natcap/foo/bar/' : 'C:\\Documents\\foo\\bar\\'
-          }
+          placeholder={window.Workbench.OS === 'darwin'
+            ? '/Users/username/path/to/plugin/'
+            : 'C:\\Documents\\path\\to\\plugin\\'}
           onChange={(event) => setPath(event.currentTarget.value)}
         />
       </Form.Group>
@@ -195,7 +195,7 @@ export default function PluginModal(props) {
         {t('Manage plugins')}
       </Button>
 
-      <Modal show={showPluginModal} onHide={handleModalClose}>
+      <Modal show={showPluginModal} onHide={handleModalClose} contentClassName="plugin-modal">
         <Modal.Header>
           <Modal.Title>{t('Manage plugins')}</Modal.Title>
           {loading && (
diff --git a/workbench/src/renderer/styles/style.css b/workbench/src/renderer/styles/style.css
index 138013b8b..f2c720b7e 100644
--- a/workbench/src/renderer/styles/style.css
+++ b/workbench/src/renderer/styles/style.css
@@ -637,3 +637,8 @@ input[type=text]::placeholder {
     background-size: 1rem 1rem;
   }
 }
+
+/* Manage Plugins modal */
+.plugin-modal {
+  width: 34rem;
+}

From 665d51115755284ae1e328e4971d01a8bf26274c Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Fri, 24 Jan 2025 10:35:07 -0800
Subject: [PATCH 06/10] fix labels and htmlFors in plugin modal form

---
 .../renderer/components/PluginModal/index.jsx | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index 99087e545..6726122aa 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -77,7 +77,7 @@ export default function PluginModal(props) {
     pluginFields = (
       <Form.Row>
         <Form.Group as={Col} xs={7} className="mb-1">
-          <Form.Label>Git URL</Form.Label>
+          <Form.Label htmlFor="url">Git URL</Form.Label>
           <Form.Control
             id="url"
             type="text"
@@ -89,7 +89,7 @@ export default function PluginModal(props) {
           </Form.Text>
         </Form.Group>
         <Form.Group as={Col} className="mb-1">
-          <Form.Label>Branch, tag, or commit</Form.Label>
+          <Form.Label htmlFor="branch">Branch, tag, or commit</Form.Label>
           <Form.Control
             id="branch"
             type="text"
@@ -104,7 +104,7 @@ export default function PluginModal(props) {
   } else {
     pluginFields = (
       <Form.Group className="px-0 mb-1">
-        <Form.Label>Local absolute path</Form.Label>
+        <Form.Label htmlFor="path">Local absolute path</Form.Label>
         <Form.Control
           id="path"
           type="text"
@@ -121,19 +121,19 @@ export default function PluginModal(props) {
     <Modal.Body>
       <Form>
         <Form.Group className="mb-3">
-          <Form.Label className="col-form-label-lg" htmlFor="url">{t('Add a plugin')}</Form.Label>
+          <h5 className="mb-3">{t('Add a plugin')}</h5>
           <Form.Group>
             <Form.Row>
-              <Col>
-                <Form.Control
-                  as="select"
-                  onChange={(event) => setInstallFrom(event.target.value)}
-                  className="w-auto"
-                >
-                  <option value="url">Install from git URL</option>
-                  <option value="path">Install from local path</option>
-                </Form.Control>
-              </Col>
+              <Form.Label htmlFor="installFrom" className="mt-2 mx-1">{t('Install from')}</Form.Label>
+              <Form.Control
+                id="installFrom"
+                as="select"
+                onChange={(event) => setInstallFrom(event.target.value)}
+                className="w-auto"
+              >
+                <option value="url">{t('git URL')}</option>
+                <option value="path">{t('local path')}</option>
+              </Form.Control>
             </Form.Row>
           </Form.Group>
           {pluginFields}
@@ -150,7 +150,7 @@ export default function PluginModal(props) {
         </Form.Group>
         <hr />
         <Form.Group className="mb-3">
-          <Form.Label className="col-form-label-lg" htmlFor="plugin-select">{t('Remove a plugin')}</Form.Label>
+          <h5 className="mb-3">{t('Remove a plugin')}</h5>
           <Form.Control
             id="plugin-select"
             as="select"

From 5e33768ba6b073949a71ad2ba82d682b1d21e47d Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Fri, 24 Jan 2025 10:36:15 -0800
Subject: [PATCH 07/10] update comment

---
 workbench/src/main/setupAddRemovePlugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workbench/src/main/setupAddRemovePlugin.js b/workbench/src/main/setupAddRemovePlugin.js
index a81c86553..529f0f51a 100644
--- a/workbench/src/main/setupAddRemovePlugin.js
+++ b/workbench/src/main/setupAddRemovePlugin.js
@@ -91,7 +91,7 @@ export function setupAddPlugin() {
         } else { // install from local path
           logger.info(`adding plugin from ${path}`);
           installString = path;
-          // Read in the plugin's pyproject.toml, then delete it
+          // Read in the plugin's pyproject.toml
           pyprojectTOML = toml.parse(fs.readFileSync(
             upath.join(path, 'pyproject.toml')
           ).toString());

From 4be6f50ba1088a40b4436b74539d2cb74ffbcffb Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Fri, 24 Jan 2025 14:41:25 -0800
Subject: [PATCH 08/10] stack plugin 'install from' label over dropdown; remove
 some unneeded styling

---
 .../renderer/components/PluginModal/index.jsx | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/workbench/src/renderer/components/PluginModal/index.jsx b/workbench/src/renderer/components/PluginModal/index.jsx
index 6726122aa..01b19fca9 100644
--- a/workbench/src/renderer/components/PluginModal/index.jsx
+++ b/workbench/src/renderer/components/PluginModal/index.jsx
@@ -76,26 +76,26 @@ export default function PluginModal(props) {
   if (installFrom === 'url') {
     pluginFields = (
       <Form.Row>
-        <Form.Group as={Col} xs={7} className="mb-1">
-          <Form.Label htmlFor="url">Git URL</Form.Label>
+        <Form.Group as={Col} xs={7}>
+          <Form.Label htmlFor="url">{t('Git URL')}</Form.Label>
           <Form.Control
             id="url"
             type="text"
             placeholder="https://github.com/owner/repo.git"
             onChange={(event) => setURL(event.currentTarget.value)}
           />
-          <Form.Text className="text-muted mt-0 fst-italic">
+          <Form.Text className="text-muted">
             <i>{t('Default branch used unless otherwise specified')}</i>
           </Form.Text>
         </Form.Group>
-        <Form.Group as={Col} className="mb-1">
-          <Form.Label htmlFor="branch">Branch, tag, or commit</Form.Label>
+        <Form.Group as={Col}>
+          <Form.Label htmlFor="branch">{t('Branch, tag, or commit')}</Form.Label>
           <Form.Control
             id="branch"
             type="text"
             onChange={(event) => setRevision(event.currentTarget.value)}
           />
-          <Form.Text className="text-muted mt-0">
+          <Form.Text className="text-muted">
             <i>{t('Optional')}</i>
           </Form.Text>
         </Form.Group>
@@ -103,8 +103,8 @@ export default function PluginModal(props) {
     );
   } else {
     pluginFields = (
-      <Form.Group className="px-0 mb-1">
-        <Form.Label htmlFor="path">Local absolute path</Form.Label>
+      <Form.Group>
+        <Form.Label htmlFor="path">{t('Local absolute path')}</Form.Label>
         <Form.Control
           id="path"
           type="text"
@@ -120,26 +120,23 @@ export default function PluginModal(props) {
   let modalBody = (
     <Modal.Body>
       <Form>
-        <Form.Group className="mb-3">
+        <Form.Group>
           <h5 className="mb-3">{t('Add a plugin')}</h5>
           <Form.Group>
-            <Form.Row>
-              <Form.Label htmlFor="installFrom" className="mt-2 mx-1">{t('Install from')}</Form.Label>
-              <Form.Control
-                id="installFrom"
-                as="select"
-                onChange={(event) => setInstallFrom(event.target.value)}
-                className="w-auto"
-              >
-                <option value="url">{t('git URL')}</option>
-                <option value="path">{t('local path')}</option>
-              </Form.Control>
-            </Form.Row>
+            <Form.Label htmlFor="installFrom">{t('Install from')}</Form.Label>
+            <Form.Control
+              id="installFrom"
+              as="select"
+              onChange={(event) => setInstallFrom(event.target.value)}
+              className="w-auto"
+            >
+              <option value="url">{t('git URL')}</option>
+              <option value="path">{t('local path')}</option>
+            </Form.Control>
           </Form.Group>
           {pluginFields}
           <Button
             disabled={loading}
-            className="mt-2"
             onClick={addPlugin}
           >
             {t('Add')}
@@ -149,10 +146,11 @@ export default function PluginModal(props) {
           </Form.Text>
         </Form.Group>
         <hr />
-        <Form.Group className="mb-3">
+        <Form.Group>
           <h5 className="mb-3">{t('Remove a plugin')}</h5>
+          <Form.Label htmlFor="selectPluginToRemove">{t('Plugin name')}</Form.Label>
           <Form.Control
-            id="plugin-select"
+            id="selectPluginToRemove"
             as="select"
             value={pluginToRemove}
             onChange={(event) => setPluginToRemove(event.currentTarget.value)}
@@ -172,7 +170,7 @@ export default function PluginModal(props) {
           </Form.Control>
           <Button
             disabled={loading || !Object.keys(plugins).length}
-            className="mt-2"
+            className="mt-3"
             onClick={removePlugin}
           >
             {t('Remove')}

From d5d3e64ca9fb1f4a0a657d46e84526d568032d59 Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Mon, 27 Jan 2025 10:46:53 -0800
Subject: [PATCH 09/10] update plugin modal component labels in plugin tests

---
 workbench/tests/renderer/plugin.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workbench/tests/renderer/plugin.test.js b/workbench/tests/renderer/plugin.test.js
index 476e05b2b..b3c612eac 100644
--- a/workbench/tests/renderer/plugin.test.js
+++ b/workbench/tests/renderer/plugin.test.js
@@ -68,7 +68,7 @@ describe('Add plugin modal', () => {
     const managePluginsButton = await findByText('Manage plugins');
     userEvent.click(managePluginsButton);
 
-    const urlField = await findByLabelText('Add a plugin');
+    const urlField = await findByLabelText('Git URL');
     await userEvent.type(urlField, 'fake url', { delay: 0 });
     const submitButton = await findByText('Add');
     userEvent.click(submitButton);
@@ -148,7 +148,7 @@ describe('Add plugin modal', () => {
     const managePluginsButton = await findByText('Manage plugins');
     userEvent.click(managePluginsButton);
 
-    const pluginDropdown = await findByLabelText('Remove a plugin');
+    const pluginDropdown = await findByLabelText('Plugin name');
     await userEvent.selectOptions(pluginDropdown, [getByRole('option', { name: 'Foo' })]);
 
     const submitButton = await findByText('Remove');

From 823ea7fdc891013a4f8da6bacac45fee100e8d65 Mon Sep 17 00:00:00 2001
From: Emily Soth <esoth@stanford.edu>
Date: Mon, 27 Jan 2025 11:42:35 -0800
Subject: [PATCH 10/10] move variable definition

---
 workbench/src/main/setupAddRemovePlugin.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workbench/src/main/setupAddRemovePlugin.js b/workbench/src/main/setupAddRemovePlugin.js
index f44e023e0..37dfd8644 100644
--- a/workbench/src/main/setupAddRemovePlugin.js
+++ b/workbench/src/main/setupAddRemovePlugin.js
@@ -57,6 +57,7 @@ export function setupAddPlugin() {
         let pyprojectTOML;
         let installString;
         const micromamba = settingsStore.get('micromamba');
+        const rootPrefix = upath.join(process.resourcesPath, 'micromamba_envs');
         if (url) { // install from git URL
           if (revision) {
             installString = `git+${url}@${revision}`;
@@ -65,8 +66,7 @@ export function setupAddPlugin() {
             installString = `git+${url}`;
             logger.info(`adding plugin from ${installString} at default branch`);
           }
-          
-          const rootPrefix = upath.join(process.resourcesPath, 'micromamba_envs');
+
           const baseEnvPrefix = upath.join(rootPrefix, 'invest_base');
           // Create invest_base environment, if it doesn't already exist
           // The purpose of this environment is just to ensure that git is available
@@ -111,7 +111,7 @@ export function setupAddPlugin() {
             upath.join(path, 'pyproject.toml')
           ).toString());
         }
-        
+
         // Access plugin metadata from the pyproject.toml
         const pluginID = pyprojectTOML.tool.natcap.invest.model_id;
         const pluginName = pyprojectTOML.tool.natcap.invest.model_name;