edit esekShare in albumedit

esek · Oct 17, 2024 · e5e5a89 · e5e5a89
1 parent 8391bd7
commit e5e5a89
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 8 deletions.
diff --git a/mobile/openapi/lib/model/album_response_dto.dart b/mobile/openapi/lib/model/album_response_dto.dart
diff --git a/mobile/openapi/lib/model/update_album_dto.dart b/mobile/openapi/lib/model/update_album_dto.dart
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
@@ -7624,6 +7624,9 @@
             "format": "date-time",
             "type": "string"
           },
+          "esekShared": {
+            "type": "boolean"
+          },
           "hasSharedLink": {
             "type": "boolean"
           },
@@ -7666,6 +7669,7 @@
           "assets",
           "createdAt",
           "description",
+          "esekShared",
           "hasSharedLink",
           "id",
           "isActivityEnabled",
@@ -12399,6 +12403,9 @@
           "description": {
             "type": "string"
           },
+          "esekShared": {
+            "type": "boolean"
+          },
           "isActivityEnabled": {
             "type": "boolean"
           },

diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
@@ -284,6 +284,7 @@ export type AlbumResponseDto = {
     createdAt: string;
     description: string;
     endDate?: string;
+    esekShared: boolean;
     hasSharedLink: boolean;
     id: string;
     isActivityEnabled: boolean;
@@ -314,6 +315,7 @@ export type UpdateAlbumDto = {
     albumName?: string;
     albumThumbnailAssetId?: string;
     description?: string;
+    esekShared?: boolean;
     isActivityEnabled?: boolean;
     order?: AssetOrder;
 };

diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
@@ -71,6 +71,9 @@ export class UpdateAlbumDto {
   @ValidateBoolean({ optional: true })
   isActivityEnabled?: boolean;
 
+  @ValidateBoolean({optional: false})
+  esekShared?: boolean;
+
   @IsEnum(AssetOrder)
   @Optional()
   @ApiProperty({ enum: AssetOrder, enumName: 'AssetOrder' })
@@ -130,6 +133,7 @@ export class AlbumResponseDto {
   updatedAt!: Date;
   albumThumbnailAssetId!: string | null;
   shared!: boolean;
+  esekShared!: boolean;
   albumUsers!: AlbumUserResponseDto[];
   hasSharedLink!: boolean;
   assets!: AssetResponseDto[];
@@ -185,6 +189,7 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
     owner: mapUser(entity.owner),
     albumUsers: albumUsersSorted,
     shared: hasSharedUser || hasSharedLink,
+    esekShared: entity.esekShared,
     hasSharedLink,
     startDate,
     endDate,

diff --git a/server/src/middleware/auth.guard.ts b/server/src/middleware/auth.guard.ts
@@ -88,15 +88,15 @@ export class AuthGuard implements CanActivate {
     const {
       admin: adminRoute,
       sharedLink: sharedLinkRoute,
-      esekShare: esekShareRoute,
+      esekShared: esekSharedRoute,
       permission,
-    } = { sharedLink: false, esekShare: false, admin: false, ...options };
+    } = { sharedLink: false, esekShared: false, admin: false, ...options };
     const request = context.switchToHttp().getRequest<AuthRequest>();
 
     request.user = await this.authService.authenticate({
       headers: request.headers,
       queryParams: request.query as Record<string, string>,
-      metadata: { adminRoute, esekShareRoute, sharedLinkRoute, permission, uri: request.path },
+      metadata: { adminRoute, esekSharedRoute, sharedLinkRoute, permission, uri: request.path },
     });
 
     return true;

diff --git a/server/src/repositories/event.repository.ts b/server/src/repositories/event.repository.ts
@@ -117,7 +117,7 @@ export class EventRepository implements OnGatewayConnection, OnGatewayDisconnect
       const auth = await this.moduleRef.get(AuthService).authenticate({
         headers: client.request.headers,
         queryParams: {},
-        metadata: { adminRoute: false, sharedLinkRoute: false, esekShareRoute: true, uri: '/api/socket.io' },
+        metadata: { adminRoute: false, sharedLinkRoute: false, esekSharedRoute: true, uri: '/api/socket.io' },
       });
       await client.join(auth.user.id);
       if (auth.session) {

diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
@@ -149,6 +149,7 @@ export class AlbumService extends BaseService {
       albumThumbnailAssetId: dto.albumThumbnailAssetId,
       isActivityEnabled: dto.isActivityEnabled,
       order: dto.order,
+      esekShared: dto.esekShared,
     });
 
     return mapAlbumWithoutAssets(updatedAlbum);

diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
@@ -45,7 +45,7 @@ export type ValidateRequest = {
   headers: IncomingHttpHeaders;
   queryParams: Record<string, string>;
   metadata: {
-    esekShareRoute: boolean;
+    esekSharedRoute: boolean;
     sharedLinkRoute: boolean;
     adminRoute: boolean;
     permission?: Permission;

diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
@@ -384,7 +384,6 @@
     <MenuOption icon={mdiDeleteOutline} text={$t('delete')} onClick={() => setAlbumToDelete()} />
   {/if}
 </RightClickContextMenu>
-
 {#if allowEdit}
   <!-- Edit Modal -->
   {#if albumToEdit}

diff --git a/web/src/lib/components/forms/edit-album-form.svelte b/web/src/lib/components/forms/edit-album-form.svelte
@@ -5,6 +5,7 @@
   import AlbumCover from '$lib/components/album-page/album-cover.svelte';
   import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
   import { t } from 'svelte-i18n';
+  import Checkbox from '$lib/components/elements/checkbox.svelte';
 
   export let album: AlbumResponseDto;
   export let onEditSuccess: ((album: AlbumResponseDto) => unknown) | undefined = undefined;
@@ -13,6 +14,7 @@
 
   let albumName = album.albumName;
   let description = album.description;
+  let esekShared = album.esekShared;
 
   let isSubmitting = false;
 
@@ -24,6 +26,7 @@
         updateAlbumDto: {
           albumName,
           description,
+          esekShared,
         },
       });
       album.albumName = albumName;
@@ -54,6 +57,9 @@
           <label class="immich-form-label" for="description">{$t('description')}</label>
           <textarea class="immich-form-input" id="description" bind:value={description} />
         </div>
+        <div class="m-4">
+          <Checkbox bind:checked={esekShared} label="esekShared" id="esekShared-input"></Checkbox>
+        </div>
       </div>
     </div>
   </form>