Skip to content

Commit

Permalink
fix(web): show search page errors and use feature flag (#8088)
Browse files Browse the repository at this point in the history
  • Loading branch information
michelheusschen committed Mar 20, 2024
1 parent 9c6a26d commit e810aae
Showing 1 changed file with 24 additions and 16 deletions.
40 changes: 24 additions & 16 deletions web/src/routes/(user)/search/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
import { handlePromiseError } from '$lib/utils';
import { parseUtcDate } from '$lib/utils/date-time';
import { featureFlags } from '$lib/stores/server-config.store';
import { handleError } from '$lib/utils/handle-error';
const MAX_ASSET_COUNT = 5000;
let { isViewing: showAssetViewer } = assetViewingStore;
Expand Down Expand Up @@ -98,11 +100,12 @@
type SearchTerms = MetadataSearchDto & Pick<SmartSearchDto, 'query'>;
$: searchQuery = $page.url.searchParams.get(QueryParameter.QUERY);
$: terms = ((): SearchTerms => {
return searchQuery ? JSON.parse(searchQuery) : {};
})();
let terms: SearchTerms;
$: terms = searchQuery ? JSON.parse(searchQuery) : {};
$: terms, handlePromiseError(onSearchQueryUpdate());
$: if (terms && $featureFlags.loaded) {
handlePromiseError(onSearchQueryUpdate());
}
async function onSearchQueryUpdate() {
nextPage = 1;
Expand All @@ -124,18 +127,23 @@
...terms,
};
const { albums, assets } =
'query' in searchDto
? await searchSmart({ smartSearchDto: searchDto })
: await searchMetadata({ metadataSearchDto: searchDto });
searchResultAlbums.push(...albums.items);
searchResultAssets.push(...assets.items);
searchResultAlbums = searchResultAlbums;
searchResultAssets = searchResultAssets;
nextPage = assets.nextPage ? Number(assets.nextPage) : null;
isLoading = false;
try {
const { albums, assets } =
'query' in searchDto && $featureFlags.smartSearch
? await searchSmart({ smartSearchDto: searchDto })
: await searchMetadata({ metadataSearchDto: searchDto });
searchResultAlbums.push(...albums.items);
searchResultAssets.push(...assets.items);
searchResultAlbums = searchResultAlbums;
searchResultAssets = searchResultAssets;
nextPage = assets.nextPage ? Number(assets.nextPage) : null;
} catch (error) {
handleError(error, 'Loading search results failed');
} finally {
isLoading = false;
}
};
function getHumanReadableDate(dateString: string) {
Expand Down

0 comments on commit e810aae

Please sign in to comment.