π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
Fix advanced search state management
Smaug67393e66c07dcea6
diff --git a/backend/models/node.model.go b/backend/models/node.model.goindex 0054cf51..bbd231ef 100644--- a/backend/models/node.model.go+++ b/backend/models/node.model.go@@ -42,5 +42,6 @@ type NodeSearchResult struct {Icon *string `json:"icon"`Relevance float64 `json:"relevance"`ContentSnippet *string `json:"content_snippet,omitempty"`+ CreatedTimestamp int64 `json:"created_timestamp"`UpdatedTimestamp int64 `json:"updated_timestamp"`}diff --git a/backend/repositories/node.repository.go b/backend/repositories/node.repository.goindex 8f829d8a..3fd7d5e8 100644--- a/backend/repositories/node.repository.go+++ b/backend/repositories/node.repository.go@@ -144,6 +144,7 @@ func (r *NodeRepositoryImpl) prepareStatements() error {SELECT n.id, n.user_id, n.parent_id, n.name, n.description, n.tags, n.role, n.icon,MATCH(n.name, n.description, n.tags, n.content) AGAINST(? IN NATURAL LANGUAGE MODE) AS relevance,NULL AS content_snippet,+ n.created_timestamp,n.updated_timestampFROM nodes nWHERE n.user_id = ? AND n.role = 3@@ -158,6 +159,7 @@ func (r *NodeRepositoryImpl) prepareStatements() error {SUBSTRING(n.content,GREATEST(1, LOCATE(?, LOWER(n.content)) - 50),200) AS content_snippet,+ n.created_timestamp,n.updated_timestampFROM nodes nWHERE n.user_id = ? AND n.role = 3@@ -585,6 +587,7 @@ func (r *NodeRepositoryImpl) SearchFulltext(userId types.Snowflake, query string&result.Icon,&result.Relevance,&result.ContentSnippet,+ &result.CreatedTimestamp,&result.UpdatedTimestamp,)if err != nil {diff --git a/frontend/app/components/CommandCenter/AdvancedSearchTab.vue b/frontend/app/components/CommandCenter/AdvancedSearchTab.vueindex f543c674..a336ec58 100644--- a/frontend/app/components/CommandCenter/AdvancedSearchTab.vue+++ b/frontend/app/components/CommandCenter/AdvancedSearchTab.vue@@ -18,20 +18,20 @@<div class="date-filters"><div class="date-input"><label>From</label>- <input v-model="searchQuery.fromDate" type="date" class="date-picker" />+ <input v-model="dateFrom" type="date" class="date-picker" /></div><div class="date-input"><label>To</label>- <input v-model="searchQuery.toDate" type="date" class="date-picker" />+ <input v-model="dateTo" type="date" class="date-picker" /></div></div><div class="radio-group"><label class="radio-option">- <input v-model="searchQuery.dateType" type="radio" value="created" />+ <input v-model="dateType" type="radio" value="created" /><span>Created</span></label><label class="radio-option">- <input v-model="searchQuery.dateType" type="radio" value="modified" />+ <input v-model="dateType" type="radio" value="modified" /><span>Modified</span></label></div>@@ -40,7 +40,7 @@<div class="filter-group"><label class="filter-label">Category</label>- <AppSelect v-model="searchQuery.category" :items="categoriesTree" :nullable="true" placeholder="All categories" />+ <AppSelect v-model="selectedCategory" :items="categoriesTree" :nullable="true" placeholder="All categories" /></div><div class="filter-group">@@ -78,8 +78,8 @@</div></div></div>- <div v-if="searchQuery.tags?.length" class="selected-tags">- <span v-for="tag in searchQuery.tags" :key="tag" class="tag-chip">+ <div v-if="selectedTags?.length" class="selected-tags">+ <span v-for="tag in selectedTags" :key="tag" class="tag-chip">{{ tag }}<button class="remove-tag" @click.stop="removeTag(tag)">Γ</button></span>@@ -107,7 +107,7 @@<script setup lang="ts">import SearchResultsList from './SearchResultsList.vue';-import type { SearchOptions, Node, NodeSearchResult } from '~/stores';+import type { Node, NodeSearchResult } from '~/stores';const props = defineProps<{ query: string; selectedIndex: number }>();@@ -120,79 +120,94 @@ const categoriesTree = new TreeStructure(useSidebarTree().nodes.value.filter(n =const showFilters = ref(true);const showSuggestions = ref(false);const selectedSuggestionIndex = ref(0);-const tagInput = ref('');// Search Stateconst searchInContent = ref(true);const searchResults = ref<(NodeSearchResult | Node)[]>([]);-const isLoading = ref(false);--const searchQuery = ref<SearchOptions>({- query: props.query,- dateType: 'created',-});+const dateFrom = ref('');+const dateTo = ref('');+const dateType = ref<'created' | 'modified'>('modified');+const tagInput = ref('');+const selectedTags = ref<string[]>([]);+const selectedCategory = ref('');/*** Global search function* - If searchInContent is ON and query >= 2 chars β API fulltext search* - Otherwise β local store search*/-async function search(query: string) {- const shouldUseAPI = searchInContent.value && query.length >= 2;-- if (shouldUseAPI) {- // API fulltext search- isLoading.value = true;- try {- const apiResults = await nodesStore.searchFulltext(query, true, 30);- searchResults.value = applyFilters(apiResults);- } catch (error) {- console.error('[CommandCenter] Fulltext search error:', error);- searchResults.value = [];- } finally {- isLoading.value = false;- }- } else {- // Local store search (instant, no API)- searchResults.value = nodesStore.search({ ...searchQuery.value, query, role: 3 });++async function searchAPI() {+ try {+ const apiResults = await nodesStore.searchFulltext(props.query, true, 30);+ searchResults.value = applyFilters(apiResults);+ } catch (error) {+ console.error('[CommandCenter] Fulltext search error:', error);+ searchResults.value = [];}}+const searchAPIdebounced = useDebounceFn(() => searchAPI(), 300);++async function localSearch() {+ searchResults.value = nodesStore.search({+ query: props.query,+ category: selectedCategory.value,+ dateType: dateType.value,+ fromDate: dateFrom.value ? new Date(dateFrom.value) : undefined,+ toDate: dateTo.value ? new Date(dateTo.value) : undefined,+ tags: selectedTags.value,+ role: 3,+ });+}+/*** Apply additional filters to API results (category, tags, dates)*/function applyFilters(results: (NodeSearchResult | Node)[]): (NodeSearchResult | Node)[] {let filtered = [...results];- if (searchQuery.value.category) {- filtered = filtered.filter(d => d.parent_id === searchQuery.value.category);+ // Apply category filter+ if (selectedCategory.value) {+ filtered = filtered.filter(d => d.parent_id === selectedCategory.value);}- if (searchQuery.value.tags?.length) {+ // Apply tag filters+ if (selectedTags.value.length) {filtered = filtered.filter(d => {if (!d.tags) return false;const nodeTags = d.tags.split(',').map(t => t.trim());- return searchQuery.value.tags!.some(tag => nodeTags.includes(tag));+ return selectedTags.value.some(tag => nodeTags.includes(tag));});}- if (searchQuery.value.fromDate || searchQuery.value.toDate) {+ // Apply date filters+ const fromDate = dateFrom.value ? new Date(dateFrom.value) : null;+ const toDate = dateTo.value ? new Date(dateTo.value) : null;+ if (fromDate || toDate) {filtered = filtered.filter(d => {- const date = new Date(d.updated_timestamp);- if (searchQuery.value.fromDate && date < new Date(searchQuery.value.fromDate)) return false;- if (searchQuery.value.toDate && date > new Date(searchQuery.value.toDate)) return false;- return true;+ const timestamp = dateType.value === 'created' ? d.created_timestamp : d.updated_timestamp;+ const nodeDate = new Date(timestamp);+ if (fromDate && nodeDate < fromDate) return false;+ if (toDate && nodeDate > toDate) return false;});}return filtered;}-// Debounced search (300ms) - single watcher for all search triggers-const debouncedSearch = useDebounceFn((query: string) => search(query), 300);--// Watch all search-related changes and trigger debounced search-watch([() => props.query, searchInContent, () => searchQuery.value], ([query]) => debouncedSearch(query), { immediate: true, deep: true });+// Watch all search-related changes and trigger search+watch(+ [() => props.query, searchInContent, dateFrom, dateTo, dateType, selectedCategory, selectedTags],+ () => {+ if (props.query.length >= 2 && searchInContent.value) {+ searchAPIdebounced();+ } else {+ localSearch();+ }+ },+ { immediate: true, deep: true },+);const filteredTagSuggestions = computed(() => {if (!tagInput.value) return [];@@ -258,9 +273,8 @@ function escapeHtml(text: string): string {function addTag() {const tag = tagInput.value.trim();- if (!searchQuery.value.tags) searchQuery.value.tags = [];- if (tag && !searchQuery.value.tags.includes(tag)) {- searchQuery.value.tags.push(tag);+ if (tag && !selectedTags.value.includes(tag)) {+ selectedTags.value.push(tag);tagInput.value = '';showSuggestions.value = false;}@@ -268,8 +282,7 @@ function addTag() {function selectTag(tag?: string) {if (!tag) return;- if (!searchQuery.value.tags) searchQuery.value.tags = [];- searchQuery.value.tags?.push(tag);+ selectedTags.value.push(tag);tagInput.value = '';showSuggestions.value = false;}@@ -313,12 +326,17 @@ function toggleFilters() {}function removeTag(tag: string) {- searchQuery.value.tags = searchQuery.value.tags?.filter(t => t !== tag);+ selectedTags.value = selectedTags.value.filter(t => t !== tag);}function clearFilters() {- searchQuery.value = { query: props.query, dateType: 'created' };+ selectedTags.value = [];tagInput.value = '';+ selectedCategory.value = '';+ dateFrom.value = '';+ dateTo.value = '';+ dateType.value = 'modified';+ searchInContent.value = true;}function getDocumentIcon(doc: NodeSearchResult | Node): string {@@ -467,9 +485,7 @@ defineExpose({ flattenedItems });}.tag-input {- padding: 6px 8px;border: 1px solid var(--border-color);- border-radius: 4px;font-size: 12px;background: var(--bg-color);flex: 1;@@ -552,7 +568,7 @@ defineExpose({ flattenedItems });justify-content: center;&:hover {- color: white;+ color: var(--opposite-color);}}}diff --git a/frontend/app/stores/db_strustures.d.ts b/frontend/app/stores/db_strustures.d.tsindex 6dbb8cdb..b81cedfd 100644--- a/frontend/app/stores/db_strustures.d.ts+++ b/frontend/app/stores/db_strustures.d.ts@@ -75,6 +75,7 @@ export interface NodeSearchResult {icon?: string;relevance: number;content_snippet?: string;+ created_timestamp: number;updated_timestamp: number;}