Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/Route.elm
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ fromUrl url =


routeToString : Route -> String
routeToString =
routeToString route =
let
buildString ( path, query, searchQuery ) =
Route.SearchQuery.absolute path query <|
Maybe.withDefault [] <|
Maybe.map List.singleton searchQuery
in
buildString << routeToPieces
buildString (routeToPieces route)


routeToPieces : Route -> ( List String, List QueryParameter, Maybe ( String, Route.SearchQuery.SearchQuery ) )
Expand Down
53 changes: 39 additions & 14 deletions frontend/src/Search.elm
Original file line number Diff line number Diff line change
Expand Up @@ -311,31 +311,48 @@ init args defaultNixOSChannel nixosChannels maybeModel =
q

Nothing ->
args.show |> Maybe.withDefault ""
args.show
|> Maybe.withDefault defaultSearchArgs.query
, result = getField .result RemoteData.NotAsked
, show = args.show
, from =
args.from
|> Maybe.withDefault 0
|> Maybe.withDefault defaultSearchArgs.from
, size =
args.size
|> Maybe.withDefault 50
|> Maybe.withDefault defaultSearchArgs.size
, buckets = args.buckets
, sort =
args.sort
|> Maybe.andThen fromSortId
|> Maybe.withDefault Relevance
|> Maybe.withDefault defaultSearchArgs.sort
, showSort = False
, showInstallDetails = Unset
, searchType =
args.type_
|> Maybe.withDefault Route.PackageSearch
|> Maybe.withDefault defaultSearchArgs.searchType
}
|> ensureLoading nixosChannels
, Browser.Dom.focus "search-query-input" |> Task.attempt (\_ -> NoOp)
)


defaultSearchArgs :
{ query : String
, from : Int
, size : Int
, sort : Sort
, searchType : SearchType
}
defaultSearchArgs =
{ query = ""
, from = 0
, size = 50
, sort = Relevance
, searchType = Route.PackageSearch
}


shouldLoad :
Model a b
-> Bool
Expand Down Expand Up @@ -532,21 +549,29 @@ createUrl :
-> Model a b
-> String
createUrl toRoute model =
let
justIfNotDefault : t -> t -> Maybe t
justIfNotDefault fromModel fromDefault =
if fromModel == fromDefault then
Nothing

else
Just fromModel
in
Route.routeToString <|
toRoute
{ channel = Just model.channel
, query =
if String.isEmpty model.query then
Nothing

else
Just (Route.SearchQuery.toSearchQuery model.query)
justIfNotDefault model.query defaultSearchArgs.query
|> Maybe.map Route.SearchQuery.toSearchQuery
, show = model.show
, from = Just model.from
, size = Just model.size
, from = justIfNotDefault model.from defaultSearchArgs.from
, size = justIfNotDefault model.size defaultSearchArgs.size
, buckets = model.buckets
, sort = Just <| toSortId model.sort
, type_ = Just model.searchType
, sort =
justIfNotDefault model.sort defaultSearchArgs.sort
|> Maybe.map toSortId
, type_ = justIfNotDefault model.searchType defaultSearchArgs.searchType
}


Expand Down