High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: allow accounts with a quota of 0 GiB (#17413)
Ruben Hensen99cddf1fd687
diff --git a/docs/docs/administration/img/user-quota-size.webp b/docs/docs/administration/img/user-quota-size.webpindex 9b5464ba3c..2989bba392 100644Binary files a/docs/docs/administration/img/user-quota-size.webp and b/docs/docs/administration/img/user-quota-size.webp differdiff --git a/docs/docs/administration/user-management.mdx b/docs/docs/administration/user-management.mdxindex 9375730f1e..b98ffe0d69 100644--- a/docs/docs/administration/user-management.mdx+++ b/docs/docs/administration/user-management.mdx@@ -31,7 +31,7 @@ Admin can send a welcome email if the Email option is set, you can learn here hoAdmin can specify the storage quota for the user as the instance's admin; once the limit is reached, the user won't be able to upload to the instance anymore.-In order to select a storage quota, click on the pencil icon and enter the storage quota in GiB. You can choose an unlimited quota using the value 0 (default).+In order to select a storage quota, click on the pencil icon and enter the storage quota in GiB. You can choose an unlimited quota by leaving it empty (default).:::tipThe system administrator can see the usage quota percentage of all users in Server Stats page.diff --git a/i18n/en.json b/i18n/en.jsonindex de17cccebd..454b776aac 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -164,7 +164,6 @@"no_pattern_added": "No pattern added","note_apply_storage_label_previous_assets": "Note: To apply the Storage Label to previously uploaded assets, run the","note_cannot_be_changed_later": "NOTE: This cannot be changed later!",- "note_unlimited_quota": "Note: Enter 0 for unlimited quota","notification_email_from_address": "From address","notification_email_from_address_description": "Sender email address, for example: \"Immich Photo Server <[email protected]>\"","notification_email_host_description": "Host of the email server (e.g. smtp.immich.app)",@@ -929,7 +928,6 @@"no_shared_albums_message": "Create an album to share photos and videos with people in your network","not_in_any_album": "Not in any album","note_apply_storage_label_to_previously_uploaded assets": "Note: To apply the Storage Label to previously uploaded assets, run the",- "note_unlimited_quota": "Note: Enter 0 for unlimited quota","notes": "Notes","notification_toggle_setting_description": "Enable email notifications","notifications": "Notifications",@@ -1384,4 +1382,4 @@"yes": "Yes","you_dont_have_any_shared_links": "You don't have any shared links","zoom_image": "Zoom Image"-}\ No newline at end of file+}diff --git a/mobile/openapi/lib/model/user_admin_create_dto.dart b/mobile/openapi/lib/model/user_admin_create_dto.dartindex f2709be57b..4bd1266426 100644--- a/mobile/openapi/lib/model/user_admin_create_dto.dart+++ b/mobile/openapi/lib/model/user_admin_create_dto.dart@@ -36,7 +36,7 @@ class UserAdminCreateDto {String password;- /// Minimum value: 1+ /// Minimum value: 0int? quotaSizeInBytes;///diff --git a/mobile/openapi/lib/model/user_admin_update_dto.dart b/mobile/openapi/lib/model/user_admin_update_dto.dartindex 6c6f73ae8e..f0478c9b4c 100644--- a/mobile/openapi/lib/model/user_admin_update_dto.dart+++ b/mobile/openapi/lib/model/user_admin_update_dto.dart@@ -45,7 +45,7 @@ class UserAdminUpdateDto {///String? password;- /// Minimum value: 1+ /// Minimum value: 0int? quotaSizeInBytes;///diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.jsonindex ac30e9ae97..4e8e7ab834 100644--- a/open-api/immich-openapi-specs.json+++ b/open-api/immich-openapi-specs.json@@ -13624,7 +13624,7 @@},"quotaSizeInBytes": {"format": "int64",- "minimum": 1,+ "minimum": 0,"nullable": true,"type": "integer"},@@ -13763,7 +13763,7 @@},"quotaSizeInBytes": {"format": "int64",- "minimum": 1,+ "minimum": 0,"nullable": true,"type": "integer"},diff --git a/server/src/dtos/user.dto.ts b/server/src/dtos/user.dto.tsindex 0177e9b475..afcd13f0e9 100644--- a/server/src/dtos/user.dto.ts+++ b/server/src/dtos/user.dto.ts@@ -1,6 +1,6 @@import { ApiProperty } from '@nestjs/swagger';import { Transform } from 'class-transformer';-import { IsBoolean, IsEmail, IsNotEmpty, IsNumber, IsPositive, IsString } from 'class-validator';+import { IsBoolean, IsEmail, IsNotEmpty, IsNumber, IsString, Min } from 'class-validator';import { User, UserAdmin } from 'src/database';import { UserMetadataEntity, UserMetadataItem } from 'src/entities/user-metadata.entity';import { UserEntity } from 'src/entities/user.entity';@@ -77,7 +77,7 @@ export class UserAdminCreateDto {@Optional({ nullable: true })@IsNumber()- @IsPositive()+ @Min(0)@ApiProperty({ type: 'integer', format: 'int64' })quotaSizeInBytes?: number | null;@@ -115,7 +115,7 @@ export class UserAdminUpdateDto {@Optional({ nullable: true })@IsNumber()- @IsPositive()+ @Min(0)@ApiProperty({ type: 'integer', format: 'int64' })quotaSizeInBytes?: number | null;}diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.tsindex 747d7e4514..1b8a038b9c 100644--- a/server/src/services/asset-media.service.ts+++ b/server/src/services/asset-media.service.ts@@ -435,7 +435,7 @@ export class AssetMediaService extends BaseService {}private requireQuota(auth: AuthDto, size: number) {- if (auth.user.quotaSizeInBytes && auth.user.quotaSizeInBytes < auth.user.quotaUsageInBytes + size) {+ if (auth.user.quotaSizeInBytes !== null && auth.user.quotaSizeInBytes < auth.user.quotaUsageInBytes + size) {throw new BadRequestException('Quota has been exceeded!');}}diff --git a/web/src/lib/components/forms/create-user-form.svelte b/web/src/lib/components/forms/create-user-form.svelteindex 87de0a9068..83b3154d4b 100644--- a/web/src/lib/components/forms/create-user-form.svelte+++ b/web/src/lib/components/forms/create-user-form.svelte@@ -30,7 +30,7 @@let quotaSize: string | undefined = $state();let isCreatingUser = $state(false);- let quotaSizeInBytes = $derived(quotaSize ? convertToBytes(Number(quotaSize), ByteUnit.GiB) : null);+ let quotaSizeInBytes = $derived(quotaSize === null ? null : convertToBytes(Number(quotaSize), ByteUnit.GiB));let quotaSizeWarning = $derived(quotaSizeInBytes && userInteraction.serverInfo && quotaSizeInBytes > userInteraction.serverInfo.diskSizeRaw,);@@ -113,7 +113,7 @@</Field><Field label={$t('admin.quota_size_gib')}>- <Input bind:value={quotaSize} type="number" min="0" />+ <Input bind:value={quotaSize} type="number" placeholder={$t('unlimited')} min="0" />{#if quotaSizeWarning}<HelperText color="danger">{$t('errors.quota_higher_than_disk_size')}</HelperText>{/if}diff --git a/web/src/lib/components/forms/edit-user-form.svelte b/web/src/lib/components/forms/edit-user-form.svelteindex 2802ad3ab2..ab914e6430 100644--- a/web/src/lib/components/forms/edit-user-form.svelte+++ b/web/src/lib/components/forms/edit-user-form.svelte@@ -28,7 +28,7 @@onEditSuccess,}: Props = $props();- let quotaSize = $state(user.quotaSizeInBytes ? convertFromBytes(user.quotaSizeInBytes, ByteUnit.GiB) : null);+ let quotaSize = $state(user.quotaSizeInBytes === null ? null : convertFromBytes(user.quotaSizeInBytes, ByteUnit.GiB));const previousQutoa = user.quotaSizeInBytes;@@ -48,7 +48,7 @@email,name,storageLabel: storageLabel || '',- quotaSizeInBytes: quotaSize ? convertToBytes(Number(quotaSize), ByteUnit.GiB) : null,+ quotaSizeInBytes: quotaSize === null ? null : convertToBytes(Number(quotaSize), ByteUnit.GiB),},});@@ -126,8 +126,15 @@<p class="text-red-400 text-sm">{$t('errors.quota_higher_than_disk_size')}</p>{/if}</label>- <input class="immich-form-input" id="quotaSize" name="quotaSize" type="number" min="0" bind:value={quotaSize} />- <p>{$t('admin.note_unlimited_quota')}</p>+ <input+ class="immich-form-input"+ id="quotaSize"+ name="quotaSize"+ placeholder={$t('unlimited')}+ type="number"+ min="0"+ bind:value={quotaSize}+ /></div><div class="my-4 flex flex-col gap-2">diff --git a/web/src/routes/admin/user-management/+page.svelte b/web/src/routes/admin/user-management/+page.svelteindex 9ec2e9eab1..0ca17c4ed8 100644--- a/web/src/routes/admin/user-management/+page.svelte+++ b/web/src/routes/admin/user-management/+page.svelte@@ -209,7 +209,7 @@<td class="hidden sm:block w-3/12 text-ellipsis break-all px-2 text-sm">{immichUser.name}</td><td class="hidden xl:block w-3/12 2xl:w-2/12 text-ellipsis break-all px-2 text-sm"><div class="container mx-auto flex flex-wrap justify-center">- {#if immichUser.quotaSizeInBytes && immichUser.quotaSizeInBytes > 0}+ {#if immichUser.quotaSizeInBytes !== null && immichUser.quotaSizeInBytes >= 0}{getByteUnitString(immichUser.quotaSizeInBytes, $locale)}{:else}<Icon path={mdiInfinity} size="16" />