diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index 48a526c4c1..352309671b 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -17,7 +17,7 @@ x-server-build: &server-common services: immich-server: container_name: immich_server - command: [ "./start-server.sh" ] + command: [ "start.sh", "immich" ] <<: *server-common ports: - 2283:3001 @@ -27,7 +27,7 @@ services: immich-microservices: container_name: immich_microservices - command: [ "./start-microservices.sh" ] + command: [ "start.sh", "microservices" ] <<: *server-common # extends: # file: hwaccel.transcoding.yml diff --git a/web/src/lib/components/asset-viewer/activity-viewer.svelte b/web/src/lib/components/asset-viewer/activity-viewer.svelte index f102a980ba..186625b912 100644 --- a/web/src/lib/components/asset-viewer/activity-viewer.svelte +++ b/web/src/lib/components/asset-viewer/activity-viewer.svelte @@ -291,8 +291,9 @@ {disabled} bind:this={textArea} bind:value={message} + use:autoGrowHeight={'5px'} placeholder={disabled ? 'Comments are disabled' : 'Say something'} - on:input={() => autoGrowHeight(textArea)} + on:input={() => autoGrowHeight(textArea, '5px')} on:keypress={handleEnter} class="h-[18px] {disabled ? 'cursor-not-allowed' diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index 1baabc9280..2c52cd4a3a 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -1,5 +1,4 @@ + + ($isShowDetail = false)} on:closeViewer={handleCloseViewer} - on:descriptionFocusIn={disableKeyDownEvent} - on:descriptionFocusOut={enableKeyDownEvent} /> {/if} diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 15d46da80b..17f3fa9fd4 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -40,6 +40,7 @@ import ChangeLocation from '../shared-components/change-location.svelte'; import UserAvatar from '../shared-components/user-avatar.svelte'; import LoadingSpinner from '../shared-components/loading-spinner.svelte'; + import { NotificationType, notificationController } from '../shared-components/notification/notification'; export let asset: AssetResponseDto; export let albums: AlbumResponseDto[] = []; @@ -101,9 +102,6 @@ const dispatch = createEventDispatcher<{ close: void; - descriptionFocusIn: void; - descriptionFocusOut: void; - click: AlbumResponseDto; closeViewer: void; }>(); @@ -139,19 +137,18 @@ showEditFaces = false; }; - const handleFocusIn = () => { - dispatch('descriptionFocusIn'); - }; - const handleFocusOut = async () => { textArea.blur(); if (description === originalDescription) { return; } originalDescription = description; - dispatch('descriptionFocusOut'); try { await updateAsset({ id: asset.id, updateAssetDto: { description } }); + notificationController.show({ + type: NotificationType.Info, + message: 'Asset description has been updated', + }); } catch (error) { handleError(error, 'Cannot update the description'); } @@ -220,7 +217,6 @@ class="max-h-[500px] w-full resize-none overflow-hidden border-b border-gray-500 bg-transparent text-base text-black outline-none transition-all focus:border-b-2 focus:border-immich-primary disabled:border-none dark:text-white dark:focus:border-immich-dark-primary" placeholder={isOwner ? 'Add a description' : ''} - on:focusin={handleFocusIn} on:focusout={handleFocusOut} on:input={() => autoGrowHeight(textArea)} bind:value={description} @@ -665,12 +661,7 @@ APPEARS IN {#each albums as album} - - dispatch('click', album)} - on:keydown={() => dispatch('click', album)} - > + { - textarea.scrollHeight; textarea.style.height = height; textarea.style.height = `${textarea.scrollHeight}px`; }; diff --git a/web/src/routes/(user)/albums/[albumId]/+page.svelte b/web/src/routes/(user)/albums/[albumId]/+page.svelte index 9d6106be6d..52b780acc2 100644 --- a/web/src/routes/(user)/albums/[albumId]/+page.svelte +++ b/web/src/routes/(user)/albums/[albumId]/+page.svelte @@ -83,8 +83,6 @@ let album = data.album; let description = album.description; - $: album = data.album; - $: { if (!album.isActivityEnabled && $numberOfComments === 0) { isShowActivity = false; @@ -452,7 +450,10 @@ description, }, }); - + notificationController.show({ + type: NotificationType.Info, + message: 'Album description has been updated', + }); album.description = description; } catch (error) { handleError(error, 'Error updating album description'); @@ -672,7 +673,9 @@ placeholder="Add description" /> {:else if description} - {description} + + {description} + {/if} {/if}
APPEARS IN
{description}
+ {description} +