fix(web): User removal from option menu on the top in shared album (#12959)

* bug fix

* added few more type hint

* onMount removed, removed current user to user

* user check removed and conflict in view mode resolved between option and share info modal

* format fix

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
This commit is contained in:
Pranav tiwari
2024-10-10 14:26:08 +05:30
committed by GitHub
parent 53358c768c
commit 1baa49edb7
2 changed files with 106 additions and 48 deletions
@@ -345,7 +345,7 @@
}
};
const handleRemoveUser = async (userId: string) => {
const handleRemoveUser = async (userId: string, nextViewMode: ViewMode) => {
if (userId == 'me' || userId === $user.id) {
await goto(backUrl);
return;
@@ -353,7 +353,9 @@
try {
await refreshAlbum();
viewMode = album.albumUsers.length > 0 ? ViewMode.VIEW_USERS : ViewMode.VIEW;
// Dynamically set the view mode based on the passed argument
viewMode = album.albumUsers.length > 0 ? nextViewMode : ViewMode.VIEW;
} catch (error) {
handleError(error, $t('errors.error_deleting_shared_user'));
}
@@ -730,7 +732,7 @@
<ShareInfoModal
onClose={() => (viewMode = ViewMode.VIEW)}
{album}
onRemove={handleRemoveUser}
onRemove={(userId) => handleRemoveUser(userId, ViewMode.VIEW_USERS)}
onRefreshAlbum={refreshAlbum}
/>
{/if}
@@ -744,6 +746,7 @@
albumOrder = order;
await setModeToView();
}}
onRemove={(userId) => handleRemoveUser(userId, ViewMode.OPTIONS)}
onClose={() => (viewMode = ViewMode.VIEW)}
onToggleEnabledActivity={handleToggleEnableActivity}
onShowSelectSharedUser={() => (viewMode = ViewMode.SELECT_USERS)}