tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-06-23 15:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

onMount removed, removed current user to user

Browse Source
This commit is contained in:
Pranav-8bit 2024-10-01 23:47:27 +05:30
parent dfcc1371eb
commit 694801fbff
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/lib/components/album-page/album-options.svelte
View File

@ -1,7 +1,6 @@
<script lang="ts"> <script lang="ts">
import Icon from '$lib/components/elements/icon.svelte'; import Icon from '$lib/components/elements/icon.svelte';
import { import {
getMyUser,
updateAlbumInfo, updateAlbumInfo,
removeUserFromAlbum, removeUserFromAlbum,
type AlbumResponseDto, type AlbumResponseDto,
@ -21,17 +20,16 @@
import ConfirmDialog from '$lib/components/shared-components/dialog/confirm-dialog.svelte'; import ConfirmDialog from '$lib/components/shared-components/dialog/confirm-dialog.svelte';
import { notificationController, NotificationType } from '../shared-components/notification/notification'; import { notificationController, NotificationType } from '../shared-components/notification/notification';
import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte'; import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
import { onMount } from 'svelte';
export let album: AlbumResponseDto; export let album: AlbumResponseDto;
export let order: AssetOrder | undefined; export let order: AssetOrder | undefined;
export let user: UserResponseDto; // Declare user as a prop
export let onChangeOrder: (order: AssetOrder) => void; export let onChangeOrder: (order: AssetOrder) => void;
export let onClose: () => void; export let onClose: () => void;
export let onToggleEnabledActivity: () => void; export let onToggleEnabledActivity: () => void;
export let onShowSelectSharedUser: () => void; export let onShowSelectSharedUser: () => void;
export let onRemove: (userId: string) => void; export let onRemove: (userId: string) => void;
let currentUser: UserResponseDto | null = null;
let selectedRemoveUser: UserResponseDto | null = null; let selectedRemoveUser: UserResponseDto | null = null;
const options: Record<AssetOrder, RenderedOption> = { const options: Record<AssetOrder, RenderedOption> = {
@ -41,15 +39,6 @@
$: selectedOption = order ? options[order] : options[AssetOrder.Desc]; $: selectedOption = order ? options[order] : options[AssetOrder.Desc];
// Fetch the current user when the component mounts
onMount(async (): Promise<void> => {
try {
currentUser = await getMyUser();
} catch (error) {
handleError(error, $t('errors.unable_to_refresh_user'));
}
});
const handleToggle = async (returnedOption: RenderedOption): Promise<void> => { const handleToggle = async (returnedOption: RenderedOption): Promise<void> => {
if (selectedOption === returnedOption) { if (selectedOption === returnedOption) {
return; return;
@ -93,6 +82,7 @@
}; };
</script> </script>
{#if !selectedRemoveUser}
<FullScreenModal title={$t('options')} {onClose}> <FullScreenModal title={$t('options')} {onClose}>
<div class="items-center justify-center"> <div class="items-center justify-center">
<div class="py-2"> <div class="py-2">
@ -123,12 +113,13 @@
</div> </div>
<div>{$t('invite_people')}</div> <div>{$t('invite_people')}</div>
</button> </button>
{#if currentUser}
{#if user} <!-- Use user prop instead of $user -->
<div class="flex items-center gap-2 py-2 mt-2"> <div class="flex items-center gap-2 py-2 mt-2">
<div> <div>
<UserAvatar user={currentUser} size="md" /> <UserAvatar user={user} size="md" />
</div> </div>
<div class="w-full">{currentUser.name}</div> <div class="w-full">{user.name}</div>
<div>{$t('owner')}</div> <div>{$t('owner')}</div>
</div> </div>
{/if} {/if}
@ -150,6 +141,7 @@
</div> </div>
</div> </div>
</FullScreenModal> </FullScreenModal>
{/if}
{#if selectedRemoveUser} {#if selectedRemoveUser}
<ConfirmDialog <ConfirmDialog