Further code simplifications (#973)

* Simplify decodeResolvedFlake

* Simplify longerPackageDetails

* Simplify Flakes.init

* Improve formatting

* Simplify viewResultItem

* Simplify findSource

* Simplify viewResultItem

* Simplify renderSource

* Avoid traversing lists needlessly for searches

* Deduplicate code

* Improve readability

Author: miniBill

frontend/src/List/Extra.elm

@@ -0,0 +1,15 @@
+module List.Extra exposing (find)
+
+
+find : (a -> Bool) -> List a -> Maybe a
+find p list =
+    case list of
+        [] ->
+            Nothing
+
+        h :: t ->
+            if p h then
+                Just h
+
+            else
+                find p t

frontend/src/Page/Flakes.elm

@@ -59,37 +59,30 @@ init :
 init searchArgs defaultNixOSChannel nixosChannels model =
     let
         --  init with respective module or with packages by default
+        searchType : SearchType
         searchType =
             Maybe.withDefault PackageSearch searchArgs.type_
-
-        mapEitherModel m =
-            case ( searchType, m ) of
-                ( OptionSearch, OptionModel model_ ) ->
-                    Tuple.mapBoth OptionModel (Cmd.map OptionsMsg) <|
-                        Page.Options.init searchArgs defaultNixOSChannel nixosChannels <|
-                            Just model_
-
-                ( PackageSearch, PackagesModel model_ ) ->
-                    Tuple.mapBoth PackagesModel (Cmd.map PackagesMsg) <|
-                        Page.Packages.init searchArgs defaultNixOSChannel nixosChannels <|
+    in
+    case searchType of
+        OptionSearch ->
+            Tuple.mapBoth OptionModel (Cmd.map OptionsMsg) <|
+                Page.Options.init searchArgs defaultNixOSChannel nixosChannels <|
+                    case model of
+                        Just (OptionModel model_) ->
                             Just model_
 
-                _ ->
-                    default
+                        _ ->
+                            Nothing
 
-        default =
-            case searchType of
-                PackageSearch ->
-                    Tuple.mapBoth PackagesModel (Cmd.map PackagesMsg) <|
-                        Page.Packages.init searchArgs defaultNixOSChannel nixosChannels Nothing
+        PackageSearch ->
+            Tuple.mapBoth PackagesModel (Cmd.map PackagesMsg) <|
+                Page.Packages.init searchArgs defaultNixOSChannel nixosChannels <|
+                    case model of
+                        Just (PackagesModel model_) ->
+                            Just model_
 
-                OptionSearch ->
-                    Tuple.mapBoth OptionModel (Cmd.map OptionsMsg) <|
-                        Page.Options.init searchArgs defaultNixOSChannel nixosChannels Nothing
-    in
-    model
-        |> Maybe.map mapEitherModel
-        |> Maybe.withDefault default
+                        _ ->
+                            Nothing
 
 
 

frontend/src/Page/Options.elm

@@ -43,6 +43,7 @@ import Html.Events
 import Http exposing (Body)
 import Json.Decode
 import Json.Decode.Pipeline
+import List.Extra
 import Route exposing (SearchType)
 import Search
     exposing
@@ -266,15 +267,14 @@ viewResultItem nixosChannels channel _ show item =
             case ( item.source.flake, item.source.flakeUrl ) of
                 -- its a flake
                 ( Just (flake :: []), Just url ) ->
-                    Just
-                        [ li [] [ mkLink flake url ]
-                        ]
+                    [ li [] [ mkLink flake url ]
+                    ]
 
                 ( Just (flake :: moduleName :: []), Just url ) ->
-                    Just [ li [] [ mkLink flake url, text "#", text moduleName ] ]
+                    [ li [] [ mkLink flake url, text "#", text moduleName ] ]
 
                 _ ->
-                    Nothing
+                    []
     in
     li
         [ class "option"
@@ -286,7 +286,7 @@ viewResultItem nixosChannels channel _ show item =
             [ Just <|
                 ul [ class "search-result-button" ]
                     (List.append
-                        (flakeOrNixpkgs |> Maybe.withDefault [])
+                        flakeOrNixpkgs
                         [ li []
                             [ a
                                 [ onClick toggle
@@ -318,7 +318,7 @@ findSource nixosChannels channel source =
                 value
 
         asGithubLink value =
-            case List.head (List.filter (\x -> x.id == channel) nixosChannels) of
+            case List.Extra.find (\x -> x.id == channel) nixosChannels of
                 Just channelDetails ->
                     a
                         [ href <| githubUrlPrefix channelDetails.branch ++ (value |> String.replace ":" "#L")
@@ -328,33 +328,36 @@ findSource nixosChannels channel source =
 
                 Nothing ->
                     text <| cleanPosition value
-
-        sourceFile =
-            Maybe.map asGithubLink source.source
-
-        flakeOrNixpkgs : Maybe (List (Html a))
-        flakeOrNixpkgs =
-            case ( source.flake, source.flakeUrl ) of
-                -- its a flake
-                ( Just (name :: attrs), Just flakeUrl_ ) ->
-                    let
-                        module_ =
-                            Maybe.withDefault "(default)" <| Maybe.map (\m -> "(Module: " ++ m ++ ")") <| List.head attrs
-                    in
-                    Just <|
-                        List.append
-                            (Maybe.withDefault [] <| Maybe.map (\sourceFile_ -> [ sourceFile_, span [] [ text " in " ] ]) sourceFile)
-                            [ span [] [ text "Flake: " ]
-                            , a [ href flakeUrl_ ] [ text <| name ++ module_ ]
+    in
+    case ( source.flake, source.flakeUrl, source.source ) of
+        -- its a flake
+        ( Just (name :: attrs), Just flakeUrl_, _ ) ->
+            let
+                module_ : String
+                module_ =
+                    List.head attrs
+                        |> Maybe.map (\m -> "(Module: " ++ m ++ ")")
+                        |> Maybe.withDefault "(default)"
+            in
+            List.append
+                (source.source
+                    |> Maybe.map
+                        (\source_ ->
+                            [ asGithubLink source_
+                            , span [] [ text " in " ]
                             ]
+                        )
+                    |> Maybe.withDefault []
+                )
+                [ span [] [ text "Flake: " ]
+                , a [ href flakeUrl_ ] [ text <| name ++ module_ ]
+                ]
 
-                ( Nothing, _ ) ->
-                    Maybe.map (\l -> [ l ]) sourceFile
+        ( Nothing, _, Just source_ ) ->
+            [ asGithubLink source_ ]
 
-                _ ->
-                    Nothing
-    in
-    Maybe.withDefault [ span [] [ text "Not Found" ] ] flakeOrNixpkgs
+        _ ->
+            [ span [] [ text "Not Found" ] ]