Skip to content

Commit

Permalink
wip(search): surface explorer views in search results
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelgerber committed Mar 19, 2024
1 parent de738f8 commit cb5fed2
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 3 deletions.
21 changes: 18 additions & 3 deletions site/search/Search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@

.search-results__pages-list,
.search-results__explorers-list,
.search-results__explorer-views-list,
.search-results__charts-list {
gap: var(--grid-gap);
@include sm-only {
Expand Down Expand Up @@ -228,7 +229,8 @@
display: block;
}

.search-results__explorer-hit a {
.search-results__explorer-hit a,
.search-results__explorer-view-hit a {
background-color: $blue-10;
height: 100%;
padding: 24px;
Expand Down Expand Up @@ -290,13 +292,15 @@

.search-results__pages,
.search-results__explorers,
.search-results__explorer-views,
.search-results__charts {
display: none;
}

.search-results[data-active-filter="all"] {
.search-results__pages,
.search-results__explorers,
.search-results__explorer-views,
.search-results__charts {
// both needed for .search-results__show-more-container absolute-positioning
display: inline-block;
Expand Down Expand Up @@ -341,10 +345,21 @@
}
}

.search-results[data-active-filter="explorers"] .search-results__explorers {
.search-results__explorer-view-hit {
display: none;

&:nth-child(-n + 4) {
display: inline;
}
}

.search-results[data-active-filter="explorers"] .search-results__explorers,
.search-results[data-active-filter="explorers"]
.search-results__explorer-views {
display: inline;

.search-results__explorer-hit {
.search-results__explorer-hit,
.search-results__explorer-view-hit {
display: inline;
}
}
Expand Down
55 changes: 55 additions & 0 deletions site/search/SearchPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
searchCategoryFilters,
IPageHit,
pageTypeDisplayNames,
IExplorerViewHit,
} from "./searchTypes.js"
import { EXPLORERS_ROUTE_FOLDER } from "../../explorer/ExplorerConstants.js"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome/index.js"
Expand Down Expand Up @@ -103,6 +104,23 @@ function ChartHit({ hit }: { hit: IChartHit }) {
)
}

function ExplorerViewHit({ hit }: { hit: IExplorerViewHit }) {
return (
<a
data-algolia-index={getIndexName(SearchIndexName.ExplorerViews)}
data-algolia-object-id={hit.objectID}
data-algolia-position={hit.__position}
href={`${BAKED_BASE_URL}/${EXPLORERS_ROUTE_FOLDER}/${hit.explorerSlug}${hit.viewQueryParams}`}
>
<h4 className="h3-bold">{hit.viewTitle}</h4>
<span>
in <em>{hit.explorerTitle} Data Explorer</em>
</span>
{/* Explorer subtitles are mostly useless at the moment, so we're only showing titles */}
</a>
)
}

function ExplorerHit({ hit }: { hit: IExplorerHit }) {
return (
<a
Expand Down Expand Up @@ -176,10 +194,15 @@ function Filters({
const hitsLengthByIndexName = mapValues(resultsByIndexName, (results) =>
get(results, ["results", "hits", "length"], 0)
)

hitsLengthByIndexName[getIndexName("all")] = Object.values(
hitsLengthByIndexName
).reduce((a: number, b: number) => a + b, 0)

hitsLengthByIndexName[getIndexName(SearchIndexName.Explorers)] =
hitsLengthByIndexName[getIndexName(SearchIndexName.Explorers)] +
hitsLengthByIndexName[getIndexName(SearchIndexName.ExplorerViews)]

return (
<div className="search-filters">
<ul
Expand Down Expand Up @@ -356,6 +379,38 @@ const SearchResults = (props: SearchResultsProps) => {
</section>
</NoResultsBoundary>
</Index>
<Index indexName={getIndexName(SearchIndexName.ExplorerViews)}>
<Configure
hitsPerPage={10}
distinct
clickAnalytics={hasClickAnalyticsConsent}
/>
<NoResultsBoundary>
<section className="search-results__explorer-views">
<header className="search-results__header">
<h2 className="h2-bold search-results__section-title">
Data Explorer views
</h2>
<ShowMore
category={SearchIndexName.ExplorerViews}
cutoffNumber={4}
activeCategoryFilter={activeCategoryFilter}
handleCategoryFilterClick={
handleCategoryFilterClick
}
/>
</header>
<Hits
classNames={{
root: "search-results__list-container",
list: "search-results__explorer-views-list grid grid-cols-2 grid-sm-cols-1",
item: "search-results__explorer-view-hit",
}}
hitComponent={ExplorerViewHit}
/>
</section>
</NoResultsBoundary>
</Index>
<Index indexName={getIndexName(SearchIndexName.Charts)}>
<Configure
hitsPerPage={40}
Expand Down
8 changes: 8 additions & 0 deletions site/search/searchTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ export interface PageRecord {

export type IPageHit = PageRecord & Hit<BaseHit>

export type IExplorerViewHit = Hit<BaseHit> & {
objectID: string
explorerSlug: string
viewTitle: string
explorerTitle: string
viewQueryParams: string
}

export type IExplorerHit = Hit<BaseHit> & {
objectID: string
slug: string
Expand Down

0 comments on commit cb5fed2

Please sign in to comment.