c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

Also ignore installDetail state (#411)

Browse source
This commit is contained in:
Yannik Sander 2022-01-14 20:44:46 +01:00 committed by GitHub
parent a4614dca0c
commit ce28a0e877
Failed to generate hash of commit
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Main.elm
View file

@ -12,7 +12,9 @@ import Html
, header , header
, img , img
, li , li
, small
, span , span
, sup
, text , text
, ul , ul
) )
@ -31,10 +33,9 @@ import Page.Home
import Page.Options import Page.Options
import Page.Packages import Page.Packages
import Route exposing (SearchType(..)) import Route exposing (SearchType(..))
import Search import Search exposing (Msg(..), defaultFlakeId)
import Url import Url
import Search exposing (defaultFlakeId) import Search exposing (defaultFlakeId)
import Search exposing (channels)
import Html exposing (sup) import Html exposing (sup)
import Html exposing (small) import Html exposing (small)
import RemoteData exposing (RemoteData(..)) import RemoteData exposing (RemoteData(..))
@ -160,7 +161,7 @@ attemptQuery (( model, _ ) as pair) =
Flakes (OptionModel searchModel) -> Flakes (OptionModel searchModel) ->
if Search.shouldLoad searchModel then if Search.shouldLoad searchModel then
submitQuery FlakesMsg Page.Flakes.makeRequest {searchModel | channel = defaultFlakeId } submitQuery FlakesMsg Page.Flakes.makeRequest { searchModel | channel = defaultFlakeId }
else else
noEffects pair noEffects pair
@ -170,7 +171,7 @@ attemptQuery (( model, _ ) as pair) =
-- let -- let
-- _ = Debug.log "main" "submit flake message" -- _ = Debug.log "main" "submit flake message"
-- in -- in
submitQuery FlakesMsg Page.Flakes.makeRequest {searchModel | channel = defaultFlakeId} submitQuery FlakesMsg Page.Flakes.makeRequest { searchModel | channel = defaultFlakeId }
else else
-- let _ = Debug.log "main" "should not load flakes" in -- let _ = Debug.log "main" "should not load flakes" in
@ -193,11 +194,10 @@ pageMatch m1 m2 =
True True
( Packages model_a, Packages model_b ) -> ( Packages model_a, Packages model_b ) ->
{model_a | show = Nothing, result = NotAsked } == {model_b | show = Nothing, result = NotAsked} { model_a | show = Nothing, showInstallDetails = Search.Unset, result = NotAsked }
== { model_b | show = Nothing, showInstallDetails = Search.Unset, result = NotAsked }
( Options model_a, Options model_b ) -> ( Options model_a, Options model_b ) ->
{model_a | show = Nothing, result = NotAsked } == {model_b | show = Nothing, result = NotAsked} {model_a | show = Nothing, result = NotAsked } == {model_b | show = Nothing, result = NotAsked}
( Flakes (OptionModel model_a), Flakes (OptionModel model_b) ) -> ( Flakes (OptionModel model_a), Flakes (OptionModel model_b) ) ->
{model_a | show = Nothing, result = NotAsked } == {model_b | show = Nothing, result = NotAsked} {model_a | show = Nothing, result = NotAsked } == {model_b | show = Nothing, result = NotAsked}
@ -426,8 +426,7 @@ viewNavigation route =
(viewNavigationItem route) (viewNavigationItem route)
[ ( toRoute Route.Packages, text "Packages" ) [ ( toRoute Route.Packages, text "Packages" )
, ( toRoute Route.Options, text "Options" ) , ( toRoute Route.Options, text "Options" )
, ( toRoute Route.Flakes, span [] [ text "Flakes", sup [] [span [class "label label-info"][small [] [text "Experimental"]]]] ) , ( toRoute Route.Flakes, span [] [ text "Flakes", sup [] [ span [ class "label label-info" ] [ small [] [ text "Experimental" ] ] ] ] )
] ]