Skip to content
This repository was archived by the owner on Jul 19, 2022. It is now read-only.

Add search for all projects, not just catalog #313

Merged
hojberg merged 1 commit into from
Jan 29, 2022
Merged

Add search for all projects, not just catalog #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/Project.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ ownerToString (Owner o) =
o


equals : Project a -> Project b -> Bool
equals a b =
Hash.equals a.hash b.hash



-- View

Expand Down
36 changes: 25 additions & 11 deletions src/UnisonShare/Page/Catalog.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type alias LoadedModel =
, hasFocus : Bool
, catalog : Catalog
, usernames : List Username
, projectListings : List ProjectListing
, keyboardShortcut : KeyboardShortcut.Model
}

Expand Down Expand Up @@ -124,6 +125,7 @@ update env msg model =
, hasFocus = True
, catalog = Catalog.catalog mask listings
, usernames = usernames
, projectListings = listings
, keyboardShortcut = KeyboardShortcut.init env.operatingSystem
}
in
Expand All @@ -140,7 +142,8 @@ update env msg model =

else
query
|> search m.catalog m.usernames
|> search m.catalog m.projectListings m.usernames
|> List.take 9
|> SearchResults.fromList
in
( Success { m | search = { query = query, results = searchResults } }, Cmd.none )
Expand Down Expand Up @@ -243,25 +246,36 @@ matchToNavigate env match =
Route.navigateToProject env.navKey project


toMatches : Catalog -> List Username -> List Match
toMatches catalog users =
toMatches : Catalog -> List ProjectListing -> List Username -> List Match
toMatches catalog projects users =
let
flat ( category, projects ) acc =
acc ++ List.map (\p -> ProjectMatch p category) projects
catalogProjects =
catalog |> Catalog.toList |> List.foldl flat []

flat ( category, projects_ ) acc =
acc ++ List.map (\p -> ( p, category )) projects_

categoryOf project =
catalogProjects
|> ListE.find (\( p, _ ) -> Project.equals project p)
|> Maybe.map Tuple.second

projectMatches =
catalog
|> Catalog.toList
|> List.foldl flat []
projects
|> List.map
(\p ->
ProjectMatch p
(Maybe.withDefault "" (categoryOf p))
)

userMatches =
List.map UserMatch users
in
userMatches ++ projectMatches


search : Catalog -> List Username -> String -> List Match
search catalog users query =
search : Catalog -> List ProjectListing -> List Username -> String -> List Match
search catalog projects users query =
let
normalize m =
case m of
Expand All @@ -271,7 +285,7 @@ search catalog users query =
ProjectMatch p _ ->
Project.slugString p
in
Fuzzy.filter normalize query (toMatches catalog users)
Fuzzy.filter normalize query (toMatches catalog projects users)



Expand Down