From b0512d71284f2f5b2587011fbe7cc700ce2eba1f Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Wed, 13 Jul 2022 15:10:00 +0200 Subject: [PATCH] Add MediaGalleryFields fragment --- ui/src/Pages/AlbumPage/AlbumPage.tsx | 19 ++---- .../__generated__/getMyAlbums.ts | 20 +++--- .../__generated__/CheckInitialSetup.ts | 6 +- .../SingleFaceGroup/SingleFaceGroup.tsx | 4 +- .../__generated__/combineFaces.ts | 10 +-- .../__generated__/moveImageFaces.ts | 16 ++--- .../__generated__/recognizeUnlabeledFaces.ts | 6 +- .../Users/__generated__/scanUser.ts | 8 +-- .../changeScanIntervalMutation.ts | 4 +- .../__generated__/concurrentWorkersQuery.ts | 6 +- .../__generated__/scanAllMutation.ts | 8 +-- .../__generated__/scanIntervalQuery.ts | 6 +- .../__generated__/setConcurrentWorkers.ts | 4 +- .../components/albumGallery/AlbumGallery.tsx | 4 +- .../__generated__/faceDetectionEnabled.ts | 6 +- .../__generated__/mapboxEnabledQuery.ts | 2 +- ...Gallery.test.tsx => MediaGallery.test.tsx} | 8 +-- .../{PhotoGallery.tsx => MediaGallery.tsx} | 41 ++++++++---- .../photoGallery/MediaThumbnail.tsx | 13 +--- .../__generated__/MediaGalleryFields.ts | 65 +++++++++++++++++++ .../__generated__/markMediaFavorite.ts | 12 ++-- .../photoGallery/photoGalleryMutations.ts | 2 +- .../photoGallery/photoGalleryReducer.tsx | 6 +- .../presentView/PresentMedia.test.tsx | 16 ++++- .../photoGallery/presentView/PresentMedia.tsx | 17 +---- .../photoGallery/presentView/PresentView.tsx | 5 +- .../sidebar/__generated__/getAlbumSidebar.ts | 10 +-- .../sidebar/__generated__/resetAlbumCover.ts | 20 +++--- .../sidebar/__generated__/setAlbumCover.ts | 20 +++--- .../__generated__/sidebarAlbumAddShare.ts | 12 ++-- .../__generated__/sidebarPhotoAddShare.ts | 12 ++-- .../__generated__/sidebarProtectShare.ts | 12 ++-- .../__generated__/sidebareDeleteShare.ts | 8 +-- .../timelineGallery/TimelineGroupAlbum.tsx | 2 +- 34 files changed, 234 insertions(+), 176 deletions(-) rename ui/src/components/photoGallery/{PhotoGallery.test.tsx => MediaGallery.test.tsx} (96%) rename ui/src/components/photoGallery/{PhotoGallery.tsx => MediaGallery.tsx} (77%) create mode 100644 ui/src/components/photoGallery/__generated__/MediaGalleryFields.ts diff --git a/ui/src/Pages/AlbumPage/AlbumPage.tsx b/ui/src/Pages/AlbumPage/AlbumPage.tsx index de05f7cd..d63e8fc2 100644 --- a/ui/src/Pages/AlbumPage/AlbumPage.tsx +++ b/ui/src/Pages/AlbumPage/AlbumPage.tsx @@ -10,8 +10,11 @@ import { albumQuery, albumQueryVariables } from './__generated__/albumQuery' import useOrderingParams from '../../hooks/useOrderingParams' import { useParams } from 'react-router-dom' import { isNil } from '../../helpers/utils' +import { MEDIA_GALLERY_FRAGMENT } from '../../components/photoGallery/MediaGallery' const ALBUM_QUERY = gql` + ${MEDIA_GALLERY_FRAGMENT} + query albumQuery( $id: ID! $onlyFavorites: Boolean @@ -40,21 +43,7 @@ const ALBUM_QUERY = gql` order: { order_by: $mediaOrderBy, order_direction: $orderDirection } onlyFavorites: $onlyFavorites ) { - id - type - blurhash - thumbnail { - url - width - height - } - highRes { - url - } - videoWeb { - url - } - favorite + ...MediaGalleryFields } } } diff --git a/ui/src/Pages/AllAlbumsPage/__generated__/getMyAlbums.ts b/ui/src/Pages/AllAlbumsPage/__generated__/getMyAlbums.ts index 600309f7..51041d3e 100644 --- a/ui/src/Pages/AllAlbumsPage/__generated__/getMyAlbums.ts +++ b/ui/src/Pages/AllAlbumsPage/__generated__/getMyAlbums.ts @@ -8,35 +8,35 @@ // ==================================================== export interface getMyAlbums_myAlbums_thumbnail_thumbnail { - __typename: "MediaURL"; + __typename: 'MediaURL' /** * URL for previewing the image */ - url: string; + url: string } export interface getMyAlbums_myAlbums_thumbnail { - __typename: "Media"; - id: string; + __typename: 'Media' + id: string /** * URL to display the media in a smaller resolution */ - thumbnail: getMyAlbums_myAlbums_thumbnail_thumbnail | null; + thumbnail: getMyAlbums_myAlbums_thumbnail_thumbnail | null } export interface getMyAlbums_myAlbums { - __typename: "Album"; - id: string; - title: string; + __typename: 'Album' + id: string + title: string /** * An image in this album used for previewing this album */ - thumbnail: getMyAlbums_myAlbums_thumbnail | null; + thumbnail: getMyAlbums_myAlbums_thumbnail | null } export interface getMyAlbums { /** * List of albums owned by the logged in user. */ - myAlbums: getMyAlbums_myAlbums[]; + myAlbums: getMyAlbums_myAlbums[] } diff --git a/ui/src/Pages/LoginPage/__generated__/CheckInitialSetup.ts b/ui/src/Pages/LoginPage/__generated__/CheckInitialSetup.ts index 94fe677e..8e91c1b5 100644 --- a/ui/src/Pages/LoginPage/__generated__/CheckInitialSetup.ts +++ b/ui/src/Pages/LoginPage/__generated__/CheckInitialSetup.ts @@ -8,13 +8,13 @@ // ==================================================== export interface CheckInitialSetup_siteInfo { - __typename: "SiteInfo"; + __typename: 'SiteInfo' /** * Whether or not the initial setup wizard should be shown */ - initialSetup: boolean; + initialSetup: boolean } export interface CheckInitialSetup { - siteInfo: CheckInitialSetup_siteInfo; + siteInfo: CheckInitialSetup_siteInfo } diff --git a/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.tsx b/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.tsx index 51c23d77..8d352faf 100644 --- a/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.tsx +++ b/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.tsx @@ -2,7 +2,7 @@ import { gql, useQuery } from '@apollo/client' import React, { useEffect, useReducer } from 'react' import { useTranslation } from 'react-i18next' import PaginateLoader from '../../../components/PaginateLoader' -import PhotoGallery from '../../../components/photoGallery/PhotoGallery' +import MediaGallery from '../../../components/photoGallery/MediaGallery' import { photoGalleryReducer } from '../../../components/photoGallery/photoGalleryReducer' import useScrollPagination from '../../../hooks/useScrollPagination' import FaceGroupTitle from './FaceGroupTitle' @@ -91,7 +91,7 @@ const SingleFaceGroup = ({ faceGroupID }: SingleFaceGroupProps) => {
- {subAlbumElement} - ({ @@ -55,7 +55,7 @@ test('photo gallery with media', () => { } render( - { } render( - { } render( - } -const PhotoGallery = ({ mediaState, dispatchMedia }: PhotoGalleryProps) => { +const MediaGallery = ({ mediaState, dispatchMedia }: MediaGalleryProps) => { const [markFavorite] = useMarkFavoriteMutation() const { media, activeIndex, presenting } = mediaState const { updateSidebar } = useContext(SidebarContext) - let photoElements = [] + let mediaElements = [] if (media) { - photoElements = media.map((media, index) => { + mediaElements = media.map((media, index) => { const active = activeIndex == index return ( @@ -85,14 +98,14 @@ const PhotoGallery = ({ mediaState, dispatchMedia }: PhotoGalleryProps) => { }) } else { for (let i = 0; i < 6; i++) { - photoElements.push() + mediaElements.push() } } return ( <> - {photoElements} + {mediaElements} {presenting && ( @@ -105,4 +118,4 @@ const PhotoGallery = ({ mediaState, dispatchMedia }: PhotoGalleryProps) => { ) } -export default PhotoGallery +export default MediaGallery diff --git a/ui/src/components/photoGallery/MediaThumbnail.tsx b/ui/src/components/photoGallery/MediaThumbnail.tsx index 9a6fb9ca..60b8fa2c 100644 --- a/ui/src/components/photoGallery/MediaThumbnail.tsx +++ b/ui/src/components/photoGallery/MediaThumbnail.tsx @@ -3,6 +3,7 @@ import styled from 'styled-components' import { ProtectedImage } from './ProtectedMedia' import { MediaType } from '../../__generated__/globalTypes' import { ReactComponent as VideoThumbnailIconSVG } from './icons/videoThumbnailIcon.svg' +import { MediaGalleryFields } from './__generated__/MediaGalleryFields' const MediaContainer = styled.div` flex-grow: 1; @@ -136,17 +137,7 @@ const VideoThumbnailIcon = styled(VideoThumbnailIconSVG)` ` type MediaThumbnailProps = { - media: { - id: string - type: MediaType - blurhash: string | null - favorite?: boolean - thumbnail: null | { - url: string - width: number - height: number - } - } + media: MediaGalleryFields active: boolean selectImage(): void clickPresent(): void diff --git a/ui/src/components/photoGallery/__generated__/MediaGalleryFields.ts b/ui/src/components/photoGallery/__generated__/MediaGalleryFields.ts new file mode 100644 index 00000000..0a1393b6 --- /dev/null +++ b/ui/src/components/photoGallery/__generated__/MediaGalleryFields.ts @@ -0,0 +1,65 @@ +/* tslint:disable */ +/* eslint-disable */ +// @generated +// This file was automatically generated and should not be edited. + +import { MediaType } from './../../../__generated__/globalTypes' + +// ==================================================== +// GraphQL fragment: MediaGalleryFields +// ==================================================== + +export interface MediaGalleryFields_thumbnail { + __typename: 'MediaURL' + /** + * URL for previewing the image + */ + url: string + /** + * Width of the image in pixels + */ + width: number + /** + * Height of the image in pixels + */ + height: number +} + +export interface MediaGalleryFields_highRes { + __typename: 'MediaURL' + /** + * URL for previewing the image + */ + url: string +} + +export interface MediaGalleryFields_videoWeb { + __typename: 'MediaURL' + /** + * URL for previewing the image + */ + url: string +} + +export interface MediaGalleryFields { + __typename: 'Media' + id: string + type: MediaType + /** + * A short string that can be used to generate a blured version of the media, to show while the original is loading + */ + blurhash: string | null + /** + * URL to display the media in a smaller resolution + */ + thumbnail: MediaGalleryFields_thumbnail | null + /** + * URL to display the photo in full resolution, will be null for videos + */ + highRes: MediaGalleryFields_highRes | null + /** + * URL to get the video in a web format that can be played in the browser, will be null for photos + */ + videoWeb: MediaGalleryFields_videoWeb | null + favorite: boolean +} diff --git a/ui/src/components/photoGallery/__generated__/markMediaFavorite.ts b/ui/src/components/photoGallery/__generated__/markMediaFavorite.ts index c5ddb940..c13b79e8 100644 --- a/ui/src/components/photoGallery/__generated__/markMediaFavorite.ts +++ b/ui/src/components/photoGallery/__generated__/markMediaFavorite.ts @@ -8,19 +8,19 @@ // ==================================================== export interface markMediaFavorite_favoriteMedia { - __typename: "Media"; - id: string; - favorite: boolean; + __typename: 'Media' + id: string + favorite: boolean } export interface markMediaFavorite { /** * Mark or unmark a media as being a favorite */ - favoriteMedia: markMediaFavorite_favoriteMedia; + favoriteMedia: markMediaFavorite_favoriteMedia } export interface markMediaFavoriteVariables { - mediaId: string; - favorite: boolean; + mediaId: string + favorite: boolean } diff --git a/ui/src/components/photoGallery/photoGalleryMutations.ts b/ui/src/components/photoGallery/photoGalleryMutations.ts index 6933d7df..44cedc23 100644 --- a/ui/src/components/photoGallery/photoGalleryMutations.ts +++ b/ui/src/components/photoGallery/photoGalleryMutations.ts @@ -1,5 +1,5 @@ import { gql, MutationFunction, useMutation } from '@apollo/client' -import { PhotoGalleryProps_Media } from './PhotoGallery' +import { PhotoGalleryProps_Media } from './MediaGallery' import { markMediaFavorite, markMediaFavoriteVariables, diff --git a/ui/src/components/photoGallery/photoGalleryReducer.tsx b/ui/src/components/photoGallery/photoGalleryReducer.tsx index 6f917d47..e3066cf4 100644 --- a/ui/src/components/photoGallery/photoGalleryReducer.tsx +++ b/ui/src/components/photoGallery/photoGalleryReducer.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react' -import { PhotoGalleryProps_Media } from './PhotoGallery' +import { MediaGalleryFields } from './__generated__/MediaGalleryFields' export interface PhotoGalleryState { presenting: boolean activeIndex: number - media: PhotoGalleryProps_Media[] + media: MediaGalleryFields[] } export type GalleryAction = @@ -16,7 +16,7 @@ export type PhotoGalleryAction = | GalleryAction | { type: 'openPresentMode'; activeIndex: number } | { type: 'selectImage'; index: number } - | { type: 'replaceMedia'; media: PhotoGalleryProps_Media[] } + | { type: 'replaceMedia'; media: MediaGalleryFields[] } export function photoGalleryReducer( state: PhotoGalleryState, diff --git a/ui/src/components/photoGallery/presentView/PresentMedia.test.tsx b/ui/src/components/photoGallery/presentView/PresentMedia.test.tsx index e42a38eb..09ffeb4f 100644 --- a/ui/src/components/photoGallery/presentView/PresentMedia.test.tsx +++ b/ui/src/components/photoGallery/presentView/PresentMedia.test.tsx @@ -2,17 +2,23 @@ import { render, screen } from '@testing-library/react' import React from 'react' import { MediaType } from '../../../__generated__/globalTypes' -import PresentMedia, { PresentMediaProps_Media } from './PresentMedia' +import { MediaGalleryFields } from '../__generated__/MediaGalleryFields' +import PresentMedia from './PresentMedia' test('render present image', () => { - const media: PresentMediaProps_Media = { + const media: MediaGalleryFields = { __typename: 'Media', id: '123', type: MediaType.Photo, highRes: null, + blurhash: null, + videoWeb: null, + favorite: false, thumbnail: { __typename: 'MediaURL', url: '/sample_image.jpg', + width: 300, + height: 200, }, } @@ -28,11 +34,13 @@ test('render present image', () => { }) test('render present video', () => { - const media: PresentMediaProps_Media = { + const media: MediaGalleryFields = { __typename: 'Media', id: '123', type: MediaType.Video, highRes: null, + blurhash: null, + favorite: false, videoWeb: { __typename: 'MediaURL', url: '/sample_video.mp4', @@ -40,6 +48,8 @@ test('render present video', () => { thumbnail: { __typename: 'MediaURL', url: '/sample_video_thumb.jpg', + width: 300, + height: 200, }, } diff --git a/ui/src/components/photoGallery/presentView/PresentMedia.tsx b/ui/src/components/photoGallery/presentView/PresentMedia.tsx index 197a759e..7aa5eb4a 100644 --- a/ui/src/components/photoGallery/presentView/PresentMedia.tsx +++ b/ui/src/components/photoGallery/presentView/PresentMedia.tsx @@ -2,11 +2,8 @@ import React from 'react' import styled from 'styled-components' import { MediaType } from '../../../__generated__/globalTypes' import { exhaustiveCheck } from '../../../helpers/utils' -import { - ProtectedImage, - ProtectedVideo, - ProtectedVideoProps_Media, -} from '../ProtectedMedia' +import { ProtectedImage, ProtectedVideo } from '../ProtectedMedia' +import { MediaGalleryFields } from '../__generated__/MediaGalleryFields' const StyledPhoto = styled(ProtectedImage)` position: absolute; @@ -26,16 +23,8 @@ const StyledVideo = styled(ProtectedVideo)` height: 100vh; ` -export interface PresentMediaProps_Media extends ProtectedVideoProps_Media { - type: MediaType - highRes: null | { - __typename: 'MediaURL' - url: string - } -} - type PresentMediaProps = { - media: PresentMediaProps_Media + media: MediaGalleryFields imageLoaded?(): void } diff --git a/ui/src/components/photoGallery/presentView/PresentView.tsx b/ui/src/components/photoGallery/presentView/PresentView.tsx index 33b92586..e5dceee0 100644 --- a/ui/src/components/photoGallery/presentView/PresentView.tsx +++ b/ui/src/components/photoGallery/presentView/PresentView.tsx @@ -1,8 +1,9 @@ import React, { useEffect } from 'react' import styled, { createGlobalStyle } from 'styled-components' import PresentNavigationOverlay from './PresentNavigationOverlay' -import PresentMedia, { PresentMediaProps_Media } from './PresentMedia' +import PresentMedia from './PresentMedia' import { closePresentModeAction, GalleryAction } from '../photoGalleryReducer' +import { MediaGalleryFields } from '../__generated__/MediaGalleryFields' const StyledContainer = styled.div` position: fixed; @@ -24,7 +25,7 @@ const PreventScroll = createGlobalStyle` type PresentViewProps = { className?: string imageLoaded?(): void - activeMedia: PresentMediaProps_Media + activeMedia: MediaGalleryFields dispatchMedia: React.Dispatch disableSaveCloseInHistory?: boolean } diff --git a/ui/src/components/sidebar/__generated__/getAlbumSidebar.ts b/ui/src/components/sidebar/__generated__/getAlbumSidebar.ts index e4e66043..e54fa3bd 100644 --- a/ui/src/components/sidebar/__generated__/getAlbumSidebar.ts +++ b/ui/src/components/sidebar/__generated__/getAlbumSidebar.ts @@ -8,9 +8,9 @@ // ==================================================== export interface getAlbumSidebar_album { - __typename: "Album"; - id: string; - title: string; + __typename: 'Album' + id: string + title: string } export interface getAlbumSidebar { @@ -18,9 +18,9 @@ export interface getAlbumSidebar { * Get album by id, user must own the album or be admin * If valid tokenCredentials are provided, the album may be retrived without further authentication */ - album: getAlbumSidebar_album; + album: getAlbumSidebar_album } export interface getAlbumSidebarVariables { - id: string; + id: string } diff --git a/ui/src/components/sidebar/__generated__/resetAlbumCover.ts b/ui/src/components/sidebar/__generated__/resetAlbumCover.ts index 1b71c76d..10a36273 100644 --- a/ui/src/components/sidebar/__generated__/resetAlbumCover.ts +++ b/ui/src/components/sidebar/__generated__/resetAlbumCover.ts @@ -8,38 +8,38 @@ // ==================================================== export interface resetAlbumCover_resetAlbumCover_thumbnail_thumbnail { - __typename: "MediaURL"; + __typename: 'MediaURL' /** * URL for previewing the image */ - url: string; + url: string } export interface resetAlbumCover_resetAlbumCover_thumbnail { - __typename: "Media"; - id: string; + __typename: 'Media' + id: string /** * URL to display the media in a smaller resolution */ - thumbnail: resetAlbumCover_resetAlbumCover_thumbnail_thumbnail | null; + thumbnail: resetAlbumCover_resetAlbumCover_thumbnail_thumbnail | null } export interface resetAlbumCover_resetAlbumCover { - __typename: "Album"; - id: string; + __typename: 'Album' + id: string /** * An image in this album used for previewing this album */ - thumbnail: resetAlbumCover_resetAlbumCover_thumbnail | null; + thumbnail: resetAlbumCover_resetAlbumCover_thumbnail | null } export interface resetAlbumCover { /** * Reset the assigned cover photo for an album */ - resetAlbumCover: resetAlbumCover_resetAlbumCover; + resetAlbumCover: resetAlbumCover_resetAlbumCover } export interface resetAlbumCoverVariables { - albumID: string; + albumID: string } diff --git a/ui/src/components/sidebar/__generated__/setAlbumCover.ts b/ui/src/components/sidebar/__generated__/setAlbumCover.ts index b0b70a05..b37d2587 100644 --- a/ui/src/components/sidebar/__generated__/setAlbumCover.ts +++ b/ui/src/components/sidebar/__generated__/setAlbumCover.ts @@ -8,38 +8,38 @@ // ==================================================== export interface setAlbumCover_setAlbumCover_thumbnail_thumbnail { - __typename: "MediaURL"; + __typename: 'MediaURL' /** * URL for previewing the image */ - url: string; + url: string } export interface setAlbumCover_setAlbumCover_thumbnail { - __typename: "Media"; - id: string; + __typename: 'Media' + id: string /** * URL to display the media in a smaller resolution */ - thumbnail: setAlbumCover_setAlbumCover_thumbnail_thumbnail | null; + thumbnail: setAlbumCover_setAlbumCover_thumbnail_thumbnail | null } export interface setAlbumCover_setAlbumCover { - __typename: "Album"; - id: string; + __typename: 'Album' + id: string /** * An image in this album used for previewing this album */ - thumbnail: setAlbumCover_setAlbumCover_thumbnail | null; + thumbnail: setAlbumCover_setAlbumCover_thumbnail | null } export interface setAlbumCover { /** * Assign a cover photo to an album */ - setAlbumCover: setAlbumCover_setAlbumCover; + setAlbumCover: setAlbumCover_setAlbumCover } export interface setAlbumCoverVariables { - coverID: string; + coverID: string } diff --git a/ui/src/components/sidebar/__generated__/sidebarAlbumAddShare.ts b/ui/src/components/sidebar/__generated__/sidebarAlbumAddShare.ts index 2465afb8..e0f7aa13 100644 --- a/ui/src/components/sidebar/__generated__/sidebarAlbumAddShare.ts +++ b/ui/src/components/sidebar/__generated__/sidebarAlbumAddShare.ts @@ -8,19 +8,19 @@ // ==================================================== export interface sidebarAlbumAddShare_shareAlbum { - __typename: "ShareToken"; - token: string; + __typename: 'ShareToken' + token: string } export interface sidebarAlbumAddShare { /** * Generate share token for album */ - shareAlbum: sidebarAlbumAddShare_shareAlbum; + shareAlbum: sidebarAlbumAddShare_shareAlbum } export interface sidebarAlbumAddShareVariables { - id: string; - password?: string | null; - expire?: any | null; + id: string + password?: string | null + expire?: any | null } diff --git a/ui/src/components/sidebar/__generated__/sidebarPhotoAddShare.ts b/ui/src/components/sidebar/__generated__/sidebarPhotoAddShare.ts index db2d7209..0cd81ef1 100644 --- a/ui/src/components/sidebar/__generated__/sidebarPhotoAddShare.ts +++ b/ui/src/components/sidebar/__generated__/sidebarPhotoAddShare.ts @@ -8,19 +8,19 @@ // ==================================================== export interface sidebarPhotoAddShare_shareMedia { - __typename: "ShareToken"; - token: string; + __typename: 'ShareToken' + token: string } export interface sidebarPhotoAddShare { /** * Generate share token for media */ - shareMedia: sidebarPhotoAddShare_shareMedia; + shareMedia: sidebarPhotoAddShare_shareMedia } export interface sidebarPhotoAddShareVariables { - id: string; - password?: string | null; - expire?: any | null; + id: string + password?: string | null + expire?: any | null } diff --git a/ui/src/components/sidebar/__generated__/sidebarProtectShare.ts b/ui/src/components/sidebar/__generated__/sidebarProtectShare.ts index 0e889be9..518a3686 100644 --- a/ui/src/components/sidebar/__generated__/sidebarProtectShare.ts +++ b/ui/src/components/sidebar/__generated__/sidebarProtectShare.ts @@ -8,22 +8,22 @@ // ==================================================== export interface sidebarProtectShare_protectShareToken { - __typename: "ShareToken"; - token: string; + __typename: 'ShareToken' + token: string /** * Whether or not a password is needed to access the share */ - hasPassword: boolean; + hasPassword: boolean } export interface sidebarProtectShare { /** * Set a password for a token, if null is passed for the password argument, the password will be cleared */ - protectShareToken: sidebarProtectShare_protectShareToken; + protectShareToken: sidebarProtectShare_protectShareToken } export interface sidebarProtectShareVariables { - token: string; - password?: string | null; + token: string + password?: string | null } diff --git a/ui/src/components/sidebar/__generated__/sidebareDeleteShare.ts b/ui/src/components/sidebar/__generated__/sidebareDeleteShare.ts index 65eb67ec..ada439cb 100644 --- a/ui/src/components/sidebar/__generated__/sidebareDeleteShare.ts +++ b/ui/src/components/sidebar/__generated__/sidebareDeleteShare.ts @@ -8,17 +8,17 @@ // ==================================================== export interface sidebareDeleteShare_deleteShareToken { - __typename: "ShareToken"; - token: string; + __typename: 'ShareToken' + token: string } export interface sidebareDeleteShare { /** * Delete a share token by it's token value */ - deleteShareToken: sidebareDeleteShare_deleteShareToken; + deleteShareToken: sidebareDeleteShare_deleteShareToken } export interface sidebareDeleteShareVariables { - token: string; + token: string } diff --git a/ui/src/components/timelineGallery/TimelineGroupAlbum.tsx b/ui/src/components/timelineGallery/TimelineGroupAlbum.tsx index 7310e37e..281b9908 100644 --- a/ui/src/components/timelineGallery/TimelineGroupAlbum.tsx +++ b/ui/src/components/timelineGallery/TimelineGroupAlbum.tsx @@ -1,7 +1,7 @@ import React, { useContext } from 'react' import { Link } from 'react-router-dom' import { MediaThumbnail } from '../photoGallery/MediaThumbnail' -import { PhotoFiller } from '../photoGallery/PhotoGallery' +import { PhotoFiller } from '../photoGallery/MediaGallery' import { toggleFavoriteAction, useMarkFavoriteMutation,