rename stuff

This commit is contained in:
mgabor
2024-04-16 18:14:08 +02:00
parent 38bab135af
commit 9677d6108a
34 changed files with 471 additions and 487 deletions

View File

@@ -1,5 +1,11 @@
<script lang="ts">
import { getMyUserInfo, removeUserFromAlbum, type AlbumResponseDto, type UserResponseDto, setAlbumPermission } from '@immich/sdk';
import {
getMyUserInfo,
removeUserFromAlbum,
type AlbumResponseDto,
type UserResponseDto,
updateAlbumUser,
} from '@immich/sdk';
import { mdiDotsVertical } from '@mdi/js';
import { createEventDispatcher, onMount } from 'svelte';
import { getContextMenuPosition } from '../../utils/context-menu';
@@ -17,7 +23,7 @@
const dispatch = createEventDispatcher<{
remove: string;
updatePermissions: void
refreshAlbum: void;
}>();
let currentUser: UserResponseDto;
@@ -67,16 +73,16 @@
const handleSetReadonly = async (user: UserResponseDto, readonly: boolean) => {
try {
await setAlbumPermission({ id: album.id, userId: user.id , setAlbumPermissionDto: { readonly } });
await updateAlbumUser({ id: album.id, userId: user.id, updateAlbumUserDto: { readonly } });
const message = readonly ? `Set ${user.name} as viewer` : `Set ${user.name} as editor`;
dispatch('updatePermissions');
dispatch('refreshAlbum');
notificationController.show({ type: NotificationType.Info, message });
} catch (error) {
handleError(error, 'Unable to set permission');
} finally {
selectedRemoveUser = null;
}
}
};
</script>
{#if !selectedRemoveUser}
@@ -92,11 +98,15 @@
<p class="text-sm">Owner</p>
</div>
</div>
{#each album.albumPermissions.toSorted((a, b) => {
if (a.readonly && !b.readonly) return 1;
if (!a.readonly && b.readonly) return -1;
{#each album.sharedUsersV2.toSorted((a, b) => {
if (a.readonly && !b.readonly) {
return 1;
}
if (!a.readonly && b.readonly) {
return -1;
}
return a.user.name.localeCompare(b.user.name);
}) as {user, readonly}}
}) as { user, readonly }}
<div
class="flex w-full place-items-center justify-between gap-4 p-5 transition-colors hover:bg-gray-50 dark:hover:bg-gray-700"
>

View File

@@ -136,8 +136,8 @@
$: showActivityStatus =
album.sharedUsers.length > 0 && !$showAssetViewer && (album.isActivityEnabled || $numberOfComments > 0);
$: userHasWriteAccess = !album.albumPermissions.find(({ user: {id } }) => id === $user.id)?.readonly;
$: albumHasReadonlyUsers = album.albumPermissions.some(({ readonly }) => readonly);
$: userHasWriteAccess = !album.sharedUsersV2.find(({ user: { id } }) => id === $user.id)?.readonly;
$: albumHasReadonlyUsers = album.sharedUsersV2.some(({ readonly }) => readonly);
afterNavigate(({ from }) => {
assetViewingStore.showAssetViewer(false);
@@ -344,14 +344,6 @@
}
};
const handleUpdatePermissions = async () => {
try {
await refreshAlbum();
} catch (error) {
handleError(error, 'Error updating permissions');
}
};
const handleDownloadAlbum = async () => {
await downloadAlbum(album);
};
@@ -592,7 +584,7 @@
</button>
<!-- users with write access (collaborators) -->
{#each album.albumPermissions.filter(({readonly}) => !readonly) as {user} (user.id)}
{#each album.sharedUsersV2.filter(({ readonly }) => !readonly) as { user } (user.id)}
<button on:click={() => (viewMode = ViewMode.VIEW_USERS)}>
<UserAvatar {user} size="md" />
</button>
@@ -703,7 +695,7 @@
onClose={() => (viewMode = ViewMode.VIEW)}
{album}
on:remove={({ detail: userId }) => handleRemoveUser(userId)}
on:updatePermissions={handleUpdatePermissions}
on:refreshAlbum={refreshAlbum}
/>
{/if}