Allow bookmarks in periodic query notification

modules/webapp/src/main/elm/Messages/Comp/BookmarkDropdown.elm

@@ -0,0 +1,43 @@
+{-
+   Copyright 2020 Eike K. & Contributors
+
+   SPDX-License-Identifier: AGPL-3.0-or-later
+-}
+
+
+module Messages.Comp.BookmarkDropdown exposing
+    ( Texts
+    , de
+    , gb
+    )
+
+import Messages.Basics
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , placeholder : String
+    , personal : String
+    , collective : String
+    , share : String
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , placeholder = "Bookmark…"
+    , personal = "Personal"
+    , collective = "Collective"
+    , share = "Share"
+    }
+
+
+de : Texts
+de =
+    { basics = Messages.Basics.de
+    , placeholder = "Bookmark…"
+    , personal = "Persönlich"
+    , collective = "Kollektiv"
+    , share = "Freigabe"
+    }

modules/webapp/src/main/elm/Messages/Comp/BookmarkQueryForm.elm

@@ -33,7 +33,7 @@ gb =
     , userLocationText = "The bookmarked query is just for you"
     , collectiveLocation = "Collective scope"
     , collectiveLocationText = "The bookmarked query can be used and edited by all users"
-    , nameExistsWarning = "A bookmark with this name exists!"
+    , nameExistsWarning = "A bookmark with this name exists! Choose another name."
     }
 
 
@@ -45,5 +45,5 @@ de =
     , userLocationText = "Der Bookmark ist nur für dich"
     , collectiveLocation = "Kollektiv-Bookmark"
     , collectiveLocationText = "Der Bookmark kann von allen Benutzer verwendet werden"
-    , nameExistsWarning = "Der Bookmark existiert bereits!"
+    , nameExistsWarning = "Der Bookmark existiert bereits! Verwende einen anderen Namen."
     }

modules/webapp/src/main/elm/Messages/Comp/PeriodicQueryTaskForm.elm

@@ -14,6 +14,7 @@ module Messages.Comp.PeriodicQueryTaskForm exposing
 import Data.ChannelType exposing (ChannelType)
 import Http
 import Messages.Basics
+import Messages.Comp.BookmarkDropdown
 import Messages.Comp.CalEventInput
 import Messages.Comp.ChannelForm
 import Messages.Comp.HttpError
@@ -24,6 +25,7 @@ type alias Texts =
     { basics : Messages.Basics.Texts
     , calEventInput : Messages.Comp.CalEventInput.Texts
     , channelForm : Messages.Comp.ChannelForm.Texts
+    , bookmarkDropdown : Messages.Comp.BookmarkDropdown.Texts
     , httpError : Http.Error -> String
     , reallyDeleteTask : String
     , startOnce : String
@@ -49,6 +51,7 @@ gb =
     , calEventInput = Messages.Comp.CalEventInput.gb
     , channelForm = Messages.Comp.ChannelForm.gb
     , httpError = Messages.Comp.HttpError.gb
+    , bookmarkDropdown = Messages.Comp.BookmarkDropdown.gb
     , reallyDeleteTask = "Really delete this notification task?"
     , startOnce = "Start Once"
     , startTaskNow = "Start this task now"
@@ -66,7 +69,7 @@ gb =
     , invalidCalEvent = "The calendar event is not valid."
     , queryLabel = "Query"
     , channelRequired = "A valid channel must be given."
-    , queryStringRequired = "A query string must be supplied"
+    , queryStringRequired = "A query string and/or bookmark must be supplied"
     , channelHeader = \ct -> "Connection details for " ++ Messages.Data.ChannelType.gb ct
     }
 
@@ -77,6 +80,7 @@ de =
     , calEventInput = Messages.Comp.CalEventInput.de
     , channelForm = Messages.Comp.ChannelForm.de
     , httpError = Messages.Comp.HttpError.de
+    , bookmarkDropdown = Messages.Comp.BookmarkDropdown.de
     , reallyDeleteTask = "Diesen Benachrichtigungsauftrag wirklich löschen?"
     , startOnce = "Jetzt starten"
     , startTaskNow = "Starte den Auftrag sofort"
@@ -94,6 +98,6 @@ de =
     , invalidCalEvent = "Das Kalenderereignis ist nicht gültig."
     , queryLabel = "Abfrage"
     , channelRequired = "Ein Versandkanal muss angegeben werden."
-    , queryStringRequired = "Eine Suchabfrage muss angegeben werden."
+    , queryStringRequired = "Eine Suchabfrage und/oder ein Bookmark muss angegeben werden."
     , channelHeader = \ct -> "Details für " ++ Messages.Data.ChannelType.de ct
     }