Re-implement the "copy from inbox" feature.

This can be used to make Kanmail work with Gmail labels better by keeping emails in the inbox when moving them to other folders, meaning they remain in the Gmail inbox and get labelled with the folder name.
Oxygem · Jan 15, 2022 · 382fc28 · 382fc28
1 parent ccc885f
commit 382fc28
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/kanmail/client/components/settings/AccountForm.jsx b/kanmail/client/components/settings/AccountForm.jsx
@@ -413,6 +413,15 @@ export default class AccountForm extends React.Component {
                                 'type': 'checkbox'
                             })}
                         </div>
+                        <div className="half">
+                            <label
+                                className="checkbox"
+                                htmlFor="folderSettings-copy_from_inbox"
+                            >Copy (not move) emails out of the inbox?</label>
+                            {this.renderInput('folderSettings', 'copy_from_inbox', {
+                                'type': 'checkbox'
+                            })}
+                        </div>
                     </div>
                 </div>
 

diff --git a/kanmail/client/util/threads.js b/kanmail/client/util/threads.js
@@ -1,17 +1,22 @@
 import _ from 'lodash';
 
 import requestStore from 'stores/request.js';
+import settingsStore from 'stores/settings.js';
 import { getColumnStore } from 'stores/columns.js';
 import { getEmailStore } from 'stores/emailStoreProxy.js';
 
-
 export function moveOrCopyThread(moveData, targetFolder, setIsMovingFunction=null) {
     setIsMovingFunction = setIsMovingFunction || moveData.sourceThreadComponent.setIsMoving;
     setIsMovingFunction();
 
     const { messageUids, oldColumn, accountName, thread } = moveData;
     const emailStore = getEmailStore();
 
+    const accountSettings = settingsStore.getAccountSettings(accountName);
+    const handler =
+        accountSettings.folders.copy_from_inbox === true && oldColumn == 'inbox' ?
+        emailStore.copyEmails : emailStore.moveEmails;
+
     const targetColumnStore = getColumnStore(targetFolder);
     targetColumnStore.addIncomingThread(thread);
 
@@ -21,7 +26,7 @@ export function moveOrCopyThread(moveData, targetFolder, setIsMovingFunction=nul
     }
 
     const moveThread = () => {
-        emailStore.moveEmails(accountName, messageUids, oldColumn, targetFolder).then(() => {
+        handler(accountName, messageUids, oldColumn, targetFolder).then(() => {
             emailStore.syncFolderEmails(
                 oldColumn,
                 {accountName: accountName},

diff --git a/kanmail/settings/model.py b/kanmail/settings/model.py
@@ -68,6 +68,7 @@
                 # Folder settings
                 'save_sent_copies': bool,
                 'delete_on_trash': bool,
+                'copy_from_inbox': bool,
                 # Folder aliases
                 **{
                     alias: str