#418 #477 Refactor Todo settings, add predefined Todo apps list

* add condition if on todo options

* add drop down for  todo server

* fix error TODOS_FRONTEND

* add todo list apps'

* update name of dropdown menu to Todo Service

* add other service to dropdown menu and subsetting field for user to input url

* add Other Service to drop down

* fixed typos

* reverted wording

* fix custom field

* fix linting

* fix linting

* Delete tsconfig.tsbuildinfo

* Delete tsconfig.tsbuildinfo

* Delete tsconfig.tsbuildinfo

* Add regex to validate custom todo url

* Add note with source of regex function

* Move regex function declaration to function body root

* Apply code style

* Add migration for todo settings

* Apply code style

Co-authored-by: romain <romain@jumboprivacy.com>
Co-authored-by: Roman <46404814+yourcontact@users.noreply.github.com>
Co-authored-by: romain <rpsa@pm.me>

5 files changed, 47 insertions, 19 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index a5c83d7ab..906172221 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4342,7 +4342,20 @@
           "line": 82
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.todoServer",
+        "id": "settings.app.form.predefinedTodoServer",
+        "start": {
+          "column": 14,
+          "line": 79
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom Todo Server",
+        "end": {
+          "column": 3,
+          "line": 82
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 14,
           "line": 79
@@ -5449,39 +5462,39 @@
         "defaultMessage": "!!!Franz Todos are available to premium users now!",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 30
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.info",
         "start": {
           "column": 15,
-          "line": 17
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Upgrade Account",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 34
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.upgrade",
         "start": {
           "column": 14,
-          "line": 21
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Everyone else will have to wait a little longer.",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 38
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.rollout",
         "start": {
           "column": 15,
-          "line": 25
+          "line": 35
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 0762e855f..3306febe1 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -277,6 +277,7 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -293,6 +294,7 @@
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -304,7 +306,6 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -324,7 +325,7 @@
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -510,4 +511,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
+}
\ No newline at end of file
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
index fe51488c7..32960f8ce 100644
--- a/src/i18n/locales/whitelist_en-US.json
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -1 +1,2 @@
-[]
+[
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 6777a0d83..4293c93b4 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -156,7 +156,7 @@
     }
   },
   {
-    "id": "settings.app.form.todoServer",
+    "id": "settings.app.form.predefinedTodoServer",
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
@@ -169,6 +169,19 @@
     }
   },
   {
+    "id": "settings.app.form.customTodoServer",
+    "defaultMessage": "!!!Custom Todo Server",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 79,
+      "column": 14
+    },
+    "end": {
+      "line": 82,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.enableLock",
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
@@ -454,4 +467,4 @@
       "column": 3
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
index 19ea81171..173389570 100644
--- a/src/i18n/messages/src/features/todos/components/TodosWebview.json
+++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Franz Todos are available to premium users now!",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 17,
+      "line": 27,
       "column": 15
     },
     "end": {
-      "line": 20,
+      "line": 30,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade Account",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 21,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 24,
+      "line": 34,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Everyone else will have to wait a little longer.",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 25,
+      "line": 35,
       "column": 15
     },
     "end": {
-      "line": 28,
+      "line": 38,
       "column": 3
     }
   }