Justin Forseth
d3a5490e71
* Allow submission of null country
* Update searchAssetBuilder to handle nulls
andWhere({country:null}) produces `"exifInfo"."country" = NULL`. We want
`"exifInfo"."country" IS NULL`, so we have to treat NULL as a special
case
* Allow null country in frontend
* Make the query code a bit more straightforward
* Remove unused brackets import
* Remove log message
* Don't change whitespace for no reason
* Fix prettier style issue
* Update search.dto.ts validators per @jrasm91's recommendation
* Update api types
* Combine null country and state into one guard clause
* chore: clean up
* chore: add e2e for null/empty city, state, country search
* refactor: server returns suggestion for null values
* chore: clean up
---------
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
Co-authored-by: Jason Rasmussen <jason@rasm.me>
77 lines
2.2 KiB
Svelte
77 lines
2.2 KiB
Svelte
<script lang="ts" context="module">
|
|
export interface SearchCameraFilter {
|
|
make?: string;
|
|
model?: string;
|
|
}
|
|
</script>
|
|
|
|
<script lang="ts">
|
|
import Combobox, { asComboboxOptions, asSelectedOption } from '$lib/components/shared-components/combobox.svelte';
|
|
import { handlePromiseError } from '$lib/utils';
|
|
import { SearchSuggestionType, getSearchSuggestions } from '@immich/sdk';
|
|
import { t } from 'svelte-i18n';
|
|
|
|
export let filters: SearchCameraFilter;
|
|
|
|
let makes: string[] = [];
|
|
let models: string[] = [];
|
|
|
|
$: makeFilter = filters.make;
|
|
$: modelFilter = filters.model;
|
|
$: handlePromiseError(updateMakes(modelFilter));
|
|
$: handlePromiseError(updateModels(makeFilter));
|
|
|
|
async function updateMakes(model?: string) {
|
|
const results: Array<string | null> = await getSearchSuggestions({
|
|
$type: SearchSuggestionType.CameraMake,
|
|
model,
|
|
includeNull: true,
|
|
});
|
|
if (filters.make && !makes.includes(filters.make)) {
|
|
filters.make = undefined;
|
|
}
|
|
|
|
makes = results.map((result) => result ?? '');
|
|
}
|
|
|
|
async function updateModels(make?: string) {
|
|
const results: Array<string | null> = await getSearchSuggestions({
|
|
$type: SearchSuggestionType.CameraModel,
|
|
make,
|
|
includeNull: true,
|
|
});
|
|
|
|
const models = results.map((result) => result ?? '');
|
|
|
|
if (filters.model && !models.includes(filters.model)) {
|
|
filters.model = undefined;
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<div id="camera-selection">
|
|
<p class="immich-form-label">{$t('camera').toUpperCase()}</p>
|
|
|
|
<div class="grid grid-cols-[repeat(auto-fit,minmax(10rem,1fr))] gap-5 mt-1">
|
|
<div class="w-full">
|
|
<Combobox
|
|
label={$t('make')}
|
|
on:select={({ detail }) => (filters.make = detail?.value)}
|
|
options={asComboboxOptions(makes)}
|
|
placeholder={$t('search_camera_make')}
|
|
selectedOption={asSelectedOption(makeFilter)}
|
|
/>
|
|
</div>
|
|
|
|
<div class="w-full">
|
|
<Combobox
|
|
label={$t('model')}
|
|
on:select={({ detail }) => (filters.model = detail?.value)}
|
|
options={asComboboxOptions(models)}
|
|
placeholder={$t('search_camera_model')}
|
|
selectedOption={asSelectedOption(modelFilter)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|