requested changes

Author: Meriem-BenIsmail

jupyterlab_git/__init__.py

@@ -51,6 +51,19 @@ class JupyterLabGit(Configurable):
         config=True,
     )
 
+    output_cleaning_command = Unicode(
+        "jupyter nbconvert",
+        help="Notebook cleaning command. Configurable by server admin.",
+        config=True,
+    )
+
+    # Extra options to pass to the cleaning tool
+    output_cleaning_options = Unicode(
+        "--ClearOutputPreprocessor.enabled=True --inplace",
+        help="Extra command-line options to pass to the cleaning tool.",
+        config=True,
+    )
+
     @default("credential_helper")
     def _credential_helper_default(self):
         return "cache --timeout=3600"

jupyterlab_git/git.py

@@ -1214,17 +1214,13 @@ async def strip_notebook_outputs(self, notebooks: list, repo_path: str):
             full_path = os.path.join(repo_path, nb_path)
 
             try:
-                # Clear outputs using nbconvert
-                subprocess.run(
-                    [
-                        "jupyter",
-                        "nbconvert",
-                        "--ClearOutputPreprocessor.enabled=True",
-                        "--inplace",
-                        full_path,
-                    ],
-                    check=True,
-                )
+                cmd = shlex.split(self._config.output_cleaning_command)
+                options = shlex.split(self._config.output_cleaning_options)
+
+                full_cmd = cmd + options + [full_path]
+
+                # Run the cleaning command
+                subprocess.run(full_cmd, check=True)
 
                 # Re-stage the cleaned notebook
                 subprocess.run(["git", "-C", repo_path, "add", full_path], check=True)

schema/plugin.json

@@ -86,8 +86,9 @@
     "clearOutputsBeforeCommit": {
       "type": "boolean",
       "title": "Clear outputs before commit",
-      "description": "If true, notebook outputs will be cleared before committing.",
-      "default": false
+      "description": "If true, notebook outputs will be cleared before committing. If false, outputs are kept. If null, ask each time.",
+      "default": null,
+      "nullable": true
     }
   },
   "jupyter.lab.shortcuts": [

src/components/GitPanel.tsx

@@ -35,6 +35,7 @@ import { HistorySideBar } from './HistorySideBar';
 import { RebaseAction } from './RebaseAction';
 import { Toolbar } from './Toolbar';
 import { WarningBox } from './WarningBox';
+import { Widget } from '@lumino/widgets';
 
 /**
  * Interface describing component properties.
@@ -810,22 +811,29 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
       const notebooksWithOutputs =
         await this.props.model.checkNotebooksForOutputs();
 
-      if (
-        notebooksWithOutputs.length > 0 &&
-        !this.props.settings.composite['clearOutputsBeforeCommit']
-      ) {
+      const clearSetting =
+        this.props.settings.composite['clearOutputsBeforeCommit'];
+      if (notebooksWithOutputs.length > 0 && clearSetting == null) {
+        const bodyWidget = new Widget();
+        bodyWidget.node.innerHTML = `
+            <div>
+              <p>Clear all outputs before committing?</p>
+              <label>
+                <input type="checkbox" id="dontAskAgain" /> Save my preference
+              </label>
+            </div>
+          `;
+
         const dialog = new Dialog({
           title: this.props.trans.__('Notebook outputs detected'),
-          body: `You are about to commit ${notebooksWithOutputs.length} notebook(s) with outputs. 
-            Would you like to clean them before committing? If you prefer not to be asked every time, you can enable the "Clear outputs before commit" option in the settings.`,
+          body: bodyWidget,
           buttons: [
             Dialog.cancelButton({
-              label: this.props.trans.__('Commit Anyway')
+              label: this.props.trans.__('Keep Outputs & Commit')
             }),
-            Dialog.okButton({
-              label: this.props.trans.__('Clean & Commit')
-            })
-          ]
+            Dialog.okButton({ label: this.props.trans.__('Clean & Commit') })
+          ],
+          defaultButton: 0
         });
 
         const result = await dialog.launch();
@@ -835,9 +843,14 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
           return;
         }
         const accepted =
-          typeof result.button.accept === 'boolean'
-            ? result.button.accept
-            : result.button.label === this.props.trans.__('Clean & Commit');
+          result.button.label === this.props.trans.__('Clean & Commit');
+        const checkbox =
+          bodyWidget.node.querySelector<HTMLInputElement>('#dontAskAgain');
+
+        // Remember the user’s choice if checkbox is checked
+        if (checkbox?.checked) {
+          this.props.settings.set('clearOutputsBeforeCommit', accepted);
+        }
         if (accepted) {
           id = Notification.emit(
             this.props.trans.__('Cleaning notebook outputs…'),
@@ -847,7 +860,8 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
 
           await this.props.model.stripNotebooksOutputs(notebooksWithOutputs);
         }
-      } else if (this.props.settings.composite['clearOutputsBeforeCommit']) {
+      } else if (clearSetting === true) {
+        // Always clean before commit
         id = Notification.emit(
           this.props.trans.__('Cleaning notebook outputs…'),
           'in-progress',