Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-31 15:08:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: adds option to search only for untagged assets (#19730)

Browse Source 
Co-authored-by: SkwalExe <skwal@skwal.net>
This commit is contained in:
Léopold Koprivnik 2025-07-10 16:28:20 +02:00 committed by GitHub
parent 818bdde317
commit f778adea92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 75 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
i18n/en.json
View File

@ -1886,6 +1886,7 @@
"unselect_all_in": "Unselect all in {group}",
"unstack": "Un-stack",
"unstacked_assets_count": "Un-stacked {count, plural, one {# asset} other {# assets}}",
"untagged": "Untagged",
"up_next": "Up next",
"updated_at": "Updated",
"updated_password": "Updated password",

8
mobile/openapi/lib/model/metadata_search_dto.dart generated
View File

@ -241,7 +241,7 @@ class MetadataSearchDto {
String? state;
List<String> tagIds;
List<String>? tagIds;
///
/// Please note: This property should have been non-nullable! Since the specification file
@ -425,7 +425,7 @@ class MetadataSearchDto {
(rating == null ? 0 : rating!.hashCode) +
(size == null ? 0 : size!.hashCode) +
(state == null ? 0 : state!.hashCode) +
(tagIds.hashCode) +
(tagIds == null ? 0 : tagIds!.hashCode) +
(takenAfter == null ? 0 : takenAfter!.hashCode) +
(takenBefore == null ? 0 : takenBefore!.hashCode) +
(thumbnailPath == null ? 0 : thumbnailPath!.hashCode) +
@ -578,7 +578,11 @@ class MetadataSearchDto {
} else {
// json[r'state'] = null;
}
if (this.tagIds != null) {
json[r'tagIds'] = this.tagIds;
} else {
// json[r'tagIds'] = null;
}
if (this.takenAfter != null) {
json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
} else {

8
mobile/openapi/lib/model/random_search_dto.dart generated
View File

@ -155,7 +155,7 @@ class RandomSearchDto {
String? state;
List<String> tagIds;
List<String>? tagIds;
///
/// Please note: This property should have been non-nullable! Since the specification file
@ -310,7 +310,7 @@ class RandomSearchDto {
(rating == null ? 0 : rating!.hashCode) +
(size == null ? 0 : size!.hashCode) +
(state == null ? 0 : state!.hashCode) +
(tagIds.hashCode) +
(tagIds == null ? 0 : tagIds!.hashCode) +
(takenAfter == null ? 0 : takenAfter!.hashCode) +
(takenBefore == null ? 0 : takenBefore!.hashCode) +
(trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@ -416,7 +416,11 @@ class RandomSearchDto {
} else {
// json[r'state'] = null;
}
if (this.tagIds != null) {
json[r'tagIds'] = this.tagIds;
} else {
// json[r'tagIds'] = null;
}
if (this.takenAfter != null) {
json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
} else {

8
mobile/openapi/lib/model/smart_search_dto.dart generated
View File

@ -175,7 +175,7 @@ class SmartSearchDto {
String? state;
List<String> tagIds;
List<String>? tagIds;
///
/// Please note: This property should have been non-nullable! Since the specification file
@ -318,7 +318,7 @@ class SmartSearchDto {
(rating == null ? 0 : rating!.hashCode) +
(size == null ? 0 : size!.hashCode) +
(state == null ? 0 : state!.hashCode) +
(tagIds.hashCode) +
(tagIds == null ? 0 : tagIds!.hashCode) +
(takenAfter == null ? 0 : takenAfter!.hashCode) +
(takenBefore == null ? 0 : takenBefore!.hashCode) +
(trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@ -433,7 +433,11 @@ class SmartSearchDto {
} else {
// json[r'state'] = null;
}
if (this.tagIds != null) {
json[r'tagIds'] = this.tagIds;
} else {
// json[r'tagIds'] = null;
}
if (this.takenAfter != null) {
json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
} else {

8
mobile/openapi/lib/model/statistics_search_dto.dart generated
View File

@ -149,7 +149,7 @@ class StatisticsSearchDto {
String? state;
List<String> tagIds;
List<String>? tagIds;
///
/// Please note: This property should have been non-nullable! Since the specification file
@ -268,7 +268,7 @@ class StatisticsSearchDto {
(personIds.hashCode) +
(rating == null ? 0 : rating!.hashCode) +
(state == null ? 0 : state!.hashCode) +
(tagIds.hashCode) +
(tagIds == null ? 0 : tagIds!.hashCode) +
(takenAfter == null ? 0 : takenAfter!.hashCode) +
(takenBefore == null ? 0 : takenBefore!.hashCode) +
(trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@ -370,7 +370,11 @@ class StatisticsSearchDto {
} else {
// json[r'state'] = null;
}
if (this.tagIds != null) {
json[r'tagIds'] = this.tagIds;
} else {
// json[r'tagIds'] = null;
}
if (this.takenAfter != null) {
json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
} else {

4
open-api/immich-openapi-specs.json
View File

@ -11203,6 +11203,7 @@
"format": "uuid",
"type": "string"
},
"nullable": true,
"type": "array"
},
"takenAfter": {
@ -12092,6 +12093,7 @@
"format": "uuid",
"type": "string"
},
"nullable": true,
"type": "array"
},
"takenAfter": {
@ -13157,6 +13159,7 @@
"format": "uuid",
"type": "string"
},
"nullable": true,
"type": "array"
},
"takenAfter": {
@ -13348,6 +13351,7 @@
"format": "uuid",
"type": "string"
},
"nullable": true,
"type": "array"
},
"takenAfter": {

8
open-api/typescript-sdk/src/fetch-client.ts
View File

@ -889,7 +889,7 @@ export type MetadataSearchDto = {
rating?: number;
size?: number;
state?: string | null;
tagIds?: string[];
tagIds?: string[] | null;
takenAfter?: string;
takenBefore?: string;
thumbnailPath?: string;
@ -956,7 +956,7 @@ export type RandomSearchDto = {
rating?: number;
size?: number;
state?: string | null;
tagIds?: string[];
tagIds?: string[] | null;
takenAfter?: string;
takenBefore?: string;
trashedAfter?: string;
@ -993,7 +993,7 @@ export type SmartSearchDto = {
rating?: number;
size?: number;
state?: string | null;
tagIds?: string[];
tagIds?: string[] | null;
takenAfter?: string;
takenBefore?: string;
trashedAfter?: string;
@ -1025,7 +1025,7 @@ export type StatisticsSearchDto = {
personIds?: string[];
rating?: number;
state?: string | null;
tagIds?: string[];
tagIds?: string[] | null;
takenAfter?: string;
takenBefore?: string;
trashedAfter?: string;

4
server/src/dtos/search.dto.ts
View File

@ -92,8 +92,8 @@ class BaseSearchDto {
@ValidateUUID({ each: true, optional: true })
personIds?: string[];
@ValidateUUID({ each: true, optional: true })
tagIds?: string[];
@ValidateUUID({ each: true, optional: true, nullable: true })
tagIds?: string[] | null;
@ValidateUUID({ each: true, optional: true })
albumIds?: string[];

2
server/src/repositories/search.repository.ts
View File

@ -89,7 +89,7 @@ export interface SearchPeopleOptions {
}
export interface SearchTagOptions {
tagIds?: string[];
tagIds?: string[] | null;
}
export interface SearchAlbumOptions {

3
server/src/utils/database.ts
View File

@ -307,6 +307,9 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
.where('assets.visibility', '=', visibility)
.$if(!!options.albumIds && options.albumIds.length > 0, (qb) => inAlbums(qb, options.albumIds!))
.$if(!!options.tagIds && options.tagIds.length > 0, (qb) => hasTags(qb, options.tagIds!))
.$if(options.tagIds === null, (qb) =>
qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('tag_asset').whereRef('assetsId', '=', 'assets.id')))),
)
.$if(!!options.personIds && options.personIds.length > 0, (qb) => hasPeople(qb, options.personIds!))
.$if(!!options.createdBefore, (qb) => qb.where('assets.createdAt', '<=', options.createdBefore!))
.$if(!!options.createdAfter, (qb) => qb.where('assets.createdAt', '>=', options.createdAfter!))

3
web/src/lib/components/shared-components/combobox.svelte
View File

@ -33,6 +33,7 @@
interface Props {
label: string;
disabled?: boolean;
hideLabel?: boolean;
options?: ComboBoxOption[];
selectedOption?: ComboBoxOption | undefined;
@ -52,6 +53,7 @@
let {
label,
hideLabel = false,
disabled = false,
options = [],
selectedOption = $bindable(),
placeholder = '',
@ -275,6 +277,7 @@
<input
{placeholder}
{disabled}
aria-activedescendant={selectedIndex || selectedIndex === 0 ? `${listboxId}-${selectedIndex}` : ''}
aria-autocomplete="list"
aria-controls={listboxId}

23
web/src/lib/components/shared-components/search-bar/search-tags-section.svelte
View File

@ -3,13 +3,14 @@
import Combobox, { type ComboBoxOption } from '$lib/components/shared-components/combobox.svelte';
import { preferences } from '$lib/stores/user.store';
import { getAllTags, type TagResponseDto } from '@immich/sdk';
import { Checkbox, Label } from '@immich/ui';
import { mdiClose } from '@mdi/js';
import { onMount } from 'svelte';
import { t } from 'svelte-i18n';
import { SvelteSet } from 'svelte/reactivity';
interface Props {
selectedTags: SvelteSet<string>;
selectedTags: SvelteSet<string> | null;
}
let { selectedTags = $bindable() }: Props = $props();
@ -23,7 +24,7 @@
});
const handleSelect = (option?: ComboBoxOption) => {
if (!option || !option.id) {
if (!option || !option.id || selectedTags === null) {
return;
}
@ -32,6 +33,10 @@
};
const handleRemove = (tag: string) => {
if (selectedTags === null) {
return;
}
selectedTags.delete(tag);
};
</script>
@ -41,6 +46,7 @@
<form autocomplete="off" id="create-tag-form">
<div class="my-4 flex flex-col gap-2">
<Combobox
disabled={selectedTags === null}
onSelect={handleSelect}
label={$t('tags').toUpperCase()}
defaultFirstOption
@ -49,10 +55,21 @@
placeholder={$t('search_tags')}
/>
</div>
<div class="flex items-center gap-2">
<Checkbox
id="untagged-checkbox"
size="tiny"
checked={selectedTags === null}
onCheckedChange={(checked) => {
selectedTags = checked ? null : new SvelteSet();
}}
/>
<Label label={$t('untagged')} for="untagged-checkbox" />
</div>
</form>
<section class="flex flex-wrap pt-2 gap-1">
{#each selectedTags as tagId (tagId)}
{#each selectedTags ?? [] as tagId (tagId)}
{@const tag = tagMap[tagId]}
{#if tag}
<div class="flex group transition-all">

11
web/src/lib/modals/SearchFilterModal.svelte
View File

@ -8,7 +8,7 @@
query: string;
queryType: 'smart' | 'metadata' | 'description';
personIds: SvelteSet<string>;
tagIds: SvelteSet<string>;
tagIds: SvelteSet<string> | null;
location: SearchLocationFilter;
camera: SearchCameraFilter;
date: SearchDateFilter;
@ -68,7 +68,12 @@
query: 'query' in searchQuery ? searchQuery.query : searchQuery.originalFileName || '',
queryType: defaultQueryType(),
personIds: new SvelteSet('personIds' in searchQuery ? searchQuery.personIds : []),
tagIds: new SvelteSet('tagIds' in searchQuery ? searchQuery.tagIds : []),
tagIds:
'tagIds' in searchQuery
? searchQuery.tagIds === null
? null
: new SvelteSet(searchQuery.tagIds)
: new SvelteSet(),
location: {
country: withNullAsUndefined(searchQuery.country),
state: withNullAsUndefined(searchQuery.state),
@ -140,7 +145,7 @@
isFavorite: filter.display.isFavorite || undefined,
isNotInAlbum: filter.display.isNotInAlbum || undefined,
personIds: filter.personIds.size > 0 ? [...filter.personIds] : undefined,
tagIds: filter.tagIds.size > 0 ? [...filter.tagIds] : undefined,
tagIds: filter.tagIds === null ? null : filter.tagIds.size > 0 ? [...filter.tagIds] : undefined,
type,
rating: filter.rating,
};

7
web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
View File

@ -233,7 +233,10 @@
return personNames.join(', ');
}
async function getTagNames(tagIds: string[]) {
async function getTagNames(tagIds: string[] | null) {
if (tagIds === null) {
return $t('untagged');
}
const tagNames = await Promise.all(
tagIds.map(async (tagId) => {
const tag = await getTagById({ id: tagId });
@ -343,7 +346,7 @@
{#await getPersonName(value) then personName}
{personName}
{/await}
{:else if searchKey === 'tagIds' && Array.isArray(value)}
{:else if searchKey === 'tagIds' && (Array.isArray(value) || value === null)}
{#await getTagNames(value) then tagNames}
{tagNames}
{/await}