scripts: Use main output panel for output

Signed-off-by: ricekot <[email protected]>

Author: ricekot

addOns/commonlib/src/main/java/org/zaproxy/addon/commonlib/ui/TabbedOutputPanel.java

@@ -378,6 +378,23 @@ public void clear(String sourceName) {
         }
     }
 
+    /**
+     * Sets the selected output tab, creating it if it doesn't exist.
+     *
+     * @param sourceName the name of the corresponding output source
+     */
+    public void setSelectedOutputTab(String sourceName) {
+        addNewOutputSource(sourceName);
+        tabbedPanel.getTabList().stream()
+                .filter(t -> t.getName().equals(sourceName))
+                .findFirst()
+                .ifPresent(
+                        component -> {
+                            tabbedPanel.setVisible(component, true);
+                            tabbedPanel.setSelectedComponent(component);
+                        });
+    }
+
     private void doAppend(ZapTextArea txtOutput, String message) {
         if (Model.getSingleton()
                 .getOptionsParam()

addOns/scripts/CHANGELOG.md

@@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Remove unnecessary custom parameter handling.
 
+### Changed
+- Use the main Output panel for script output.
+
 ## [45.8.0] - 2025-01-10
 ### Added
 - Report indirect script errors while the Automation Framework plans are running (Issue 8586).

addOns/scripts/scripts.gradle.kts

@@ -30,7 +30,7 @@ zapAddOn {
         dependencies {
             addOns {
                 register("commonlib") {
-                    version.set(">=1.29.0")
+                    version.set(">=1.31.0")
                 }
                 register("pscan") {
                     version.set(">= 0.1.0 & < 1.0.0")

addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java

@@ -46,7 +46,6 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JSplitPane;
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
@@ -56,6 +55,8 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.control.Control;
 import org.parosproxy.paros.extension.AbstractPanel;
+import org.parosproxy.paros.view.OutputPanel;
+import org.zaproxy.addon.commonlib.ui.TabbedOutputPanel;
 import org.zaproxy.zap.ZAP;
 import org.zaproxy.zap.extension.script.ScriptWrapper;
 import org.zaproxy.zap.utils.DisplayUtils;
@@ -86,7 +87,6 @@ public class ConsolePanel extends AbstractPanel {
     private JButton optionsButton;
     private JLabel scriptTitle = null;
     private CommandPanel commandPanel = null;
-    private OutputPanel outputPanel = null;
     private KeyListener listener = null;
 
     private ScriptWrapper script = null;
@@ -135,15 +135,8 @@ public ConsolePanel(ExtensionScriptsUI extension) {
         panelContent = new JPanel(new GridBagLayout());
         this.add(panelContent, BorderLayout.CENTER);
 
-        JSplitPane splitPane = new JSplitPane();
-        splitPane.setDividerSize(3);
-        splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
-        splitPane.setResizeWeight(0.5D);
-        splitPane.setTopComponent(getCommandPanel());
-        splitPane.setBottomComponent(getOutputPanel());
-
         panelContent.add(this.getPanelToolbar(), LayoutHelper.getGBC(0, 0, 1, 1.0D, 0.0D));
-        panelContent.add(splitPane, LayoutHelper.getGBC(0, 1, 1, 1.0D, 1.0D));
+        panelContent.add(getCommandPanel(), LayoutHelper.getGBC(0, 1, 1, 1.0D, 1.0D));
     }
 
     private boolean isScriptUpdatedOnDisk() {
@@ -455,8 +448,11 @@ private void runScript() {
         }
 
         getRunButton().setEnabled(false);
-
-        getOutputPanel().preScriptInvoke();
+        OutputPanel outputPanel = extension.getView().getOutputPanel();
+        outputPanel.setTabFocus();
+        if (outputPanel instanceof TabbedOutputPanel tabbedOutputPanel) {
+            tabbedOutputPanel.setSelectedOutputTab(script.getName());
+        }
 
         // Update it, in case its been changed
         script.setContents(getCommandScript());
@@ -546,19 +542,6 @@ public void actionPerformed(ActionEvent e) {
         return commandPanel;
     }
 
-    protected OutputPanel getOutputPanel() {
-        if (outputPanel == null) {
-            outputPanel = new OutputPanel(extension);
-            resetOutputPanel();
-        }
-        return outputPanel;
-    }
-
-    protected void resetOutputPanel() {
-        outputPanel.clear();
-        outputPanel.append(Constant.messages.getString("scripts.welcome.results"));
-    }
-
     public String getCommandScript() {
         return this.getCommandPanel().getCommandScript();
     }
@@ -796,7 +779,14 @@ public void run() {
             try {
                 extension.getExtScript().invokeScript(script);
             } catch (Exception e) {
-                getOutputPanel().append(e);
+                if (extension.getView() != null) {
+                    extension
+                            .getView()
+                            .getOutputPanel()
+                            .append(
+                                    ExtensionScriptsUI.extractScriptExceptionMessage(e),
+                                    script.getName());
+                }
             } finally {
                 WeakReference<ScriptExecutorThread> refScriptExecutorThread =
                         runnableScriptsToThreadMap.remove(script);