Skip to content

Release v0.7.0: Intelligent Autocomplete Search & Smart Stacking #29

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

Merged
ChaoticGood007 merged 10 commits into from
May 15, 2026
Merged

Release v0.7.0: Intelligent Autocomplete Search & Smart Stacking #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e28d19
feat: Add Custom Mold feature inline to AddDiscForm
ChaoticGood007 May 13, 2026
4ade3d5
fix: Standardize secondary pattern display names globally
ChaoticGood007 May 13, 2026
37cf033
fix: Resolve SVG rendering issues with translucent secondary patterns
ChaoticGood007 May 13, 2026
cce07e3
fix: Wrap long text in location picker selection button
ChaoticGood007 May 13, 2026
cdba0e4
feat: 0.6.0 precise color picker, custom molds, and layout fixes
ChaoticGood007 May 13, 2026
748cabd
fix: resolve speckled pattern hash issue and location picker z-index …
ChaoticGood007 May 15, 2026
5475608
fix: explicitly trap DiscPreview z-index context to prevent overlayin…
ChaoticGood007 May 15, 2026
501860a
fix: use explicit navigation instead of router.back() to prevent hist…
ChaoticGood007 May 15, 2026
2980170
feat: Intelligent Autocomplete Search and Smart Stacking (v0.7.0)
ChaoticGood007 May 15, 2026
3efd1f0
Fix merge conflicts
ChaoticGood007 May 15, 2026
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.7.0] - 2026-05-14

### Added
- **Intelligent Autocomplete Search:** Replaced the standard search bar with a powerful, context-aware autocomplete engine. The search bar now provides instant, keyboard-accessible suggestions for syntax keys (e.g., `brand:`, `speed:`) and scans your database to suggest available values as you type.
- **Powerful Search Syntax:** Replaced the legacy dropdown filter system with a unified, GitHub-style text search parser. The main search bar is now the single source of truth for inventory discovery, supporting complex tokens (e.g., `brand:Innova`, `speed:>9`, `plastic:"Star"`). The Advanced Filter and Mobile Filter UI have been repurposed into a "Query Builder" that seamlessly constructs and appends these tokens to your search string.
- **Smart Stacking for Bags:** The "Bags" dropdown toggle now features intelligent "Smart Stacking." When toggling a bag or pocket on, the system automatically clears out redundant parent or child location tokens to keep your query clean and focused while still supporting multi-bag searches.

### Fixed
- **Disc Visuals:** Fixed a bug where the 'Speckled' secondary pattern would fail to render due to a hash calculation error.
- **Location Picker:** Fixed a z-index issue where the Location Picker dropdown menu in the Add/Edit forms would render behind the live Disc Preview.
## [0.6.0] - 2026-05-12

