Streamline form and input field

modules/restapi/src/main/resources/docspell-openapi.yml

@@ -1636,8 +1636,10 @@ components:
           type: string
           format: calevent
         next:
-          type: integer
+          type: array
-          format: date-time
+          items:
+            type: integer
+            format: date-time
     CalEventCheck:
       description: |
         A calendar event.

modules/restserver/src/main/scala/docspell/restserver/routes/CalEventCheckRoutes.scala

@@ -31,10 +31,12 @@ object CalEventCheckRoutes {
     Timestamp.current[F].map { now =>
       CalEvent.parse(str) match {
         case Right(ev) =>
-          val next = ev.nextElapse(now.toUtcDateTime).map(Timestamp.atUtc)
+          val next = ev
+            .nextElapses(now.toUtcDateTime, 2)
+            .map(Timestamp.atUtc)
           CalEventCheckResult(true, "Valid.", ev.some, next)
         case Left(err) =>
-          CalEventCheckResult(false, err, None, None)
+          CalEventCheckResult(false, err, None, Nil)
       }
     }
 }

modules/webapp/src/main/elm/Comp/CalEventInput.elm

@@ -1,8 +1,8 @@
 module Comp.CalEventInput exposing
     ( Model
     , Msg
-    , from
     , init
+    , initialSchedule
     , update
     , view
     )
@@ -42,49 +42,26 @@ type Msg
     | CheckInputMsg (Result Http.Error CalEventCheckResult)
 
 
-init : Model
+initialSchedule : String
-init =
+initialSchedule =
-    { year = "*"
+    "*-*-01 00:00"
-    , month = "*"
-    , day = "1"
-    , hour = "0"
-    , minute = "0"
-    , weekday = Nothing
-    , event = Nothing
-    , checkResult = Nothing
-    }
 
 
-from : String -> Maybe Model
+init : Flags -> ( Model, Cmd Msg )
-from event =
+init flags =
-    case String.split " " event of
+    let
-        date :: time :: [] ->
+        model =
-            let
+            { year = "*"
-                dateParts =
+            , month = "*"
-                    String.split "-" date
+            , day = "1"
-
+            , hour = "0"
-                timeParts =
+            , minute = "0"
-                    String.split ":" time
+            , weekday = Nothing
-
+            , event = Nothing
-                allParts =
+            , checkResult = Nothing
-                    dateParts ++ timeParts
+            }
-            in
+    in
-            case allParts of
+    ( model, checkInput flags model )
-                y :: m :: d :: h :: min :: [] ->
-                    Just
-                        { init
-                            | year = y
-                            , month = m
-                            , day = d
-                            , hour = h
-                            , minute = min
-                        }
-
-                _ ->
-                    Nothing
-
-        _ ->
-            Nothing
 
 
 toEvent : Model -> String
@@ -315,11 +292,12 @@ view extraClasses model =
                     [ text "Next: "
                     ]
                 , dd []
-                    [ Maybe.andThen .next model.checkResult
+                    (Maybe.map .next model.checkResult
-                        |> Maybe.map Util.Time.formatDateTime
+                        |> Maybe.withDefault []
-                        |> Maybe.withDefault ""
+                        |> List.map Util.Time.formatDateTime
-                        |> text
+                        |> List.map text
-                    ]
+                        |> List.intersperse (br [] [])
+                    )
                 ]
             ]
         ]

modules/webapp/src/main/elm/Comp/NotificationForm.elm

@@ -18,7 +18,7 @@ import Comp.IntField
 import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Html.Events exposing (onCheck, onClick, onInput)
+import Html.Events exposing (onCheck, onClick)
 import Http
 import Util.Http
 import Util.Tag
@@ -62,13 +62,12 @@ initCmd flags =
         ]
 
 
-initialSchedule : String
-initialSchedule =
-    "*-*-1/7 12:00"
-
-
 init : Flags -> ( Model, Cmd Msg )
 init flags =
+    let
+        ( sm, sc ) =
+            Comp.CalEventInput.init flags
+    in
     ( { settings = Api.Model.NotificationSettings.empty
       , connectionModel =
             Comp.Dropdown.makeSingle
@@ -82,13 +81,14 @@ init flags =
       , remindDays = Just 1
       , remindDaysModel = Comp.IntField.init (Just 1) Nothing True "Remind Days"
       , enabled = False
-      , schedule = initialSchedule
+      , schedule = Comp.CalEventInput.initialSchedule
-      , scheduleModel =
+      , scheduleModel = sm
-            Comp.CalEventInput.from initialSchedule
-                |> Maybe.withDefault Comp.CalEventInput.init
       , formError = Nothing
       }
-    , initCmd flags
+    , Cmd.batch
+        [ initCmd flags
+        , Cmd.map CalEventMsg sc
+        ]
     )
 
 
@@ -277,7 +277,9 @@ view extraClasses model =
             , Html.map CalEventMsg
                 (Comp.CalEventInput.view "" model.scheduleModel)
             , span [ class "small-info" ]
-                [ text "Specify how often and when this task should run."
+                [ text "Specify how often and when this task should run. "
+                , text "Use English 3-letter weekdays. Either a single value, "
+                , text "a list or a '*' (meaning all) is allowed for each part."
                 ]
             ]
         , div [ class "ui divider" ] []