silberengel
/
gc-alexandria
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fixed event search

master
silberengel 8 months ago
parent
bd6d96ed62
commit
3f511dfcb1
2 changed files with 49 additions and 187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/lib/components/EventSearch.svelte
  2. 219
      src/routes/events/+page.svelte

17
src/lib/components/EventSearch.svelte
Unescape View File

@ -251,6 +251,11 @@ @@ -251,6 +251,11 @@
return;
}
// Check if we've already processed this searchValue
if (searchValue === lastProcessedSearchValue) {
return;
}
// If we already have the event for this searchValue, do nothing
if (foundEvent) {
const currentEventId = foundEvent.id;
@ -307,6 +312,7 @@ @@ -307,6 +312,7 @@
(currentNprofile && searchValue === currentNprofile)
) {
// Already displaying the event for this searchValue
lastProcessedSearchValue = searchValue;
return;
}
}
@ -318,6 +324,7 @@ @@ -318,6 +324,7 @@
searchTimeout = setTimeout(() => {
isProcessingSearch = true;
isWaitingForSearchResult = true;
lastProcessedSearchValue = searchValue;
if (searchValue) {
handleSearchEvent(false, searchValue);
}
@ -585,6 +592,11 @@ @@ -585,6 +592,11 @@
isProcessingSearch = false;
currentProcessingSearchValue = null;
isWaitingForSearchResult = false;
// Update last processed search value to prevent re-processing
if (searchValue) {
lastProcessedSearchValue = searchValue;
}
} catch (error) {
if (error instanceof Error && error.message === "Search cancelled") {
isProcessingSearch = false;
@ -628,6 +640,11 @@ @@ -628,6 +640,11 @@
isProcessingSearch = false;
currentProcessingSearchValue = null;
isWaitingForSearchResult = false;
// Update last processed search value to prevent re-processing even on error
if (searchValue) {
lastProcessedSearchValue = searchValue;
}
}
}

219
src/routes/events/+page.svelte
Unescape View File

@ -79,7 +79,19 @@ @@ -79,7 +79,19 @@
// Use Svelte 5 idiomatic effect to update searchValue when $page.url.searchParams.get('id') changes
$effect(() => {
const url = $page.url.searchParams;
searchValue = url.get("id") ?? url.get("d");
const idParam = url.get("id");
const dParam = url.get("d");
if (idParam) {
searchValue = idParam;
dTagValue = null;
} else if (dParam) {
searchValue = null;
dTagValue = dParam.toLowerCase();
} else {
searchValue = null;
dTagValue = null;
}
});
// Add support for t and n parameters
@ -92,12 +104,28 @@ @@ -92,12 +104,28 @@
// Decode the t parameter and set it as searchValue with t: prefix
const decodedT = decodeURIComponent(tParam);
searchValue = `t:${decodedT}`;
}
if (nParam) {
dTagValue = null;
} else if (nParam) {
// Decode the n parameter and set it as searchValue with n: prefix
const decodedN = decodeURIComponent(nParam);
searchValue = `n:${decodedN}`;
dTagValue = null;
}
});
// Handle side panel visibility based on search type
$effect(() => {
const url = $page.url.searchParams;
const hasIdParam = url.get("id");
const hasDParam = url.get("d");
const hasTParam = url.get("t");
const hasNParam = url.get("n");
// Close side panel for searches that return multiple results
if (hasDParam || hasTParam || hasNParam) {
showSidePanel = false;
event = null;
profile = null;
}
});
@ -316,190 +344,7 @@ @@ -316,190 +344,7 @@
communityStatus = { ...communityStatus, ...newCommunityStatus };
}
function updateSearchFromURL() {
const id = $page.url.searchParams.get("id");
const dTag = $page.url.searchParams.get("d");
const tParam = $page.url.searchParams.get("t");
const nParam = $page.url.searchParams.get("n");
console.log("Events page URL update:", {
id,
dTag,
tParam,
nParam,
searchValue,
});
if (id !== searchValue) {
console.log("ID changed, updating searchValue:", {
old: searchValue,
new: id,
});
searchValue = id;
dTagValue = null;
// Only close side panel if we're clearing the search
if (!id) {
showSidePanel = false;
event = null;
profile = null;
}
}
if (dTag !== dTagValue) {
console.log("DTag changed, updating dTagValue:", {
old: dTagValue,
new: dTag,
});
// Normalize d-tag to lowercase for consistent searching
dTagValue = dTag ? dTag.toLowerCase() : null;
searchValue = null;
// For d-tag searches (which return multiple results), close side panel
showSidePanel = false;
event = null;
profile = null;
}
// Handle t parameter
if (tParam) {
const decodedT = decodeURIComponent(tParam);
const tSearchValue = `t:${decodedT}`;
if (tSearchValue !== searchValue) {
console.log("T parameter changed, updating searchValue:", {
old: searchValue,
new: tSearchValue,
});
searchValue = tSearchValue;
dTagValue = null;
// For t-tag searches (which return multiple results), close side panel
showSidePanel = false;
event = null;
profile = null;
}
}
// Handle n parameter
if (nParam) {
const decodedN = decodeURIComponent(nParam);
const nSearchValue = `n:${decodedN}`;
if (nSearchValue !== searchValue) {
console.log("N parameter changed, updating searchValue:", {
old: searchValue,
new: nSearchValue,
});
searchValue = nSearchValue;
dTagValue = null;
// For n-tag searches (which return multiple results), close side panel
showSidePanel = false;
event = null;
profile = null;
}
}
// Reset state if all parameters are absent
if (!id && !dTag && !tParam && !nParam) {
event = null;
searchResults = [];
profile = null;
searchType = null;
searchTerm = null;
showSidePanel = false;
searchInProgress = false;
secondOrderSearchMessage = null;
}
}
// Force search when URL changes
function handleUrlChange() {
const id = $page.url.searchParams.get("id");
const dTag = $page.url.searchParams.get("d");
const tParam = $page.url.searchParams.get("t");
const nParam = $page.url.searchParams.get("n");
console.log("Events page URL change:", {
id,
dTag,
tParam,
nParam,
currentSearchValue: searchValue,
currentDTagValue: dTagValue,
});
// Handle ID parameter changes
if (id !== searchValue) {
console.log("ID parameter changed:", { old: searchValue, new: id });
searchValue = id;
dTagValue = null;
if (!id) {
showSidePanel = false;
event = null;
profile = null;
}
}
// Handle d-tag parameter changes
if (dTag !== dTagValue) {
console.log("d-tag parameter changed:", { old: dTagValue, new: dTag });
dTagValue = dTag ? dTag.toLowerCase() : null;
searchValue = null;
showSidePanel = false;
event = null;
profile = null;
}
// Handle t parameter changes
if (tParam) {
const decodedT = decodeURIComponent(tParam);
const tSearchValue = `t:${decodedT}`;
if (tSearchValue !== searchValue) {
console.log("t parameter changed:", {
old: searchValue,
new: tSearchValue,
});
searchValue = tSearchValue;
dTagValue = null;
showSidePanel = false;
event = null;
profile = null;
}
}
// Handle n parameter changes
if (nParam) {
const decodedN = decodeURIComponent(nParam);
const nSearchValue = `n:${decodedN}`;
if (nSearchValue !== searchValue) {
console.log("n parameter changed:", {
old: searchValue,
new: nSearchValue,
});
searchValue = nSearchValue;
dTagValue = null;
showSidePanel = false;
event = null;
profile = null;
}
}
// Reset state if all parameters are absent
if (!id && !dTag && !tParam && !nParam) {
console.log("All parameters absent, resetting state");
event = null;
searchResults = [];
profile = null;
searchType = null;
searchTerm = null;
showSidePanel = false;
searchInProgress = false;
secondOrderSearchMessage = null;
searchValue = null;
dTagValue = null;
}
}
// Listen for URL changes
$effect(() => {
handleUrlChange();
});
// Log relay configuration when page mounts
onMount(() => {

Write Preview
Loading…
Cancel
Save