Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable searching by sdk #170

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enable searching by sdk #170

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
127 changes: 68 additions & 59 deletions src/components/Search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,19 @@ function SearchResults({
collection,
roleFilter,
typeFilter,
codeLanguageFilter,
}) {
// If there is no collection, return null
if (!collection) return null

// Group results by type
const groupedResults = collection.items.reduce((acc, result) => {
if (roleFilter.length === 0 && typeFilter.length === 0) {
if (
roleFilter.length === 0 &&
typeFilter.length === 0 &&
codeLanguageFilter.length === 0
) {
console.log(acc, codeLanguageFilter)
// If no filters are selected, don't filter results
if (!acc[result.type]) {
acc[result.type] = []
Expand All @@ -189,11 +195,13 @@ function SearchResults({
return acc
}

const { type, articleFor } = result
const { type, articleFor, codeLanguage } = result
const rolePass = !roleFilter.length || roleFilter.includes(articleFor)
const typePass = !typeFilter.length || typeFilter.includes(type)
const codeLanguagePass =
!codeLanguageFilter.length || codeLanguageFilter.includes(codeLanguage)

if (rolePass && typePass) {
if (rolePass && typePass && codeLanguagePass) {
if (!acc[type]) {
acc[type] = []
}
Expand Down Expand Up @@ -313,6 +321,7 @@ function SearchDialog({ open, setOpen, className }) {
let { autocomplete, autocompleteState } = useAutocomplete()
const [roleFilter, setRoleFilter] = useState([])
const [typefilter, setTypeFilter] = useState([])
const [codeLanguageFilter, setCodeLanguageFilter] = useState([])
let [modifierKey, setModifierKey] = useState()

useEffect(() => {
Expand All @@ -322,68 +331,40 @@ function SearchDialog({ open, setOpen, className }) {
}, [])

const toggleFilter = (f, filterType) => {
if (filterType === 'role') {
setRoleFilter((prev) => {
let newFilter

if (prev.length === 0 && f !== 'none') {
// If no filters are selected and 'none' is not the selected filter,
// start with just the selected filter
newFilter = [f]
const updateFilter = (prev) => {
let newFilter

if (prev.length === 0 && f !== 'none') {
newFilter = [f]
} else {
if (prev.includes(f)) {
newFilter = prev.filter((value) => value !== f)
} else {
// If there are already filters selected or 'none' is the selected filter,
// toggle the current filter
if (prev.includes(f)) {
// Remove the selected filter if it's already in the array
newFilter = prev.filter((value) => value !== f)
} else {
// Add the selected filter if it's not already in the array
newFilter = [...prev, f]
}

// If the 'none' filter is selected, clear all filters
if (f === 'none') {
newFilter = []
}
newFilter = [...prev, f]
}

// After state is updated, set the query to trigger a search with the new filter state
setTimeout(() => autocomplete.setQuery(autocompleteState.query), 0)

// Return the new filter state
return newFilter
})
} else if (filterType === 'type') {
setTypeFilter((prev) => {
let newFilter

if (prev.length === 0 && f !== 'none') {
// If no filters are selected and 'none' is not the selected filter,
// start with just the selected filter
newFilter = [f]
} else {
// If there are already filters selected or 'none' is the selected filter,
// toggle the current filter
if (prev.includes(f)) {
// Remove the selected filter if it's already in the array
newFilter = prev.filter((value) => value !== f)
} else {
// Add the selected filter if it's not already in the array
newFilter = [...prev, f]
}

// If the 'none' filter is selected, clear all filters
if (f === 'none') {
newFilter = []
}
if (f === 'none') {
newFilter = []
}
}

// After state is updated, set the query to trigger a search with the new filter state
setTimeout(() => autocomplete.setQuery(autocompleteState.query), 0)
setTimeout(() => autocomplete.setQuery(autocompleteState.query), 0)
return newFilter
}

// Return the new filter state
return newFilter
})
switch (filterType) {
case 'role':
setRoleFilter(updateFilter)
break
case 'type':
setTypeFilter(updateFilter)
break
case 'codeLanguage':
setCodeLanguageFilter(updateFilter)
break
default:
// Handle unknown filter types if necessary
break
}
}

Expand Down Expand Up @@ -465,6 +446,33 @@ function SearchDialog({ open, setOpen, className }) {
/>
</div>
</div>
<div className="flex items-center border-t border-slate-200 bg-white px-4 py-3 empty:hidden dark:border-slate-400/10 dark:bg-slate-800">
<span className="mr-4 text-sm font-semibold text-slate-500 dark:text-white/50">
SDK
</span>
<div className="flex gap-x-2">
<FilterButton
label="golem-js"
isActive={codeLanguageFilter.includes('Javascript')}
onClick={() => toggleFilter('Javascript', 'codeLanguage')}
/>
<FilterButton
label="Ray on Golem"
isActive={codeLanguageFilter.includes('Ray')}
onClick={() => toggleFilter('Ray', 'codeLanguage')}
/>
<FilterButton
label="Yapapi"
isActive={codeLanguageFilter.includes('Python')}
onClick={() => toggleFilter('Python', 'codeLanguage')}
/>
<FilterButton
label="golem-compose"
isActive={codeLanguageFilter.includes('YAML')}
onClick={() => toggleFilter('YAML', 'codeLanguage')}
/>
</div>
</div>
<div className="flex flex-wrap items-center border-t border-slate-200 bg-white px-4 py-3 empty:hidden dark:border-slate-400/10 dark:bg-slate-800">
<span className="mr-4 text-sm font-semibold text-slate-500 dark:text-white/50">
Type
Expand Down Expand Up @@ -505,6 +513,7 @@ function SearchDialog({ open, setOpen, className }) {
collection={autocompleteState.collections[0]}
roleFilter={roleFilter}
typeFilter={typefilter}
codeLanguageFilter={codeLanguageFilter}
/>
)}
</div>
Expand Down
18 changes: 16 additions & 2 deletions src/markdoc/search.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,19 @@ export default function (nextConfig = {}) {
? 'Requestor'
: 'General'

sections = [[title, null, [], type, articleFor]]
const codeLanguage = file.startsWith('docs/creators/dapps')
? 'YAML'
: file.startsWith('docs/creators/javascript')
? 'Javascript'
: file.startsWith('docs/creators/python')
? 'Python'
: file.startsWith('docs/creators/ray')
? 'Ray'
: file.startsWith('docs/golem-js')
? 'Javascript'
: null

sections = [[title, null, [], type, articleFor, codeLanguage]]

extractSections(ast, sections)
cache.set(file, [md, sections])
Expand All @@ -139,7 +151,7 @@ export default function (nextConfig = {}) {
document: {
id: 'url',
index: 'content',
store: ['title', 'pageTitle', 'type', 'articleFor'],
store: ['title', 'pageTitle', 'type', 'articleFor', 'codeLanguage'],
},
context: {
resolution: 9,
Expand All @@ -161,6 +173,7 @@ export default function (nextConfig = {}) {
pageTitle: hash ? sections[0][0] : undefined,
type: sections[0][3],
articleFor: sections[0][4],
codeLanguage: sections[0][5],
})
}
}
Expand All @@ -179,6 +192,7 @@ export default function (nextConfig = {}) {
pageTitle: item.doc.pageTitle,
type: item.doc.type,
articleFor: item.doc.articleFor,
codeLanguage: item.doc.codeLanguage,
}))
}
`
Expand Down
Loading