### Added
Expand Down
139 changes: 8 additions & 131 deletions src/app/v/[vaultId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import FloatingSearchButton from "@/components/FloatingSearchButton"
import FilterPreserver from "@/components/FilterPreserver"
import { getCategoryColors, getLocationTree } from "@/app/actions/settings"
import { flattenTree } from "@/lib/locationTree"
import { parseSearchQuery } from "@/lib/searchParser"


type SortField = 'name' | 'brand' | 'category' | 'speed' | 'glide' | 'turn' | 'fade' | 'createdAt' | 'plastic' | 'weight' | 'color' | 'stamp' | 'stampFoil' | 'location' | 'condition' | 'ink';
Expand All @@ -44,8 +45,6 @@ export default async function VaultDashboard({
const { vaultId } = await params
const searchP = await searchParams

const category = typeof searchP.category === 'string' ? searchP.category : undefined
const brand = typeof searchP.brand === 'string' ? searchP.brand : undefined
const view = typeof searchP.view === 'string' ? searchP.view : 'cards'
const cookieStore = await cookies()
const defaultSortBy = cookieStore.get('discVaultSortBy')?.value || 'createdAt'
Expand All @@ -58,32 +57,12 @@ export default async function VaultDashboard({
const colsParam = typeof searchP.cols === 'string' ? searchP.cols.split(',') : cookieCols
const visibleCols = colsParam.includes('name') ? colsParam : ['name', ...colsParam]
const searchQuery = typeof searchP.search === 'string' ? searchP.search : undefined
const inBagParam = typeof searchP.inBag === 'string' ? searchP.inBag : undefined

const userFlightCookie = cookieStore.get('discVaultUserFlightNum')?.value === 'true'
const useUserFlightNumbers = typeof searchP.useUserFlightNumbers === 'string'
? searchP.useUserFlightNumbers === 'true'
: userFlightCookie

const minSpeed = searchP.minSpeed ? parseFloat(searchP.minSpeed as string) : undefined
const maxSpeed = searchP.maxSpeed ? parseFloat(searchP.maxSpeed as string) : undefined
const minGlide = searchP.minGlide ? parseFloat(searchP.minGlide as string) : undefined
const maxGlide = searchP.maxGlide ? parseFloat(searchP.maxGlide as string) : undefined
const minTurn = searchP.minTurn ? parseFloat(searchP.minTurn as string) : undefined
const maxTurn = searchP.maxTurn ? parseFloat(searchP.maxTurn as string) : undefined
const minFade = searchP.minFade ? parseFloat(searchP.minFade as string) : undefined
const maxFade = searchP.maxFade ? parseFloat(searchP.maxFade as string) : undefined
const minWeight = searchP.minWeight ? parseFloat(searchP.minWeight as string) : undefined
const maxWeight = searchP.maxWeight ? parseFloat(searchP.maxWeight as string) : undefined
const minCond = searchP.minCond ? parseInt(searchP.minCond as string) : undefined
const maxCond = searchP.maxCond ? parseInt(searchP.maxCond as string) : undefined
const inkFilter = searchP.ink as string | undefined
const plasticFilter = typeof searchP.plastic === 'string' ? searchP.plastic : undefined
const colorFilter = typeof searchP.color === 'string' ? searchP.color : undefined
const stampFilter = typeof searchP.stamp === 'string' ? searchP.stamp : undefined
const stampFoilFilter = typeof searchP.stampFoil === 'string' ? searchP.stampFoil : undefined
const locationsFilter = typeof searchP.locations === 'string' ? searchP.locations.split(',').filter(Boolean) : []

const pageSize = 24
const page = typeof searchP.page === 'string' ? Math.max(1, parseInt(searchP.page)) : 1

Expand All @@ -99,93 +78,7 @@ export default async function VaultDashboard({
return { mold: { [field]: order } }
}

const andConditions: any[] = []

if (searchQuery) {
andConditions.push({
OR: [
{ mold: { name: { contains: searchQuery } } },
{ mold: { brand: { contains: searchQuery } } },
{ mold: { category: { contains: searchQuery } } },
{ plastic: { contains: searchQuery } },
{ color: { contains: searchQuery } },
{ stamp: { contains: searchQuery } },
{ stampFoil: { contains: searchQuery } },
{ location: { contains: searchQuery } },
{ notes: { contains: searchQuery } },
]
})
}

const addNullableMultiSelect = (field: string, filterStr?: string) => {
if (!filterStr) return;
const values = filterStr.split(',').filter(Boolean);
if (values.length === 0) return;
const hasNotDefined = values.includes('Not Defined');
const valid = values.filter(v => v !== 'Not Defined');
if (hasNotDefined) {
const orConditions: any[] = [{ [field]: null }, { [field]: '' }];
if (valid.length > 0) {
orConditions.push({ [field]: { in: valid } });
}
andConditions.push({ OR: orConditions });
} else {
andConditions.push({ [field]: { in: values } });
}
}

addNullableMultiSelect('plastic', plasticFilter);
addNullableMultiSelect('color', colorFilter);
addNullableMultiSelect('stamp', stampFilter);
addNullableMultiSelect('stampFoil', stampFoilFilter);

// Bag / Location logic
if (inBagParam === 'true') {
if (bagPaths.length > 0) {
andConditions.push({
OR: bagPaths.flatMap(p => [
{ location: p },
{ location: { startsWith: p + '/' } }
])
})
} else {
andConditions.push({ id: 'none' })
}
} else if (inBagParam === 'false') {
if (bagPaths.length > 0) {
andConditions.push({
NOT: { OR: bagPaths.flatMap(p => [
{ location: p },
{ location: { startsWith: p + '/' } }
])}
})
}
} else if (inBagParam) {
andConditions.push({
OR: [
{ location: inBagParam },
{ location: { startsWith: inBagParam + '/' } }
]
})
} else if (locationsFilter.length > 0) {
andConditions.push({ location: { in: locationsFilter } })
}

const whereClause: any = {
collectionId: vaultId,
weight: (minWeight !== undefined || maxWeight !== undefined) ? { gte: minWeight, lte: maxWeight } : undefined,
condition: (minCond !== undefined || maxCond !== undefined) ? { gte: minCond, lte: maxCond } : undefined,
ink: inkFilter === 'none' ? { equals: 'None' } : inkFilter === 'exists' ? { not: 'None' } : undefined,
mold: {
brand: brand ? { in: brand.split(',') } : undefined,
category: category ? { in: category.split(',') } : undefined,
speed: (minSpeed !== undefined || maxSpeed !== undefined) ? { gte: minSpeed, lte: maxSpeed } : undefined,
glide: (minGlide !== undefined || maxGlide !== undefined) ? { gte: minGlide, lte: maxGlide } : undefined,
turn: (minTurn !== undefined || maxTurn !== undefined) ? { gte: minTurn, lte: maxTurn } : undefined,
fade: (minFade !== undefined || maxFade !== undefined) ? { gte: minFade, lte: maxFade } : undefined,
},
AND: andConditions.length > 0 ? andConditions : undefined,
}
const whereClause = parseSearchQuery(searchQuery || '', vaultId, bagPaths);

const [
inventoryBrands, inventoryCategories,
Expand Down Expand Up @@ -219,7 +112,7 @@ export default async function VaultDashboard({

const locationsList = flatLocs.map(f => f.value)

const activeFiltersCount = (category ? category.split(',').length : 0) + (brand ? brand.split(',').length : 0) + (searchQuery ? 1 : 0) + (inBagParam ? 1 : 0) + Object.values(searchP).filter(v => v !== undefined && v !== '').length - (searchP.view ? 1 : 0) - (searchP.sortBy ? 1 : 0) - (searchP.sortOrder ? 1 : 0) - (searchP.cols ? 1 : 0) - (searchP.page ? 1 : 0)
const activeFiltersCount = (searchQuery ? 1 : 0) + Object.values(searchP).filter(v => v !== undefined && v !== '').length - (searchP.view ? 1 : 0) - (searchP.sortBy ? 1 : 0) - (searchP.sortOrder ? 1 : 0) - (searchP.cols ? 1 : 0) - (searchP.page ? 1 : 0)



Expand All @@ -237,30 +130,14 @@ export default async function VaultDashboard({
collections={collections as any}
availableLocations={locationsList}
currentCollectionIds={[vaultId]}
currentCategory={category}
currentBrand={brand}
currentView={view}
searchQuery={searchQuery}
currentBag={inBagParam}
bagOptions={bagOptions}
advancedFilters={{
minSpeed, maxSpeed,
minGlide, maxGlide,
minTurn, maxTurn,
minFade, maxFade,
minWeight, maxWeight,
minCond, maxCond,
ink: inkFilter,
plastic: plasticFilter,
color: colorFilter,
stamp: stampFilter,
locations: locationsFilter.length ? locationsFilter.join(',') : undefined,
}}
sortBy={sortBy}
sortOrder={sortOrder}
visibleColumns={visibleCols}
useUserFlightNumbers={useUserFlightNumbers}
/>
sortBy={sortBy}
sortOrder={sortOrder}
visibleColumns={visibleCols}
useUserFlightNumbers={useUserFlightNumbers}
/>
</div>

<div className="flex-1 min-h-0">
Expand Down
128 changes: 5 additions & 123 deletions src/app/v/all/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import InventoryInfiniteList from "@/components/InventoryInfiniteList"
import FilterPreserver from "@/components/FilterPreserver"
import { getLocationTree } from "@/app/actions/settings"
import { flattenTree, type LocationNode } from "@/lib/locationTree"
import { parseSearchQuery } from "@/lib/searchParser"

type SortField = 'name' | 'brand' | 'category' | 'speed' | 'glide' | 'turn' | 'fade' | 'createdAt' | 'plastic' | 'weight' | 'color' | 'stamp' | 'stampFoil' | 'location' | 'condition' | 'ink';
type SortOrder = 'asc' | 'desc';
Expand All @@ -38,8 +39,6 @@ export default async function AllVaultsDashboard({
}) {
const searchP = await searchParams

const category = typeof searchP.category === 'string' ? searchP.category : undefined
const brand = typeof searchP.brand === 'string' ? searchP.brand : undefined
const view = typeof searchP.view === 'string' ? searchP.view : 'cards'
const cookieStore = await cookies()
const defaultSortBy = cookieStore.get('discVaultSortBy')?.value || 'createdAt'
Expand All @@ -52,33 +51,13 @@ export default async function AllVaultsDashboard({
const colsParam = typeof searchP.cols === 'string' ? searchP.cols.split(',') : cookieCols
const visibleCols = colsParam.includes('name') ? colsParam : ['name', ...colsParam]
const searchQuery = typeof searchP.search === 'string' ? searchP.search : undefined
const inBagParam = typeof searchP.inBag === 'string' ? searchP.inBag : undefined
const selectedCollectionIds = typeof searchP.collections === 'string' ? searchP.collections.split(',') : []

const userFlightCookie = cookieStore.get('discVaultUserFlightNum')?.value === 'true'
const useUserFlightNumbers = typeof searchP.useUserFlightNumbers === 'string'
? searchP.useUserFlightNumbers === 'true'
: userFlightCookie

const minSpeed = searchP.minSpeed ? parseFloat(searchP.minSpeed as string) : undefined
const maxSpeed = searchP.maxSpeed ? parseFloat(searchP.maxSpeed as string) : undefined
const minGlide = searchP.minGlide ? parseFloat(searchP.minGlide as string) : undefined
const maxGlide = searchP.maxGlide ? parseFloat(searchP.maxGlide as string) : undefined
const minTurn = searchP.minTurn ? parseFloat(searchP.minTurn as string) : undefined
const maxTurn = searchP.maxTurn ? parseFloat(searchP.maxTurn as string) : undefined
const minFade = searchP.minFade ? parseFloat(searchP.minFade as string) : undefined
const maxFade = searchP.maxFade ? parseFloat(searchP.maxFade as string) : undefined
const minWeight = searchP.minWeight ? parseFloat(searchP.minWeight as string) : undefined
const maxWeight = searchP.maxWeight ? parseFloat(searchP.maxWeight as string) : undefined
const minCond = searchP.minCond ? parseInt(searchP.minCond as string) : undefined
const maxCond = searchP.maxCond ? parseInt(searchP.maxCond as string) : undefined
const inkFilter = searchP.ink as string | undefined
const plasticFilter = typeof searchP.plastic === 'string' ? searchP.plastic : undefined
const colorFilter = typeof searchP.color === 'string' ? searchP.color : undefined
const stampFilter = typeof searchP.stamp === 'string' ? searchP.stamp : undefined
const stampFoilFilter = typeof searchP.stampFoil === 'string' ? searchP.stampFoil : undefined
const locationsFilter = typeof searchP.locations === 'string' ? searchP.locations.split(',').filter(Boolean) : []

const pageSize = 24
const page = typeof searchP.page === 'string' ? Math.max(1, parseInt(searchP.page)) : 1

Expand All @@ -89,45 +68,7 @@ export default async function AllVaultsDashboard({
return { mold: { [field]: order } }
}

const andConditions: any[] = []

if (searchQuery) {
andConditions.push({
OR: [
{ mold: { name: { contains: searchQuery } } },
{ mold: { brand: { contains: searchQuery } } },
{ mold: { category: { contains: searchQuery } } },
{ plastic: { contains: searchQuery } },
{ color: { contains: searchQuery } },
{ stamp: { contains: searchQuery } },
{ stampFoil: { contains: searchQuery } },
{ location: { contains: searchQuery } },
{ notes: { contains: searchQuery } },
]
})
}

const addNullableMultiSelect = (field: string, filterStr?: string) => {
if (!filterStr) return;
const values = filterStr.split(',').filter(Boolean);
if (values.length === 0) return;
const hasNotDefined = values.includes('Not Defined');
const valid = values.filter(v => v !== 'Not Defined');
if (hasNotDefined) {
const orConditions: any[] = [{ [field]: null }, { [field]: '' }];
if (valid.length > 0) {
orConditions.push({ [field]: { in: valid } });
}
andConditions.push({ OR: orConditions });
} else {
andConditions.push({ [field]: { in: values } });
}
}

addNullableMultiSelect('plastic', plasticFilter);
addNullableMultiSelect('color', colorFilter);
addNullableMultiSelect('stamp', stampFilter);
addNullableMultiSelect('stampFoil', stampFoilFilter);

const baseColWhere = selectedCollectionIds.length > 0 ? { collectionId: { in: selectedCollectionIds } } : {}

Expand All @@ -144,52 +85,9 @@ export default async function AllVaultsDashboard({
const bagOptions = Array.from(new Map(allBags.map(b => [b.value, b])).values())
const bagPaths = bagOptions.map(b => b.value)

// Bag / Location logic
if (inBagParam === 'true') {
if (bagPaths.length > 0) {
andConditions.push({
OR: bagPaths.flatMap(p => [
{ location: p },
{ location: { startsWith: p + '/' } }
])
})
} else {
andConditions.push({ id: 'none' })
}
} else if (inBagParam === 'false') {
if (bagPaths.length > 0) {
andConditions.push({
NOT: { OR: bagPaths.flatMap(p => [
{ location: p },
{ location: { startsWith: p + '/' } }
])}
})
}
} else if (inBagParam) {
andConditions.push({
OR: [
{ location: inBagParam },
{ location: { startsWith: inBagParam + '/' } }
]
})
} else if (locationsFilter.length > 0) {
andConditions.push({ location: { in: locationsFilter } })
}

const whereClause: any = {
collectionId: selectedCollectionIds.length > 0 ? { in: selectedCollectionIds } : undefined,
weight: (minWeight !== undefined || maxWeight !== undefined) ? { gte: minWeight, lte: maxWeight } : undefined,
condition: (minCond !== undefined || maxCond !== undefined) ? { gte: minCond, lte: maxCond } : undefined,
ink: inkFilter === 'none' ? { equals: 'None' } : inkFilter === 'exists' ? { not: 'None' } : undefined,
mold: {
brand: brand ? { in: brand.split(',') } : undefined,
category: category ? { in: category.split(',') } : undefined,
speed: (minSpeed !== undefined || maxSpeed !== undefined) ? { gte: minSpeed, lte: maxSpeed } : undefined,
glide: (minGlide !== undefined || maxGlide !== undefined) ? { gte: minGlide, lte: maxGlide } : undefined,
turn: (minTurn !== undefined || maxTurn !== undefined) ? { gte: minTurn, lte: maxTurn } : undefined,
fade: (minFade !== undefined || maxFade !== undefined) ? { gte: minFade, lte: maxFade } : undefined,
},
AND: andConditions.length > 0 ? andConditions : undefined,
const whereClause: any = parseSearchQuery(searchQuery || '', 'all', bagPaths);
if (selectedCollectionIds.length > 0) {
whereClause.collectionId = { in: selectedCollectionIds };
}

const [
Expand Down Expand Up @@ -222,7 +120,7 @@ export default async function AllVaultsDashboard({
const stampFoilsList = ['Not Defined', ...Array.from(new Set(inventoryStampFoils.map((i: any) => i.stampFoil))).filter(Boolean).sort() as string[]]
const locationsList = Array.from(new Set(bagOptions.map(b => b.value))).sort() // Fallback or aggregate list

const activeFiltersCount = (category ? category.split(',').length : 0) + (brand ? brand.split(',').length : 0) + (searchQuery ? 1 : 0) + (inBagParam ? 1 : 0) + selectedCollectionIds.length + Object.values(searchP).filter(v => v !== undefined && v !== '').length - (searchP.view ? 1 : 0) - (searchP.sortBy ? 1 : 0) - (searchP.sortOrder ? 1 : 0) - (searchP.cols ? 1 : 0) - (searchP.page ? 1 : 0) - (searchP.collections ? 1 : 0)
const activeFiltersCount = (searchQuery ? 1 : 0) + selectedCollectionIds.length + Object.values(searchP).filter(v => v !== undefined && v !== '').length - (searchP.view ? 1 : 0) - (searchP.sortBy ? 1 : 0) - (searchP.sortOrder ? 1 : 0) - (searchP.cols ? 1 : 0) - (searchP.page ? 1 : 0) - (searchP.collections ? 1 : 0)

return (
<div className="space-y-8">
Expand All @@ -242,25 +140,9 @@ export default async function AllVaultsDashboard({
collections={collections as any}
availableLocations={locationsList}
currentCollectionIds={selectedCollectionIds}
currentCategory={category}
currentBrand={brand}
currentView={view}
searchQuery={searchQuery}
currentBag={inBagParam}
bagOptions={bagOptions}
advancedFilters={{
minSpeed, maxSpeed,
minGlide, maxGlide,
minTurn, maxTurn,
minFade, maxFade,
minWeight, maxWeight,
minCond, maxCond,
ink: inkFilter,
plastic: plasticFilter,
color: colorFilter,
stamp: stampFilter,
locations: locationsFilter.length ? locationsFilter.join(',') : undefined,
}}
sortBy={sortBy}
sortOrder={sortOrder}
visibleColumns={visibleCols}
Expand Down
Loading
Loading