Add classifier settings

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

@@ -10,10 +10,12 @@ module Comp.CollectiveSettingsForm exposing
 import Api
 import Api.Model.BasicResult exposing (BasicResult)
 import Api.Model.CollectiveSettings exposing (CollectiveSettings)
+import Comp.ClassifierSettingsForm
 import Comp.Dropdown
 import Data.Flags exposing (Flags)
 import Data.Language exposing (Language)
 import Data.UiSettings exposing (UiSettings)
+import Data.Validated exposing (Validated)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onClick, onInput)
@@ -27,44 +29,58 @@ type alias Model =
     , initSettings : CollectiveSettings
     , fullTextConfirmText : String
     , fullTextReIndexResult : Maybe BasicResult
+    , classifierModel : Comp.ClassifierSettingsForm.Model
     }
 
 
-init : CollectiveSettings -> Model
-init settings =
+init : Flags -> CollectiveSettings -> ( Model, Cmd Msg )
+init flags settings =
     let
         lang =
             Data.Language.fromString settings.language
                 |> Maybe.withDefault Data.Language.German
+
+        ( cm, cc ) =
+            Comp.ClassifierSettingsForm.init flags settings.classifier
     in
-    { langModel =
-        Comp.Dropdown.makeSingleList
-            { makeOption =
-                \l ->
-                    { value = Data.Language.toIso3 l
-                    , text = Data.Language.toName l
-                    , additional = ""
-                    }
-            , placeholder = ""
-            , options = Data.Language.all
-            , selected = Just lang
-            }
-    , intEnabled = settings.integrationEnabled
-    , initSettings = settings
-    , fullTextConfirmText = ""
-    , fullTextReIndexResult = Nothing
-    }
+    ( { langModel =
+            Comp.Dropdown.makeSingleList
+                { makeOption =
+                    \l ->
+                        { value = Data.Language.toIso3 l
+                        , text = Data.Language.toName l
+                        , additional = ""
+                        }
+                , placeholder = ""
+                , options = Data.Language.all
+                , selected = Just lang
+                }
+      , intEnabled = settings.integrationEnabled
+      , initSettings = settings
+      , fullTextConfirmText = ""
+      , fullTextReIndexResult = Nothing
+      , classifierModel = cm
+      }
+    , Cmd.map ClassifierSettingMsg cc
+    )
 
 
-getSettings : Model -> CollectiveSettings
+getSettings : Model -> Validated CollectiveSettings
 getSettings model =
-    CollectiveSettings
-        (Comp.Dropdown.getSelected model.langModel
-            |> List.head
-            |> Maybe.map Data.Language.toIso3
-            |> Maybe.withDefault model.initSettings.language
+    Data.Validated.map
+        (\cls ->
+            { language =
+                Comp.Dropdown.getSelected model.langModel
+                    |> List.head
+                    |> Maybe.map Data.Language.toIso3
+                    |> Maybe.withDefault model.initSettings.language
+            , integrationEnabled = model.intEnabled
+            , classifier = cls
+            }
+        )
+        (Comp.ClassifierSettingsForm.getSettings
+            model.classifierModel
         )
-        model.intEnabled
 
 
 type Msg
@@ -73,6 +89,8 @@ type Msg
     | SetFullTextConfirm String
     | TriggerReIndex
     | TriggerReIndexResult (Result Http.Error BasicResult)
+    | ClassifierSettingMsg Comp.ClassifierSettingsForm.Msg
+    | SaveSettings
 
 
 update : Flags -> Msg -> Model -> ( Model, Cmd Msg, Maybe CollectiveSettings )
@@ -85,22 +103,15 @@ update flags msg model =
 
                 nextModel =
                     { model | langModel = m2 }
-
-                nextSettings =
-                    if Comp.Dropdown.isDropdownChangeMsg m then
-                        Just (getSettings nextModel)
-
-                    else
-                        Nothing
             in
-            ( nextModel, Cmd.map LangDropdownMsg c2, nextSettings )
+            ( nextModel, Cmd.map LangDropdownMsg c2, Nothing )
 
         ToggleIntegrationEndpoint ->
             let
                 nextModel =
                     { model | intEnabled = not model.intEnabled }
             in
-            ( nextModel, Cmd.none, Just (getSettings nextModel) )
+            ( nextModel, Cmd.none, Nothing )
 
         SetFullTextConfirm str ->
             ( { model | fullTextConfirmText = str }, Cmd.none, Nothing )
@@ -138,6 +149,26 @@ update flags msg model =
             , Nothing
             )
 
+        ClassifierSettingMsg lmsg ->
+            let
+                ( cm, cc ) =
+                    Comp.ClassifierSettingsForm.update flags lmsg model.classifierModel
+            in
+            ( { model
+                | classifierModel = cm
+              }
+            , Cmd.map ClassifierSettingMsg cc
+            , Nothing
+            )
+
+        SaveSettings ->
+            case getSettings model of
+                Data.Validated.Valid s ->
+                    ( model, Cmd.none, Just s )
+
+                _ ->
+                    ( model, Cmd.none, Nothing )
+
 
 view : Flags -> UiSettings -> Model -> Html Msg
 view flags settings model =
@@ -232,4 +263,31 @@ view flags settings model =
                     |> text
                 ]
             ]
+        , h3
+            [ classList
+                [ ( "ui dividing header", True )
+                , ( "invisible hidden", False )
+                ]
+            ]
+            [ text "Document Classifier"
+            ]
+        , div
+            [ classList
+                [ ( "field", True )
+                , ( "invisible hidden", False )
+                ]
+            ]
+            [ Html.map ClassifierSettingMsg
+                (Comp.ClassifierSettingsForm.view model.classifierModel)
+            ]
+        , div [ class "ui divider" ] []
+        , button
+            [ classList
+                [ ( "ui primary button", True )
+                , ( "disabled", getSettings model |> Data.Validated.isInvalid )
+                ]
+            , onClick SaveSettings
+            ]
+            [ text "Save"
+            ]
         ]