Merge pull request #2623 from jlawyerorg/feat/add_endpoints_emailtemp…

…lates adds endpoint for retrieving email-templates incl. placeholders
jlawyerorg · Oct 27, 2024 · faa7845 · faa7845
2 parents 34b0163 + 5aca71f
commit faa7845
Show file tree

Hide file tree

Showing 8 changed files with 354 additions and 73 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/HtmlEditorPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/HtmlEditorPanel.java
@@ -666,25 +666,35 @@
 import com.jdimension.jlawyer.server.utils.ContentTypes;
 import java.awt.Component;
 import java.awt.Container;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JEditorPane;
+import javax.swing.KeyStroke;
 import org.apache.log4j.Logger;
+import javax.swing.undo.UndoManager;
 
 /**
  *
  * @author Kutschke
  */
 public class HtmlEditorPanel extends javax.swing.JPanel implements EditorImplementation {
 
+    private final UndoManager undoManager;
     private static final Logger log=Logger.getLogger(HtmlEditorPanel.class.getName());
 
     /**
      * Creates new form HtmlEditorPanel
      */
     public HtmlEditorPanel() {
         initComponents();
-    }
+
+        undoManager = new UndoManager();
+        setupUndoRedoForEditorPane(htmlPane);    }
 
     /**
      * This method is called from within the constructor to initialize the form.
@@ -822,5 +832,54 @@ private boolean insertToEditorPane(Container c, String t, int pos) {
         }
         return false;
     }
+
+    private void setupUndoRedoForEditorPane(Container container) {
+        for (Component comp : container.getComponents()) {
+            if (comp instanceof JEditorPane) {
+                JEditorPane editorPane = (JEditorPane) comp;
+                editorPane.getDocument().addUndoableEditListener(e -> undoManager.addEdit(e.getEdit()));
+
+                // Setup key bindings for undo
+                KeyStroke undoKeystroke = KeyStroke.getKeyStroke(
+                    KeyEvent.VK_Z, 
+                    Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()
+                );
+
+                // Setup key bindings for redo
+                KeyStroke redoKeystroke = KeyStroke.getKeyStroke(
+                    KeyEvent.VK_Y, 
+                    Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()
+                );
+
+                editorPane.getInputMap(JComponent.WHEN_FOCUSED).put(undoKeystroke, "Undo");
+                editorPane.getActionMap().put("Undo", new AbstractAction("Undo") {
+                    @Override
+                    public void actionPerformed(ActionEvent evt) {
+                        if (undoManager.canUndo()) {
+                            undoManager.undo();
+                        }
+                    }
+                });
+
+                editorPane.getInputMap(JComponent.WHEN_FOCUSED).put(redoKeystroke, "Redo");
+                editorPane.getActionMap().put("Redo", new AbstractAction("Redo") {
+                    @Override
+                    public void actionPerformed(ActionEvent evt) {
+                        if (undoManager.canRedo()) {
+                            undoManager.redo();
+                        }
+                    }
+                });
+
+                break;  // Found the editor pane, no need to continue
+            } else if (comp instanceof Container) {
+                setupUndoRedoForEditorPane((Container) comp);
+            }
+        }
+    }
+
+    public UndoManager getUndoManager() {
+        return undoManager;
+    }
 
 }
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/TextEditorPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/TextEditorPanel.java
@@ -664,20 +664,64 @@
 package com.jdimension.jlawyer.client.mail;
 
 import com.jdimension.jlawyer.server.utils.ContentTypes;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
 import javax.swing.KeyStroke;
+import javax.swing.undo.UndoManager;
 
 /**
  *
  * @author Kutschke
  */
 public class TextEditorPanel extends javax.swing.JPanel implements EditorImplementation {
-
+
+    private final UndoManager undoManager;
+
     /**
      * Creates new form TextEditorPanel
      */
     public TextEditorPanel() {
         initComponents();
 
+        // Initialize UndoManager
+        undoManager = new UndoManager();
+        taText.getDocument().addUndoableEditListener(e -> undoManager.addEdit(e.getEdit()));
+
+        // Setup key bindings for undo
+        KeyStroke undoKeystroke = KeyStroke.getKeyStroke(
+            KeyEvent.VK_Z, 
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()
+        );
+
+        // Setup key bindings for redo
+        KeyStroke redoKeystroke = KeyStroke.getKeyStroke(
+            KeyEvent.VK_Y, 
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()
+        );
+
+        taText.getInputMap(JComponent.WHEN_FOCUSED).put(undoKeystroke, "Undo");
+        taText.getActionMap().put("Undo", new AbstractAction("Undo") {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                if (undoManager.canUndo()) {
+                    undoManager.undo();
+                }
+            }
+        });
+
+        taText.getInputMap(JComponent.WHEN_FOCUSED).put(redoKeystroke, "Redo");
+        taText.getActionMap().put("Redo", new AbstractAction("Redo") {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                if (undoManager.canRedo()) {
+                    undoManager.redo();
+                }
+            }
+        });
+
         // this is required because the scroll pane was stealing those key strokes from its jtextarea, making it impossible to scroll using the keys
         this.jScrollPane2.getInputMap().put(KeyStroke.getKeyStroke("UP"), "none");
         this.jScrollPane2.getInputMap().put(KeyStroke.getKeyStroke("DOWN"), "none");
@@ -764,4 +808,9 @@ public String getSelectedText() {
     public void insert(String t, int pos) {
         this.taText.insert(t, pos);
     }
+
+
+    public UndoManager getUndoManager() {
+        return undoManager;
+    }
 }
diff --git a/j-lawyer-server/j-lawyer-io/src/java/org/jlawyer/io/rest/v6/TemplatesEndpointLocalV6.java b/j-lawyer-server/j-lawyer-io/src/java/org/jlawyer/io/rest/v6/TemplatesEndpointLocalV6.java
@@ -682,5 +682,8 @@ public interface TemplatesEndpointLocalV6 {
     Response getPlaceHoldersForTemplate(String folder, String template, String caseId);
 
     Response addDocumentFromTemplate(String caseId, String fileName, String templateFolder, String template, List<RestfulPlaceholderV6> placeHolderValues) throws Exception;
+
+    Response listEmailTemplates();
 
+    Response getEmailFromTemplate(String templateName, String caseId);
 }