Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(web): quota enhancement #6371

Merged
merged 12 commits into from
Jan 15, 2024
Merged

chore(web): quota enhancement #6371

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
70c8f3b
chore(web): quota enhancement
alextran1502 Jan 14, 2024
68e0181
show quota in user table
alextran1502 Jan 14, 2024
1f1c751
update quota for single user ioption
alextran1502 Jan 14, 2024
dadd744
Add a note how to set unlimited storage
alextran1502 Jan 14, 2024
af8b056
fixed deletion doesn't update quota
alextran1502 Jan 14, 2024
2f0ee16
refactor relation
alextran1502 Jan 14, 2024
af63ebc
fixed test
alextran1502 Jan 14, 2024
0476b0e
re-refactor
alextran1502 Jan 15, 2024
220f11d
update sql
alextran1502 Jan 15, 2024
09b6228
fix e2e test
alextran1502 Jan 15, 2024
fe39ee2
Update server/src/domain/user/user.service.ts
alextran1502 Jan 15, 2024
ecbceac
revert e2e test
alextran1502 Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/domain/user/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export class UserService {

async update(auth: AuthDto, dto: UpdateUserDto): Promise<UserResponseDto> {
await this.findOrFail(dto.id, {});
await this.userRepository.syncUsage();
alextran1502 marked this conversation as resolved.
Show resolved Hide resolved
return this.userCore.updateUser(auth.user, dto.id, dto).then(mapUser);
}

Expand Down
11 changes: 11 additions & 0 deletions web/src/routes/admin/user-management/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
<tr class="flex w-full place-items-center">
<th class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-center text-sm font-medium">Email</th>
<th class="hidden sm:block w-3/12 text-center text-sm font-medium">Name</th>
<th class="hidden xl:block w-3/12 2xl:w-2/12 text-center text-sm font-medium">Has quota</th>
<th class="hidden xl:block w-3/12 2xl:w-2/12 text-center text-sm font-medium">Can import</th>
<th class="w-4/12 lg:w-3/12 xl:w-2/12 text-center text-sm font-medium">Action</th>
</tr>
Expand All @@ -191,6 +192,15 @@
>{immichUser.email}</td
>
<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}
<Icon path={mdiCheck} size="16" />
alextran1502 marked this conversation as resolved.
Show resolved Hide resolved
{:else}
<Icon path={mdiClose} size="16" />
{/if}
</div>
</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.externalPath}
Expand All @@ -200,6 +210,7 @@
{/if}
</div>
</td>

<td class="w-4/12 lg:w-3/12 xl:w-2/12 text-ellipsis break-all px-4 text-sm">
{#if !isDeleted(immichUser)}
<button
Expand Down
Loading