OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
refactor: Filter panel improvements (#2167)
Mike Fortman8c0739811500
diff --git a/frontend/app/api/queries/useGetSearchAggregations.ts b/frontend/app/api/queries/useGetSearchAggregations.tsindex 58ee1e1d8..0f7fa9914 100644--- a/frontend/app/api/queries/useGetSearchAggregations.ts+++ b/frontend/app/api/queries/useGetSearchAggregations.ts@@ -6,7 +6,7 @@ import {export interface FacetBucket {key: string;- count: number;+ count?: number;}export interface SearchAggregations {diff --git a/frontend/app/chat/_components/chat-input.tsx b/frontend/app/chat/_components/chat-input.tsxindex 4b3e3a399..4048851ea 100644--- a/frontend/app/chat/_components/chat-input.tsx+++ b/frontend/app/chat/_components/chat-input.tsx@@ -5,7 +5,6 @@ import { useImperativeHandle, useMemo, useRef, useState } from "react";import { useDropzone } from "react-dropzone";import TextareaAutosize from "react-textarea-autosize";import { toast } from "sonner";-import type { FilterColor } from "@/components/filter-icon-popover";import { Button } from "@/components/ui/button";import {Popover,@@ -15,6 +14,7 @@ import {import { useIsCloudBrand } from "@/contexts/brand-context";import { useFileDrag } from "@/hooks/use-file-drag";import { useSupportedFileTypes } from "@/hooks/use-supported-file-types";+import type { FilterColor } from "@/lib/filter-constants";import { cn } from "@/lib/utils";import { useGetAllFiltersQuery } from "../../api/queries/useGetAllFiltersQuery";import type { KnowledgeFilterData } from "../_types/types";diff --git a/frontend/app/chat/_components/selected-knowledge-filter.tsx b/frontend/app/chat/_components/selected-knowledge-filter.tsxindex 1ed711ead..b4fffee50 100644--- a/frontend/app/chat/_components/selected-knowledge-filter.tsx+++ b/frontend/app/chat/_components/selected-knowledge-filter.tsx@@ -1,6 +1,6 @@import { X } from "lucide-react";-import type { FilterColor } from "@/components/filter-icon-popover";import { filterAccentClasses } from "@/components/knowledge-filter-panel";+import type { FilterColor } from "@/lib/filter-constants";import type { KnowledgeFilterData } from "../_types/types";interface SelectedKnowledgeFilterProps {diff --git a/frontend/app/knowledge/page.tsx b/frontend/app/knowledge/page.tsxindex 574c926a0..cb1a949d7 100644--- a/frontend/app/knowledge/page.tsx+++ b/frontend/app/knowledge/page.tsx@@ -43,6 +43,7 @@ import {import { useIsCloudBrand } from "@/contexts/brand-context";import { getConnectorDescriptor } from "@/lib/connectors/registry";import { formatFileSize } from "@/lib/file-format";+import { buildSearchPayloadFilters } from "@/lib/filter-normalization";import {buildKnowledgeTableRows,getKnowledgeFileIdentity,@@ -313,8 +314,12 @@ function SearchPage() {// Wildcard follows bar text or saved filter query (bar is cleared when a filter is picked).const effectiveSearchText =queryOverride.trim() || parsedFilterData?.query?.trim() || "";+ const hasActiveFilters = parsedFilterData?.filters+ ? buildSearchPayloadFilters(parsedFilterData.filters) !== undefined+ : false;const isWildcardQuery =- effectiveSearchText === "" || effectiveSearchText === "*";+ (effectiveSearchText === "" || effectiveSearchText === "*") &&+ !hasActiveFilters;const {data: listFilesData,diff --git a/frontend/components/filter-icon-popover.tsx b/frontend/components/filter-icon-popover.tsxindex 6b627e5fd..7cc77b635 100644--- a/frontend/components/filter-icon-popover.tsx+++ b/frontend/components/filter-icon-popover.tsx@@ -1,89 +1,22 @@"use client";-import {- Archive,- Bolt,- Book,- Cable,- Check,- Database,- FileImage,- Filter,- Folder,- Gem,- Ghost,- Globe,- Hammer,- HardDrive,- Layers3,- Library,- Map as MapIcon,- MessagesSquare,- Scroll,- Shield,- ShoppingBag,- ShoppingCart,- SquareStack,- Swords,- Upload,-} from "lucide-react";-import React, { type SVGProps } from "react";+import { Check } from "lucide-react";import {Popover,PopoverContent,PopoverTrigger,} from "@/components/ui/popover";+import {+ FILTER_COLORS,+ type FilterColor,+ ICON_MAP,+ type IconKey,+ iconKeyToComponent,+} from "@/lib/filter-constants";import { cn } from "@/lib/utils";import { filterAccentClasses } from "./knowledge-filter-panel";-const ICON_MAP = {- filter: Filter,- book: Book,- scroll: Scroll,- library: Library,- map: MapIcon,- image: FileImage,- layers3: Layers3,- database: Database,- folder: Folder,- archive: Archive,- messagesSquare: MessagesSquare,- squareStack: SquareStack,- ghost: Ghost,- gem: Gem,- swords: Swords,- bolt: Bolt,- shield: Shield,- hammer: Hammer,- globe: Globe,- hardDrive: HardDrive,- upload: Upload,- cable: Cable,- shoppingCart: ShoppingCart,- shoppingBag: ShoppingBag,-} as const;--export type IconKey = keyof typeof ICON_MAP;--export function iconKeyToComponent(- key?: string,-): React.ComponentType<SVGProps<SVGSVGElement>> | undefined {- if (!key) return undefined;- return (- ICON_MAP as Record<string, React.ComponentType<SVGProps<SVGSVGElement>>>- )[key];-}--const COLORS = [- "zinc",- "pink",- "purple",- "indigo",- "emerald",- "amber",- "red",-] as const;-export type FilterColor = (typeof COLORS)[number];+export type { FilterColor, IconKey };const colorSwatchClasses = {zinc: "bg-muted-foreground",@@ -128,7 +61,7 @@ export function FilterIconPopover({<PopoverContent className="w-80" align="start"><div className="space-y-4"><div className="grid grid-cols-7 items-center gap-2">- {COLORS.map((c) => (+ {FILTER_COLORS.map((c) => (<buttonkey={c}type="button"diff --git a/frontend/components/knowledge-filter-list.tsx b/frontend/components/knowledge-filter-list.tsxindex 3ea4dab66..2f3eb339a 100644--- a/frontend/components/knowledge-filter-list.tsx+++ b/frontend/components/knowledge-filter-list.tsx@@ -5,12 +5,12 @@ import { useGetAllFiltersQuery } from "@/app/api/queries/useGetAllFiltersQuery";import type { KnowledgeFilter } from "@/app/api/queries/useGetFiltersSearchQuery";import { useKnowledgeFilter } from "@/contexts/knowledge-filter-context";import { useTask } from "@/contexts/task-context";-import { cn } from "@/lib/utils";import {type FilterColor,type IconKey,iconKeyToComponent,-} from "./filter-icon-popover";+} from "@/lib/filter-constants";+import { cn } from "@/lib/utils";import { filterAccentClasses } from "./knowledge-filter-panel";interface ParsedQueryData {diff --git a/frontend/components/knowledge-filter-panel.tsx b/frontend/components/knowledge-filter-panel.tsxindex 660882958..774d69610 100644--- a/frontend/components/knowledge-filter-panel.tsx+++ b/frontend/components/knowledge-filter-panel.tsx@@ -10,11 +10,7 @@ import {EMPTY_SEARCH_RESULT,useGetSearchQuery,} from "@/app/api/queries/useGetSearchQuery";-import {- type FilterColor,- FilterIconPopover,- type IconKey,-} from "@/components/filter-icon-popover";+import { FilterIconPopover } from "@/components/filter-icon-popover";import { Button } from "@/components/ui/button";import {Card,@@ -32,6 +28,7 @@ import { useKnowledgeFilter } from "@/contexts/knowledge-filter-context";import { useTask } from "@/contexts/task-context";import { usePermissions } from "@/hooks/use-permissions";import { trackButton } from "@/lib/analytics";+import type { FilterColor, IconKey } from "@/lib/filter-constants";import {buildActiveSourceOptions,buildKnowledgeTableRows,@@ -39,7 +36,7 @@ import {interface FacetBucket {key: string;- count: number;+ count?: number;}interface AvailableFacets {@@ -118,6 +115,7 @@ export function KnowledgeFilterPanel() {// Load current filter data into controls when a filter is selecteduseEffect(() => {if (selectedFilter && parsedFilterData) {+ setNameError(null);setQuery(parsedFilterData.query || "");// Set the actual filter selections from the saved knowledge filter@@ -146,6 +144,7 @@ export function KnowledgeFilterPanel() {// Initialize defaults when entering create modeuseEffect(() => {if (createMode && parsedFilterData) {+ setNameError(null);setQuery(parsedFilterData.query || "");// Provide defaults for missing filter fieldsconst filters = parsedFilterData.filters || {};@@ -179,11 +178,13 @@ export function KnowledgeFilterPanel() {useEffect(() => {if (!aggregations) return;+ const extractKeys = (buckets: { key: string }[] = []): FacetBucket[] =>+ buckets.map((b) => ({ key: b.key }));const facets = {- data_sources: aggregations.data_sources?.buckets || [],- document_types: aggregations.document_types?.buckets || [],- owners: aggregations.owners?.buckets || [],- connector_types: aggregations.connector_types?.buckets || [],+ data_sources: extractKeys(aggregations.data_sources?.buckets),+ document_types: extractKeys(aggregations.document_types?.buckets),+ owners: extractKeys(aggregations.owners?.buckets),+ connector_types: extractKeys(aggregations.connector_types?.buckets),};setAvailableFacets(facets);}, [aggregations]);@@ -326,18 +327,19 @@ export function KnowledgeFilterPanel() {/></div></div>- {!createMode && selectedFilter?.created_at && (- <div className="space-y-2 text-xs text-right text-muted-foreground">- <span className="text-placeholder-foreground">Created</span>{" "}- {formatDate(selectedFilter.created_at)}- </div>- )}- {createMode && (- <div className="space-y-2 text-xs text-right text-muted-foreground">- <span className="text-placeholder-foreground">Created</span>{" "}- {formatDate(new Date().toISOString())}- </div>- )}+ <div className="text-xs min-h-[1.25rem]">+ {nameError ? (+ <span className="text-destructive">{nameError}</span>+ ) : (+ !createMode &&+ selectedFilter?.created_at && (+ <span className="text-muted-foreground">+ <span className="text-placeholder-foreground">Created</span>{" "}+ {formatDate(selectedFilter.created_at)}+ </span>+ )+ )}+ </div><div className="space-y-2"><Label htmlFor="filter-description">Description</Label><Textarea@@ -392,7 +394,6 @@ export function KnowledgeFilterPanel() {(bucket) => ({value: bucket.key,label: bucket.key,- count: bucket.count,}),)}value={selectedFilters.document_types}@@ -409,7 +410,6 @@ export function KnowledgeFilterPanel() {options={(availableFacets.owners || []).map((bucket) => ({value: bucket.key,label: bucket.key,- count: bucket.count,}))}value={selectedFilters.owners}onValueChange={(values) => handleFilterChange("owners", values)}@@ -424,7 +424,6 @@ export function KnowledgeFilterPanel() {(bucket) => ({value: bucket.key,label: bucket.key,- count: bucket.count,}),)}value={selectedFilters.connector_types}@@ -501,7 +500,6 @@ export function KnowledgeFilterPanel() {</div></CardContent><CardFooter className="mt-auto align-bottom justify-end gap-2">- {/* Save Configuration Button */}{createMode && (<ButtononClick={closePanelOnly}diff --git a/frontend/components/ui/multi-select.tsx b/frontend/components/ui/multi-select.tsxindex 129fbcdbb..0c3d3562c 100644--- a/frontend/components/ui/multi-select.tsx+++ b/frontend/components/ui/multi-select.tsx@@ -117,7 +117,11 @@ export function MultiSelect({<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /></Button></PopoverTrigger>- <PopoverContent className="p-0" align="start">+ <PopoverContent+ className="p-0"+ align="start"+ style={{ width: "var(--radix-popover-trigger-width)" }}+ ><Command><CommandInputplaceholder={searchPlaceholder}@@ -133,7 +137,9 @@ export function MultiSelect({onSelect={() => handleSelect("*")}className="cursor-pointer">- <span className="flex-1">{allOptionLabel}</span>+ <span className="flex-1 truncate min-w-0">+ {allOptionLabel}+ </span><CheckclassName={cn("mr-2 h-4 w-4",@@ -148,7 +154,9 @@ export function MultiSelect({onSelect={() => handleSelect(option.value)}className="cursor-pointer">- <span className="flex-1">{option.label}</span>+ <span className="flex-1 truncate min-w-0">+ {option.label}+ </span>{option.count !== undefined && (<span className="text-xs text-muted-foreground bg-muted/50 px-1.5 py-0.5 rounded ml-2">{option.count}diff --git a/frontend/contexts/knowledge-filter-context.tsx b/frontend/contexts/knowledge-filter-context.tsxindex a538484af..3f9acc0c8 100644--- a/frontend/contexts/knowledge-filter-context.tsx+++ b/frontend/contexts/knowledge-filter-context.tsx@@ -7,7 +7,11 @@ import React, {useCallback,useState,} from "react";-import { FilterColor, IconKey } from "@/components/filter-icon-popover";+import {+ FILTER_COLORS,+ type FilterColor,+ type IconKey,+} from "@/lib/filter-constants";interface KnowledgeFilter {id: string;@@ -163,7 +167,7 @@ export function KnowledgeFilterProvider({},limit: 10,scoreThreshold: 0,- color: "amber",+ color: FILTER_COLORS[Math.floor(Math.random() * FILTER_COLORS.length)],icon: "filter",});setIsPanelOpen(true);diff --git a/frontend/lib/filter-constants.ts b/frontend/lib/filter-constants.tsnew file mode 100644index 000000000..ded2d4f7a--- /dev/null+++ b/frontend/lib/filter-constants.ts@@ -0,0 +1,76 @@+import {+ Archive,+ Bolt,+ Book,+ Cable,+ Database,+ FileImage,+ Filter,+ Folder,+ Gem,+ Ghost,+ Globe,+ Hammer,+ HardDrive,+ Layers3,+ Library,+ Map as MapIcon,+ MessagesSquare,+ Scroll,+ Shield,+ ShoppingBag,+ ShoppingCart,+ SquareStack,+ Swords,+ Upload,+} from "lucide-react";+import type { SVGProps } from "react";++export const FILTER_COLORS = [+ "zinc",+ "pink",+ "purple",+ "indigo",+ "emerald",+ "amber",+ "red",+] as const;+export type FilterColor = (typeof FILTER_COLORS)[number];++export const ICON_MAP = {+ filter: Filter,+ book: Book,+ scroll: Scroll,+ library: Library,+ map: MapIcon,+ image: FileImage,+ layers3: Layers3,+ database: Database,+ folder: Folder,+ archive: Archive,+ messagesSquare: MessagesSquare,+ squareStack: SquareStack,+ ghost: Ghost,+ gem: Gem,+ swords: Swords,+ bolt: Bolt,+ shield: Shield,+ hammer: Hammer,+ globe: Globe,+ hardDrive: HardDrive,+ upload: Upload,+ cable: Cable,+ shoppingCart: ShoppingCart,+ shoppingBag: ShoppingBag,+} as const;++export type IconKey = keyof typeof ICON_MAP;++export function iconKeyToComponent(+ key?: string,+): React.ComponentType<SVGProps<SVGSVGElement>> | undefined {+ if (!key) return undefined;+ return (+ ICON_MAP as Record<string, React.ComponentType<SVGProps<SVGSVGElement>>>+ )[key];+}diff --git a/frontend/lib/knowledge-table-state.ts b/frontend/lib/knowledge-table-state.tsindex 24e425696..2bcd2a98b 100644--- a/frontend/lib/knowledge-table-state.ts+++ b/frontend/lib/knowledge-table-state.ts@@ -4,7 +4,7 @@ import type { TaskFile } from "@/contexts/task-context";export interface KnowledgeSourceOption {value: string;label: string;- count: number;+ count?: number;}export function getKnowledgeFileIdentity(file?: {@@ -277,22 +277,16 @@ export function buildKnowledgeTableRows(export function buildActiveSourceOptions(rows: SearchFile[],): KnowledgeSourceOption[] {- const sourceCounts = rows- .filter((file) => (file.status || "active") === "active")- .reduce((acc, file) => {- const source = file.filename?.trim() || file.source_url?.trim();- if (!source) {- return acc;- }- acc.set(source, (acc.get(source) || 0) + 1);- return acc;- }, new Map<string, number>());+ const seen = new Set<string>();+ const options: KnowledgeSourceOption[] = [];++ for (const file of rows) {+ if ((file.status || "active") !== "active") continue;+ const source = file.filename?.trim() || file.source_url?.trim();+ if (!source || seen.has(source)) continue;+ seen.add(source);+ options.push({ value: source, label: source });+ }- return Array.from(sourceCounts.entries())- .map(([source, count]) => ({- value: source,- label: source,- count,- }))- .sort((a, b) => a.label.localeCompare(b.label));+ return options.sort((a, b) => a.label.localeCompare(b.label));}