From c504a3df42199c3f288fec2cba84c4d0d87a19b3 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Wed, 29 Jan 2020 20:56:14 +0100 Subject: [PATCH] Fix elm-analyse issues --- elm-analyse.json | 3 ++- modules/webapp/src/main/elm/App/Update.elm | 3 --- .../webapp/src/main/elm/Comp/ChangePasswordForm.elm | 2 +- modules/webapp/src/main/elm/Comp/DatePicker.elm | 2 +- modules/webapp/src/main/elm/Comp/Dropdown.elm | 9 --------- modules/webapp/src/main/elm/Comp/EmailInput.elm | 2 +- .../webapp/src/main/elm/Comp/EmailSettingsManage.elm | 2 +- modules/webapp/src/main/elm/Comp/EquipmentForm.elm | 2 +- modules/webapp/src/main/elm/Comp/EquipmentTable.elm | 2 +- modules/webapp/src/main/elm/Comp/ItemDetail.elm | 2 +- modules/webapp/src/main/elm/Comp/ItemList.elm | 4 ++-- modules/webapp/src/main/elm/Comp/ItemMail.elm | 2 +- modules/webapp/src/main/elm/Comp/OrgTable.elm | 2 +- modules/webapp/src/main/elm/Comp/PersonTable.elm | 2 +- modules/webapp/src/main/elm/Comp/SentMails.elm | 10 +++++++++- modules/webapp/src/main/elm/Comp/Settings.elm | 2 +- modules/webapp/src/main/elm/Comp/SourceForm.elm | 2 +- modules/webapp/src/main/elm/Comp/SourceTable.elm | 2 +- modules/webapp/src/main/elm/Comp/TagForm.elm | 2 +- modules/webapp/src/main/elm/Comp/TagTable.elm | 2 +- modules/webapp/src/main/elm/Comp/UserForm.elm | 2 +- modules/webapp/src/main/elm/Comp/UserTable.elm | 2 +- modules/webapp/src/main/elm/Main.elm | 1 - modules/webapp/src/main/elm/Page/Home/Data.elm | 1 - modules/webapp/src/main/elm/Page/Home/Update.elm | 1 - modules/webapp/src/main/elm/Page/Home/View.elm | 1 - modules/webapp/src/main/elm/Page/ItemDetail/Update.elm | 2 +- modules/webapp/src/main/elm/Page/Register/Update.elm | 2 +- modules/webapp/src/main/elm/Page/Upload/Data.elm | 7 ------- modules/webapp/src/main/elm/Page/Upload/View.elm | 4 ++-- modules/webapp/src/main/elm/Ports.elm | 7 ++++++- modules/webapp/src/main/elm/Util/Http.elm | 4 ++-- modules/webapp/src/main/elm/Util/String.elm | 3 --- 33 files changed, 42 insertions(+), 54 deletions(-) diff --git a/elm-analyse.json b/elm-analyse.json index f480c705..837c4ada 100644 --- a/elm-analyse.json +++ b/elm-analyse.json @@ -3,6 +3,7 @@ "modules/webapp/target/elm-src/" ], "checks" : { - "ImportAll": false + "ImportAll": false, + "SingleFieldRecord": false } } diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm index 59d0169a..0da1a1ab 100644 --- a/modules/webapp/src/main/elm/App/Update.elm +++ b/modules/webapp/src/main/elm/App/Update.elm @@ -130,9 +130,6 @@ updateWithSub msg model = case req of Internal url -> let - newPage = - Page.fromUrl url - isCurrent = Page.fromUrl url |> Maybe.map (\p -> p == model.page) diff --git a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm index 13233ea7..62da573e 100644 --- a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm +++ b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm @@ -13,7 +13,7 @@ import Comp.PasswordInput import Data.Flags exposing (Flags) import Html exposing (..) import Html.Attributes exposing (..) -import Html.Events exposing (onClick, onInput) +import Html.Events exposing (onClick) import Http import Util.Http diff --git a/modules/webapp/src/main/elm/Comp/DatePicker.elm b/modules/webapp/src/main/elm/Comp/DatePicker.elm index fa459057..f8c0ad3f 100644 --- a/modules/webapp/src/main/elm/Comp/DatePicker.elm +++ b/modules/webapp/src/main/elm/Comp/DatePicker.elm @@ -16,7 +16,7 @@ module Comp.DatePicker exposing import Date exposing (Date) import DatePicker exposing (DateEvent, DatePicker, Settings) import Html exposing (Html) -import Time exposing (Month(..), Posix, Zone, utc) +import Time exposing (Month(..), utc) type alias Msg = diff --git a/modules/webapp/src/main/elm/Comp/Dropdown.elm b/modules/webapp/src/main/elm/Comp/Dropdown.elm index 3ab318e9..e11cb333 100644 --- a/modules/webapp/src/main/elm/Comp/Dropdown.elm +++ b/modules/webapp/src/main/elm/Comp/Dropdown.elm @@ -278,15 +278,6 @@ selectActive model = model -clearActive : Model a -> Model a -clearActive model = - { model | available = List.map (\e -> { e | active = False }) model.available } - - - --- TODO enhance update function to return this info - - isDropdownChangeMsg : Msg a -> Bool isDropdownChangeMsg cm = case cm of diff --git a/modules/webapp/src/main/elm/Comp/EmailInput.elm b/modules/webapp/src/main/elm/Comp/EmailInput.elm index cb8340b3..d356392f 100644 --- a/modules/webapp/src/main/elm/Comp/EmailInput.elm +++ b/modules/webapp/src/main/elm/Comp/EmailInput.elm @@ -149,8 +149,8 @@ view values model = ] [ text model.input ] + , renderMenu model ] - ++ [ renderMenu model ] ) diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm index d15b097e..353576af 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm @@ -9,7 +9,7 @@ module Comp.EmailSettingsManage exposing import Api import Api.Model.BasicResult exposing (BasicResult) -import Api.Model.EmailSettings exposing (EmailSettings) +import Api.Model.EmailSettings import Api.Model.EmailSettingsList exposing (EmailSettingsList) import Comp.EmailSettingsForm import Comp.EmailSettingsTable diff --git a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm index c079bba8..9cf37b46 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm @@ -44,7 +44,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetEquipment t -> ( { model | equipment = t, name = t.name }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm index c72dd898..f89d3afa 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm @@ -33,7 +33,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetEquipments list -> ( { model | equips = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm index 0f4ff2db..fe4d03df 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm @@ -818,7 +818,7 @@ update key flags next msg model = in ( { model | sentMails = sm }, Cmd.none ) - SentMailsResp (Err err) -> + SentMailsResp (Err _) -> ( model, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/ItemList.elm b/modules/webapp/src/main/elm/Comp/ItemList.elm index 7313d16d..a6876184 100644 --- a/modules/webapp/src/main/elm/Comp/ItemList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemList.elm @@ -65,7 +65,7 @@ openAllGroups model = update : Flags -> Msg -> Model -> ( Model, Cmd Msg, Maybe ItemLight ) -update flags msg model = +update _ msg model = case msg of SetResults list -> let @@ -209,7 +209,7 @@ renderItemTable model items = renderItemLine : Model -> ItemLight -> Html Msg -renderItemLine model item = +renderItemLine _ item = let dirIcon = i [ class (Data.Direction.iconFromMaybe item.direction) ] [] diff --git a/modules/webapp/src/main/elm/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Comp/ItemMail.elm index 47d0cb4e..9d4dbb18 100644 --- a/modules/webapp/src/main/elm/Comp/ItemMail.elm +++ b/modules/webapp/src/main/elm/Comp/ItemMail.elm @@ -108,7 +108,7 @@ update flags msg model = ConnMsg m -> let ( cm, _ ) = - --TODO dropdown doesn't use cmd!! + -- dropdown doesn't use cmd!! Comp.Dropdown.update m model.connectionModel in ( { model | connectionModel = cm }, Cmd.none, FormNone ) diff --git a/modules/webapp/src/main/elm/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Comp/OrgTable.elm index 7c526137..e78e408a 100644 --- a/modules/webapp/src/main/elm/Comp/OrgTable.elm +++ b/modules/webapp/src/main/elm/Comp/OrgTable.elm @@ -35,7 +35,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetOrgs list -> ( { model | equips = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Comp/PersonTable.elm index ae1d655a..0a97598e 100644 --- a/modules/webapp/src/main/elm/Comp/PersonTable.elm +++ b/modules/webapp/src/main/elm/Comp/PersonTable.elm @@ -35,7 +35,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetPersons list -> ( { model | equips = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/SentMails.elm b/modules/webapp/src/main/elm/Comp/SentMails.elm index 7e4b3af0..a07dbced 100644 --- a/modules/webapp/src/main/elm/Comp/SentMails.elm +++ b/modules/webapp/src/main/elm/Comp/SentMails.elm @@ -1,4 +1,12 @@ -module Comp.SentMails exposing (..) +module Comp.SentMails exposing + ( Model + , Msg + , init + , initMails + , isEmpty + , update + , view + ) import Api.Model.SentMail exposing (SentMail) import Html exposing (..) diff --git a/modules/webapp/src/main/elm/Comp/Settings.elm b/modules/webapp/src/main/elm/Comp/Settings.elm index 113ec268..55ccf613 100644 --- a/modules/webapp/src/main/elm/Comp/Settings.elm +++ b/modules/webapp/src/main/elm/Comp/Settings.elm @@ -58,7 +58,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg, Maybe CollectiveSettings ) -update flags msg model = +update _ msg model = case msg of LangDropdownMsg m -> let diff --git a/modules/webapp/src/main/elm/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Comp/SourceForm.elm index 3df00439..d0ba0a4d 100644 --- a/modules/webapp/src/main/elm/Comp/SourceForm.elm +++ b/modules/webapp/src/main/elm/Comp/SourceForm.elm @@ -74,7 +74,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetSource t -> let diff --git a/modules/webapp/src/main/elm/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Comp/SourceTable.elm index 49dec59e..c6ab18a6 100644 --- a/modules/webapp/src/main/elm/Comp/SourceTable.elm +++ b/modules/webapp/src/main/elm/Comp/SourceTable.elm @@ -34,7 +34,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetSources list -> ( { model | sources = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/TagForm.elm b/modules/webapp/src/main/elm/Comp/TagForm.elm index f19f1e25..2d7298a5 100644 --- a/modules/webapp/src/main/elm/Comp/TagForm.elm +++ b/modules/webapp/src/main/elm/Comp/TagForm.elm @@ -47,7 +47,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetTag t -> ( { model | tag = t, name = t.name, category = t.category }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/TagTable.elm b/modules/webapp/src/main/elm/Comp/TagTable.elm index aabfcd6d..97aa35cc 100644 --- a/modules/webapp/src/main/elm/Comp/TagTable.elm +++ b/modules/webapp/src/main/elm/Comp/TagTable.elm @@ -33,7 +33,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetTags list -> ( { model | tags = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Comp/UserForm.elm b/modules/webapp/src/main/elm/Comp/UserForm.elm index 724b3bea..8b46c3fd 100644 --- a/modules/webapp/src/main/elm/Comp/UserForm.elm +++ b/modules/webapp/src/main/elm/Comp/UserForm.elm @@ -91,7 +91,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetUser t -> let diff --git a/modules/webapp/src/main/elm/Comp/UserTable.elm b/modules/webapp/src/main/elm/Comp/UserTable.elm index 565e44e2..8c7ded74 100644 --- a/modules/webapp/src/main/elm/Comp/UserTable.elm +++ b/modules/webapp/src/main/elm/Comp/UserTable.elm @@ -34,7 +34,7 @@ type Msg update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) -update flags msg model = +update _ msg model = case msg of SetUsers list -> ( { model | users = list, selected = Nothing }, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Main.elm b/modules/webapp/src/main/elm/Main.elm index df4cf4d2..1d2f45d2 100644 --- a/modules/webapp/src/main/elm/Main.elm +++ b/modules/webapp/src/main/elm/Main.elm @@ -11,7 +11,6 @@ import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (..) import Page -import Ports import Url exposing (Url) diff --git a/modules/webapp/src/main/elm/Page/Home/Data.elm b/modules/webapp/src/main/elm/Page/Home/Data.elm index 8a440a6f..b3769c5f 100644 --- a/modules/webapp/src/main/elm/Page/Home/Data.elm +++ b/modules/webapp/src/main/elm/Page/Home/Data.elm @@ -6,7 +6,6 @@ module Page.Home.Data exposing , itemNav ) -import Api.Model.ItemDetail exposing (ItemDetail) import Api.Model.ItemLightList exposing (ItemLightList) import Comp.ItemList import Comp.SearchMenu diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm index bc940e19..db03a9d8 100644 --- a/modules/webapp/src/main/elm/Page/Home/Update.elm +++ b/modules/webapp/src/main/elm/Page/Home/Update.elm @@ -2,7 +2,6 @@ module Page.Home.Update exposing (update) import Api import Browser.Navigation as Nav -import Comp.ItemDetail import Comp.ItemList import Comp.SearchMenu import Data.Flags exposing (Flags) diff --git a/modules/webapp/src/main/elm/Page/Home/View.elm b/modules/webapp/src/main/elm/Page/Home/View.elm index 22e063b2..4c765cc8 100644 --- a/modules/webapp/src/main/elm/Page/Home/View.elm +++ b/modules/webapp/src/main/elm/Page/Home/View.elm @@ -1,6 +1,5 @@ module Page.Home.View exposing (view) -import Comp.ItemDetail import Comp.ItemList import Comp.SearchMenu import Html exposing (..) diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm index c411e14d..6c916d67 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm @@ -35,5 +35,5 @@ update key flags next msg model = in update key flags next (ItemDetailMsg lmsg) model - ItemResp (Err err) -> + ItemResp (Err _) -> ( model, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Page/Register/Update.elm b/modules/webapp/src/main/elm/Page/Register/Update.elm index aeaeceb7..e400bf58 100644 --- a/modules/webapp/src/main/elm/Page/Register/Update.elm +++ b/modules/webapp/src/main/elm/Page/Register/Update.elm @@ -106,7 +106,7 @@ update flags msg model = , cmd ) - SubmitResp (Err err) -> + SubmitResp (Err _) -> ( model, Cmd.none ) diff --git a/modules/webapp/src/main/elm/Page/Upload/Data.elm b/modules/webapp/src/main/elm/Page/Upload/Data.elm index 9ed5ff66..94c2a0f7 100644 --- a/modules/webapp/src/main/elm/Page/Upload/Data.elm +++ b/modules/webapp/src/main/elm/Page/Upload/Data.elm @@ -94,13 +94,6 @@ uploadAllTracker = "upload-all" -isInitial : Model -> Bool -isInitial model = - Set.isEmpty model.loading - && Set.isEmpty model.completed - && Set.isEmpty model.errored - - isDone : Model -> Bool isDone model = List.map makeFileId model.files diff --git a/modules/webapp/src/main/elm/Page/Upload/View.elm b/modules/webapp/src/main/elm/Page/Upload/View.elm index cc6e4be7..02e15142 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View.elm @@ -48,7 +48,7 @@ view mid model = renderErrorMsg : Model -> Html Msg -renderErrorMsg model = +renderErrorMsg _ = div [ class "row" ] [ div [ class "sixteen wide column" ] [ div [ class "ui large error message" ] @@ -63,7 +63,7 @@ renderErrorMsg model = renderSuccessMsg : Bool -> Model -> Html Msg -renderSuccessMsg public model = +renderSuccessMsg public _ = div [ class "row" ] [ div [ class "sixteen wide column" ] [ div [ class "ui large success message" ] diff --git a/modules/webapp/src/main/elm/Ports.elm b/modules/webapp/src/main/elm/Ports.elm index 343fb19c..94b3b8e1 100644 --- a/modules/webapp/src/main/elm/Ports.elm +++ b/modules/webapp/src/main/elm/Ports.elm @@ -1,4 +1,9 @@ -port module Ports exposing (..) +port module Ports exposing + ( removeAccount + , setAccount + , setAllProgress + , setProgress + ) import Api.Model.AuthResult exposing (AuthResult) diff --git a/modules/webapp/src/main/elm/Util/Http.elm b/modules/webapp/src/main/elm/Util/Http.elm index 684ae04e..f9a030d3 100644 --- a/modules/webapp/src/main/elm/Util/Http.elm +++ b/modules/webapp/src/main/elm/Util/Http.elm @@ -192,10 +192,10 @@ jsonResolver decoder = Http.NetworkError_ -> Err Http.NetworkError - Http.BadStatus_ metadata body -> + Http.BadStatus_ metadata _ -> Err (Http.BadStatus metadata.statusCode) - Http.GoodStatus_ metadata body -> + Http.GoodStatus_ _ body -> case D.decodeString decoder body of Ok value -> Ok value diff --git a/modules/webapp/src/main/elm/Util/String.elm b/modules/webapp/src/main/elm/Util/String.elm index e16f6801..e96888bc 100644 --- a/modules/webapp/src/main/elm/Util/String.elm +++ b/modules/webapp/src/main/elm/Util/String.elm @@ -12,9 +12,6 @@ crazyEncode str = let b64 = Base64.encode str - - len = - String.length b64 in case String.right 2 b64 |> String.toList of '=' :: '=' :: [] ->