π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[photos] Refresh album added notification
AswinAsok0ce5e4a847d4
diff --git a/web/apps/photos/src/components/AlbumAddedNotification.tsx b/web/apps/photos/src/components/AlbumAddedNotification.tsxindex 1b7ae80b7d..268f15fa9c 100644--- a/web/apps/photos/src/components/AlbumAddedNotification.tsx+++ b/web/apps/photos/src/components/AlbumAddedNotification.tsx@@ -1,13 +1,13 @@-import CloseIcon from "@mui/icons-material/Close";+import { Cancel01Icon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";import {- Box,DialogTitle,+ IconButton,Paper,Snackbar,Stack,Typography,} from "@mui/material";-import { FilledIconButton } from "ente-base/components/mui";import { t } from "i18next";import React from "react";@@ -32,47 +32,96 @@ export const AlbumAddedNotification: React.FC<AlbumAddedNotificationProps> = ({<Snackbaropen={shouldShow}anchorOrigin={{ horizontal: "right", vertical: "bottom" }}+ sx={{+ bottom: { xs: 16, sm: 24 },+ right: { xs: 16, sm: 24 },+ left: { xs: 16, sm: "auto" },+ }}>- <Paper sx={{ width: "min(360px, 100svw)" }}>- <DialogTitle>+ <Paper+ sx={(theme) => ({+ width: "min(340px, calc(100svw - 32px))",+ borderRadius: "24px",+ border: "1px solid",+ borderColor: "rgba(0, 0, 0, 0.06)",+ backgroundImage: "none",+ boxShadow: "0 8px 32px rgba(0, 0, 0, 0.24)",+ ...theme.applyStyles("dark", {+ borderColor: "rgba(255, 255, 255, 0.06)",+ }),+ })}+ >+ <DialogTitle sx={{ px: 2.5, py: 2 }}><Stackdirection="row"sx={{- justifyContent: "space-between",alignItems: "center",+ justifyContent: "space-between",+ gap: 2,}}>- <Box>- <Typography variant="h3">+ <Stack+ role="status"+ sx={{ flex: 1, minWidth: 0, gap: 0.5 }}+ >+ <Typography+ variant="h3"+ sx={{+ fontFamily: '"Outfit Variable", sans-serif',+ fontSize: 18,+ lineHeight: "24px",+ }}+ >{t("added_to_album")}</Typography>{albumName && (<Typographyvariant="body"+ noWrap+ title={albumName}sx={{+ fontFamily:+ '"Outfit Variable", sans-serif',fontWeight: "regular",+ fontSize: 14,+ lineHeight: "20px",color: "text.muted",- marginTop: "4px",}}>- {truncate(albumName, 20)}+ {albumName}</Typography>)}- </Box>- <Stack direction="row" sx={{ gap: 1 }}>- <FilledIconButton- onClick={onClose}- aria-label={t("close")}- >- <CloseIcon />- </FilledIconButton></Stack>+ <IconButton+ onClick={onClose}+ aria-label={t("close")}+ sx={{+ width: 38,+ height: 38,+ flexShrink: 0,+ borderRadius: "50%",+ color: "text.muted",+ bgcolor: "fill.fainter",+ "&:hover": {+ bgcolor: "fill.faintHover",+ color: "text.base",+ },+ "&.Mui-focusVisible": {+ outline: "1px solid",+ outlineColor: "stroke.base",+ outlineOffset: 2,+ },+ }}+ >+ <HugeiconsIcon+ icon={Cancel01Icon}+ size={22}+ strokeWidth={1.8}+ />+ </IconButton></Stack></DialogTitle></Paper></Snackbar>);};--const truncate = (s: string, max: number) =>- s.length > max ? `${s.substring(0, max)}...` : s;diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 5600d867b6..db28057539 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -1139,6 +1139,14 @@ const Page: React.FC = () => {silent: true,source: `collection-op:${op}`,});+ if (op == "add" && filesToProcess.length > 0) {+ setAddToAlbumProgress({+ open: true,+ phase: "done",+ albumId: selectedCollection.id,+ albumName: selectedCollection.name,+ });+ }} finally {hideLoadingBar();}@@ -2151,418 +2159,442 @@ const Page: React.FC = () => {: handleShowCollectionSummaryWithID;return (- <FullScreenDropZone- message={- watchFolderView ? t("watch_folder_dropzone_hint") : undefined- }- disabled={shouldDisableDropzone || !!slideshow || isCleanupViewOpen}- onDrop={setDragAndDropFiles}- >- {blockingLoad && <TranslucentLoadingOverlay />}- {!sidebarVisibilityProps.open && renderSubscriptionDialogs()}- <CollectionSelector- open={openCollectionSelector}- onClose={handleCloseCollectionSelector}- onExited={handleCollectionSelectorExited}- attributes={collectionSelectorAttributes}- collectionSummaries={- collectionSelectorAttributes?.showHiddenCollections- ? state.hiddenCollectionSummaries- : normalCollectionSummaries- }- collectionForCollectionSummaryID={(id) =>- findCollectionCreatingIfNeeded(state.collections, id)- }- />- <DownloadStatusNotifications- {...{ saveGroups, onRemoveSaveGroup }}- onShowCollectionSummary={- handleDownloadStatusNotificationsShowCollectionSummary- }- />- <FixCreationTime- {...fixCreationTimeVisibilityProps}- files={fixCreationTimeFiles}- onRemotePull={remotePull}- />- <PhotosNavigationShell- isFirstLoad={isFirstLoad}- isInSearchMode={isInSearchMode}- isSettingsOpen={sidebarVisibilityProps.open}- mode={barMode}- onChangeMode={handleChangeBarMode}- onSidebar={showSidebar}- onUpload={openUploader}- onHome={() =>- handleShowCollectionSummaryWithID(PseudoCollectionID.all)+ <>+ <FullScreenDropZone+ message={+ watchFolderView+ ? t("watch_folder_dropzone_hint")+ : undefined}- onSelectSearchOption={handleSelectSearchOption}- onSelectPeople={handleShowPeople}- onSelectPerson={handleSelectPerson}- galleryNavigation={- isCleanupViewOpen- ? undefined- : {- activeCollectionID: galleryBarActiveCollectionID,- onSelectCollectionID: selectGalleryCollection,- onRemotePull: remotePull,- activePerson,- albumFilter,- albumSearchQuery,- onAlbumSearchQueryChange: setAlbumSearchQuery,- onShowAlbumOverview: handleShowAlbumOverview,- onShowPeopleOverview: handleShowPeople,- collectionSummaries: sidebarCollectionSummaries,- visibleAlbumFilters: sidebarAlbumFilters,- uncategorizedCollectionSummaryID:- state.uncategorizedCollectionSummaryID,- onShowCollectionSummary: showCollectionSummary,- collectionsSortBy,- onChangeCollectionsSortBy,- peopleSortBy,- onChangePeopleSortBy: setPeopleSortBy,- people: sortedPeople,- }+ disabled={+ shouldDisableDropzone || !!slideshow || isCleanupViewOpen}- alternateHeader={- showSelectionBar ? (- <SelectedFileOptions- barMode={barMode}- isInSearchMode={isInSearchMode}- collection={- isInSearchMode ? undefined : activeCollection- }- collectionSummary={- isInSearchMode- ? undefined- : activeCollectionSummary- }- selectedFileCount={selected.count}- selectedOwnFileCount={selected.ownCount}- selectedFavoriteCount={selectedFavoriteCount}- onClearSelection={clearSelection}- onDelete={() => handleDeleteFiles()}- onRemoveFilesFromCollection={- handleRemoveFilesFromCollection- }- onOpenCollectionSelector={- handleOpenCollectionSelector- }- onSelectAll={handleSelectAll}- isAllSelected={isAllSelectedInView}- {...{- createOnCreateForCollectionOp,- createOnSelectForCollectionOp,- createFileOpHandler,- onShowAssignPersonDialog: showAddPersonAction- ? showContextMenuAssignPerson- : undefined,+ onDrop={setDragAndDropFiles}+ >+ {blockingLoad && <TranslucentLoadingOverlay />}+ {!sidebarVisibilityProps.open && renderSubscriptionDialogs()}+ <CollectionSelector+ open={openCollectionSelector}+ onClose={handleCloseCollectionSelector}+ onExited={handleCollectionSelectorExited}+ attributes={collectionSelectorAttributes}+ collectionSummaries={+ collectionSelectorAttributes?.showHiddenCollections+ ? state.hiddenCollectionSummaries+ : normalCollectionSummaries+ }+ collectionForCollectionSummaryID={(id) =>+ findCollectionCreatingIfNeeded(state.collections, id)+ }+ />+ <DownloadStatusNotifications+ {...{ saveGroups, onRemoveSaveGroup }}+ onShowCollectionSummary={+ handleDownloadStatusNotificationsShowCollectionSummary+ }+ />+ <FixCreationTime+ {...fixCreationTimeVisibilityProps}+ files={fixCreationTimeFiles}+ onRemotePull={remotePull}+ />+ <PhotosNavigationShell+ isFirstLoad={isFirstLoad}+ isInSearchMode={isInSearchMode}+ isSettingsOpen={sidebarVisibilityProps.open}+ mode={barMode}+ onChangeMode={handleChangeBarMode}+ onSidebar={showSidebar}+ onUpload={openUploader}+ onHome={() =>+ handleShowCollectionSummaryWithID(+ PseudoCollectionID.all,+ )+ }+ onSelectSearchOption={handleSelectSearchOption}+ onSelectPeople={handleShowPeople}+ onSelectPerson={handleSelectPerson}+ galleryNavigation={+ isCleanupViewOpen+ ? undefined+ : {+ activeCollectionID:+ galleryBarActiveCollectionID,+ onSelectCollectionID: selectGalleryCollection,+ onRemotePull: remotePull,+ activePerson,+ albumFilter,+ albumSearchQuery,+ onAlbumSearchQueryChange: setAlbumSearchQuery,+ onShowAlbumOverview: handleShowAlbumOverview,+ onShowPeopleOverview: handleShowPeople,+ collectionSummaries:+ sidebarCollectionSummaries,+ visibleAlbumFilters: sidebarAlbumFilters,+ uncategorizedCollectionSummaryID:+ state.uncategorizedCollectionSummaryID,+ onShowCollectionSummary:+ showCollectionSummary,+ collectionsSortBy,+ onChangeCollectionsSortBy,+ peopleSortBy,+ onChangePeopleSortBy: setPeopleSortBy,+ people: sortedPeople,+ }+ }+ alternateHeader={+ showSelectionBar ? (+ <SelectedFileOptions+ barMode={barMode}+ isInSearchMode={isInSearchMode}+ collection={+ isInSearchMode+ ? undefined+ : activeCollection+ }+ collectionSummary={+ isInSearchMode+ ? undefined+ : activeCollectionSummary+ }+ selectedFileCount={selected.count}+ selectedOwnFileCount={selected.ownCount}+ selectedFavoriteCount={selectedFavoriteCount}+ onClearSelection={clearSelection}+ onDelete={() => handleDeleteFiles()}+ onRemoveFilesFromCollection={+ handleRemoveFilesFromCollection+ }+ onOpenCollectionSelector={+ handleOpenCollectionSelector+ }+ onSelectAll={handleSelectAll}+ isAllSelected={isAllSelectedInView}+ {...{+ createOnCreateForCollectionOp,+ createOnSelectForCollectionOp,+ createFileOpHandler,+ onShowAssignPersonDialog:+ showAddPersonAction+ ? showContextMenuAssignPerson+ : undefined,+ }}+ onEditLocation={showEditLocation}+ />+ ) : null+ }+ >+ {!isCleanupViewOpen && (+ <>+ <GalleryBarAndListHeader+ {...{+ user,+ activeCollection,+ activePerson,+ collectionSummary,+ people,+ setBlockingLoad,+ setFileListHeader,+ hasActiveFileSelection,+ isActiveCollectionDownloadInProgress,+ onAddSaveGroup,+ }}+ onBackToAlbums={handleBackToAlbums}+ mode={barMode}+ shouldHide={isInSearchMode}+ setActiveCollectionID={selectGalleryCollection}+ onSelectPerson={handleSelectPerson}+ onEditAlbumDetails={showEditAlbumDetails}+ onShowMap={handleShowCollectionMap}+ onCollectionSlideshow={startSlideshow}+ emailByUserID={state.emailByUserID}+ shareSuggestionEmails={+ state.shareSuggestionEmails+ }+ onRemotePull={remotePull}+ />+ </>+ )}+ {cleanupView === "duplicates" ? (+ <DuplicatesView onRemoteFilesPull={remoteFilesPull} />+ ) : cleanupView === "large-files" ? (+ <LargeFilesView onRemoteFilesPull={remoteFilesPull} />+ ) : !isInSearchMode && barMode == "links" ? (+ selectedLink ? (+ <PublicLinkDetails+ key={selectedLink.id}+ collection={selectedLink}+ fileCount={+ selectedLinkSummary?.fileCount ??+ selectedLinkFiles.length+ }+ files={selectedLinkFiles}+ user={user}+ setBlockingLoad={setBlockingLoad}+ onRemotePull={remotePull}+ coverFile={selectedLinkSummary?.coverFile}+ />+ ) : null+ ) : !isInSearchMode &&+ !isFirstLoad &&+ !state.collectionFiles.length &&+ activeCollectionID === PseudoCollectionID.all ? (+ <GalleryEmptyState+ isUploadInProgress={uploadManager.isUploadInProgress()}+ onUpload={openUploader}+ />+ ) : !isInSearchMode && !isFirstLoad && isAlbumOverview ? (+ <AlbumsOverview+ onRemotePull={remotePull}+ albums={overviewAlbums}+ title={(+ albumFilters.find(+ ({ value }) => value == overviewFilter,+ ) ?? albumFilters[0]!+ ).title()}+ filter={overviewFilter!}+ searchQuery={albumSearchQuery}+ sortBy={collectionsSortBy}+ onSelectAlbum={handleShowCollectionSummaryWithID}+ onCreateAlbum={() => {+ setPostCreateAlbumOp(undefined);+ postCreateAlbumHidden.current = false;+ showAlbumNameInput();}}- onEditLocation={showEditLocation}/>- ) : null- }- >- {!isCleanupViewOpen && (- <>- <GalleryBarAndListHeader+ ) : !isInSearchMode &&+ !isFirstLoad &&+ state.view?.type == "people" &&+ !state.view.activePerson ? (+ <PeopleOverview+ people={state.view.visiblePeople}+ allPeople={state.view.people}+ peopleSortBy={peopleSortBy}+ onSelectPerson={handleSelectPerson}+ />+ ) : (+ <FileListWithViewer+ mode={barMode}+ modePlus={isInSearchMode ? "search" : barMode}+ header={fileListHeader}+ footer={fileListFooter}+ user={user}+ files={filteredFiles}+ onShowMap={handleShowCollectionMap}+ enableDownload={true}+ disableGrouping={+ state.searchSuggestion?.type == "clip" ||+ (!isInSearchMode &&+ activeCollection?.pubMagicMetadata?.data+ .sortBy === "fileName")+ }+ enableSelect={true}+ selected={selected}+ setSelected={setSelected}+ // TODO: Incorrect assertion, need to update the type+ activeCollectionID={activeCollectionID!}+ activeCollectionSummary={activeCollectionSummary}+ activePersonID={activePerson?.id}+ isInIncomingSharedCollection={activeCollectionSummary?.attributes.has(+ "sharedIncoming",+ )}+ isInHiddenSection={barMode == "hidden-albums"}+ onContextMenuAction={handleContextMenuAction}+ onContextMenuOpenChange={setIsContextMenuOpen}+ suppressSelectionUI={suppressContextSelectionBar}+ showAddPersonAction={showAddPersonAction}+ showEditLocationAction={selected.ownCount > 0}{...{- user,- activeCollection,- activePerson,- collectionSummary,- people,- setBlockingLoad,- setFileListHeader,- hasActiveFileSelection,- isActiveCollectionDownloadInProgress,+ favoriteFileIDs,+ collectionNameByID,+ fileNormalCollectionIDs,+ fileCollectionIDs,+ hiddenCollectionIDs,+ pendingFavoriteUpdates,+ pendingVisibilityUpdates,onAddSaveGroup,}}- onBackToAlbums={handleBackToAlbums}- mode={barMode}- shouldHide={isInSearchMode}- setActiveCollectionID={selectGalleryCollection}- onSelectPerson={handleSelectPerson}- onEditAlbumDetails={showEditAlbumDetails}- onShowMap={handleShowCollectionMap}- onCollectionSlideshow={startSlideshow}+ collectionSummaries={normalCollectionSummaries}emailByUserID={state.emailByUserID}- shareSuggestionEmails={state.shareSuggestionEmails}- onRemotePull={remotePull}- />- </>- )}- {cleanupView === "duplicates" ? (- <DuplicatesView onRemoteFilesPull={remoteFilesPull} />- ) : cleanupView === "large-files" ? (- <LargeFilesView onRemoteFilesPull={remoteFilesPull} />- ) : !isInSearchMode && barMode == "links" ? (- selectedLink ? (- <PublicLinkDetails- key={selectedLink.id}- collection={selectedLink}- fileCount={- selectedLinkSummary?.fileCount ??- selectedLinkFiles.length+ onToggleFavorite={handleFileViewerToggleFavorite}+ onFileVisibilityUpdate={+ handleFileViewerFileVisibilityUpdate}- files={selectedLinkFiles}- user={user}- setBlockingLoad={setBlockingLoad}+ onSendLink={handleFileViewerSendLink}+ onMarkTempDeleted={handleMarkTempDeleted}+ onSetOpenFileViewer={setIsFileViewerOpen}onRemotePull={remotePull}- coverFile={selectedLinkSummary?.coverFile}+ onRemoteFilesPull={remoteFilesPull}+ onVisualFeedback={handleVisualFeedback}+ onSelectCollection={handleSelectCollection}+ onSelectPerson={handleSelectPerson}+ onAddFileToCollection={+ handleAddSingleFileToCollection+ }+ pendingFileIndex={pendingFileNavigation?.fileIndex}+ pendingFileSidebar={pendingFileNavigation?.sidebar}+ pendingHighlightCommentID={+ pendingFileNavigation?.commentID+ }+ onPendingNavigationConsumed={+ handlePendingNavigationConsumed+ }/>- ) : null- ) : !isInSearchMode &&- !isFirstLoad &&- !state.collectionFiles.length &&- activeCollectionID === PseudoCollectionID.all ? (- <GalleryEmptyState- isUploadInProgress={uploadManager.isUploadInProgress()}- onUpload={openUploader}- />- ) : !isInSearchMode && !isFirstLoad && isAlbumOverview ? (- <AlbumsOverview- onRemotePull={remotePull}- albums={overviewAlbums}- title={(- albumFilters.find(- ({ value }) => value == overviewFilter,- ) ?? albumFilters[0]!- ).title()}- filter={overviewFilter!}- searchQuery={albumSearchQuery}- sortBy={collectionsSortBy}- onSelectAlbum={handleShowCollectionSummaryWithID}- onCreateAlbum={() => {- setPostCreateAlbumOp(undefined);- postCreateAlbumHidden.current = false;- showAlbumNameInput();- }}- />- ) : !isInSearchMode &&- !isFirstLoad &&- state.view?.type == "people" &&- !state.view.activePerson ? (- <PeopleOverview- people={state.view.visiblePeople}- allPeople={state.view.people}- peopleSortBy={peopleSortBy}- onSelectPerson={handleSelectPerson}- />- ) : (- <FileListWithViewer- mode={barMode}- modePlus={isInSearchMode ? "search" : barMode}- header={fileListHeader}- footer={fileListFooter}- user={user}- files={filteredFiles}- onShowMap={handleShowCollectionMap}- enableDownload={true}- disableGrouping={- state.searchSuggestion?.type == "clip" ||- (!isInSearchMode &&- activeCollection?.pubMagicMetadata?.data- .sortBy === "fileName")- }- enableSelect={true}- selected={selected}- setSelected={setSelected}- // TODO: Incorrect assertion, need to update the type- activeCollectionID={activeCollectionID!}- activeCollectionSummary={activeCollectionSummary}- activePersonID={activePerson?.id}- isInIncomingSharedCollection={activeCollectionSummary?.attributes.has(- "sharedIncoming",- )}- isInHiddenSection={barMode == "hidden-albums"}- onContextMenuAction={handleContextMenuAction}- onContextMenuOpenChange={setIsContextMenuOpen}- suppressSelectionUI={suppressContextSelectionBar}- showAddPersonAction={showAddPersonAction}- showEditLocationAction={selected.ownCount > 0}- {...{- favoriteFileIDs,- collectionNameByID,- fileNormalCollectionIDs,- fileCollectionIDs,- hiddenCollectionIDs,- pendingFavoriteUpdates,- pendingVisibilityUpdates,- onAddSaveGroup,- }}- collectionSummaries={normalCollectionSummaries}- emailByUserID={state.emailByUserID}- onToggleFavorite={handleFileViewerToggleFavorite}- onFileVisibilityUpdate={- handleFileViewerFileVisibilityUpdate+ )}+ </PhotosNavigationShell>+ <Upload+ {...{+ user,+ dragAndDropFiles,+ uploadTypeSelectorIntent,+ uploadTypeSelectorView,+ }}+ isFirstUpload={haveOnlySystemCollections(+ normalCollectionSummaries,+ )}+ activeCollection={activeCollection}+ closeUploadTypeSelector={setUploadTypeSelectorView.bind(+ null,+ false,+ )}+ setLoading={setBlockingLoad}+ setShouldDisableDropzone={setShouldDisableDropzone}+ onRemotePull={remotePull}+ onRemoteFilesPull={remoteFilesPull}+ onOpenCollectionSelector={handleOpenCollectionSelector}+ onCloseCollectionSelector={handleCloseCollectionSelector}+ onUploadFile={(file) =>+ dispatch({ type: "uploadFile", file })+ }+ onShowPlanSelector={showPlanSelector}+ onShowSessionExpiredDialog={showSessionExpiredDialog}+ isInHiddenSection={barMode == "hidden-albums"}+ />+ <Sidebar+ {...sidebarVisibilityProps}+ onClose={handleSidebarClose}+ onShowLargeFiles={handleShowLargeFiles}+ onShowDuplicates={handleShowDuplicates}+ pendingAction={pendingSidebarAction}+ onActionHandled={handleSidebarActionHandled}+ onShowPlanSelector={showPlanSelector}+ collectionNameByID={collectionNameByID}+ onCloseOverlays={closeSidebarOverlays}+ onAuthenticateUser={authenticateUser}+ >+ {(onRootClose) =>+ sidebarVisibilityProps.open &&+ renderSubscriptionDialogs(onRootClose)+ }+ </Sidebar>+ <WhatsNew {...whatsNewVisibilityProps} />+ <PeopleConsentDialog+ {...peopleConsentVisibilityProps}+ onClose={() => {+ pendingPeopleSearchReset.current = undefined;+ peopleConsentVisibilityProps.onClose();+ }}+ onEnabled={() =>+ handleShowPeople(pendingPeopleSearchReset.current)+ }+ />+ <AssignPersonDialog+ {...contextMenuAssignPersonProps}+ people={namedPeople}+ title={t("add_a_person")}+ onSelectPerson={handleContextMenuSelectPerson}+ />+ {slideshow &&+ slideshow.collectionID === activeCollection?.id &&+ !isInSearchMode && (+ <AlbumSlideshow+ files={slideshow.files}+ title={slideshow.title}+ onClose={closeSlideshow}+ />+ )}+ {activeCollectionSummary && (+ <CollectionMapDialog+ {...collectionMapVisibilityProps}+ collectionSummary={activeCollectionSummary}+ files={+ activeCollection+ ? activeCollectionFiles+ : filteredFiles}- onSendLink={handleFileViewerSendLink}- onMarkTempDeleted={handleMarkTempDeleted}- onSetOpenFileViewer={setIsFileViewerOpen}+ mapFileSource={mapFileSource}onRemotePull={remotePull}+ onAddSaveGroup={onAddSaveGroup}+ onMarkTempDeleted={handleMarkTempDeleted}+ onAddFileToCollection={handleAddSingleFileToCollection}onRemoteFilesPull={remoteFilesPull}onVisualFeedback={handleVisualFeedback}+ fileNormalCollectionIDs={fileNormalCollectionIDs}+ collectionNameByID={collectionNameByID}+ emailByUserID={state.emailByUserID}onSelectCollection={handleSelectCollection}onSelectPerson={handleSelectPerson}- onAddFileToCollection={handleAddSingleFileToCollection}- pendingFileIndex={pendingFileNavigation?.fileIndex}- pendingFileSidebar={pendingFileNavigation?.sidebar}- pendingHighlightCommentID={- pendingFileNavigation?.commentID- }- onPendingNavigationConsumed={- handlePendingNavigationConsumed- }/>)}- </PhotosNavigationShell>- <Upload- {...{- user,- dragAndDropFiles,- uploadTypeSelectorIntent,- uploadTypeSelectorView,- }}- isFirstUpload={haveOnlySystemCollections(- normalCollectionSummaries,- )}- activeCollection={activeCollection}- closeUploadTypeSelector={setUploadTypeSelectorView.bind(- null,- false,- )}- setLoading={setBlockingLoad}- setShouldDisableDropzone={setShouldDisableDropzone}- onRemotePull={remotePull}- onRemoteFilesPull={remoteFilesPull}- onOpenCollectionSelector={handleOpenCollectionSelector}- onCloseCollectionSelector={handleCloseCollectionSelector}- onUploadFile={(file) => dispatch({ type: "uploadFile", file })}- onShowPlanSelector={showPlanSelector}- onShowSessionExpiredDialog={showSessionExpiredDialog}- isInHiddenSection={barMode == "hidden-albums"}- />- <Sidebar- {...sidebarVisibilityProps}- onClose={handleSidebarClose}- onShowLargeFiles={handleShowLargeFiles}- onShowDuplicates={handleShowDuplicates}- pendingAction={pendingSidebarAction}- onActionHandled={handleSidebarActionHandled}- onShowPlanSelector={showPlanSelector}- collectionNameByID={collectionNameByID}- onCloseOverlays={closeSidebarOverlays}- onAuthenticateUser={authenticateUser}- >- {(onRootClose) =>- sidebarVisibilityProps.open &&- renderSubscriptionDialogs(onRootClose)- }- </Sidebar>- <WhatsNew {...whatsNewVisibilityProps} />- <PeopleConsentDialog- {...peopleConsentVisibilityProps}- onClose={() => {- pendingPeopleSearchReset.current = undefined;- peopleConsentVisibilityProps.onClose();- }}- onEnabled={() =>- handleShowPeople(pendingPeopleSearchReset.current)- }- />- <AssignPersonDialog- {...contextMenuAssignPersonProps}- people={namedPeople}- title={t("add_a_person")}- onSelectPerson={handleContextMenuSelectPerson}- />- {slideshow &&- slideshow.collectionID === activeCollection?.id &&- !isInSearchMode && (- <AlbumSlideshow- files={slideshow.files}- title={slideshow.title}- onClose={closeSlideshow}+ {activeCollection && editAlbumDetailsVisibilityProps.open && (+ <EditAlbumDetailsDialog+ key={activeCollection.id}+ {...editAlbumDetailsVisibilityProps}+ collection={activeCollection}+ files={activeCollectionFiles}+ initialCoverFile={activeCollectionSummary?.coverFile}+ user={user}+ onSubmit={handleEditAlbumDetails}/>)}- {activeCollectionSummary && (- <CollectionMapDialog- {...collectionMapVisibilityProps}- collectionSummary={activeCollectionSummary}- files={- activeCollection ? activeCollectionFiles : filteredFiles- }- mapFileSource={mapFileSource}- onRemotePull={remotePull}- onAddSaveGroup={onAddSaveGroup}- onMarkTempDeleted={handleMarkTempDeleted}- onAddFileToCollection={handleAddSingleFileToCollection}- onRemoteFilesPull={remoteFilesPull}- onVisualFeedback={handleVisualFeedback}- fileNormalCollectionIDs={fileNormalCollectionIDs}- collectionNameByID={collectionNameByID}- emailByUserID={state.emailByUserID}- onSelectCollection={handleSelectCollection}- onSelectPerson={handleSelectPerson}+ <AuthenticateUser+ open={authenticateUserVisibilityProps.open}+ onClose={handleCloseAuthenticateUser}+ onAuthenticate={handleAuthenticate}/>- )}- {activeCollection && editAlbumDetailsVisibilityProps.open && (- <EditAlbumDetailsDialog- key={activeCollection.id}- {...editAlbumDetailsVisibilityProps}- collection={activeCollection}- files={activeCollectionFiles}- initialCoverFile={activeCollectionSummary?.coverFile}- user={user}- onSubmit={handleEditAlbumDetails}+ <SingleInputDialog+ {...albumNameInputVisibilityProps}+ variant="v2"+ title={t("new_album")}+ label={t("album_name")}+ submitButtonTitle={t("create")}+ onClose={() => {+ // Do not leak a cancelled add into the next album creation.+ pendingSingleFileAdd.current = undefined;+ postCreateAlbumHidden.current = false;+ setPostCreateAlbumOp(undefined);+ albumNameInputVisibilityProps.onClose();+ }}+ onSubmit={handleAlbumNameSubmit}/>- )}- <AuthenticateUser- open={authenticateUserVisibilityProps.open}- onClose={handleCloseAuthenticateUser}- onAuthenticate={handleAuthenticate}- />- <SingleInputDialog- {...albumNameInputVisibilityProps}- variant="v2"- title={t("new_album")}- label={t("album_name")}- submitButtonTitle={t("create")}- onClose={() => {- // Do not leak a cancelled add into the next album creation.- pendingSingleFileAdd.current = undefined;- postCreateAlbumHidden.current = false;- setPostCreateAlbumOp(undefined);- albumNameInputVisibilityProps.onClose();- }}- onSubmit={handleAlbumNameSubmit}- />- <QuickLinkCreatedNotification- open={publicLinkToast.open}- onCopy={() => {- if (publicLinkToast.url) {- void navigator.clipboard.writeText(publicLinkToast.url);+ <QuickLinkCreatedNotification+ open={publicLinkToast.open}+ onCopy={() => {+ if (publicLinkToast.url) {+ void navigator.clipboard.writeText(+ publicLinkToast.url,+ );+ }+ }}+ onClose={() =>+ setPublicLinkToast((prev) => ({ ...prev, open: false }))}- }}- onClose={() =>- setPublicLinkToast((prev) => ({ ...prev, open: false }))- }- />- <AlbumAddedNotification- open={addToAlbumProgress.open}- onClose={() =>- setAddToAlbumProgress((s) => ({ ...s, open: false }))- }- phase={addToAlbumProgress.phase}- albumName={addToAlbumProgress.albumName}- />+ />+ <AlbumAddedNotification+ open={addToAlbumProgress.open}+ onClose={() =>+ setAddToAlbumProgress((s) => ({ ...s, open: false }))+ }+ phase={addToAlbumProgress.phase}+ albumName={addToAlbumProgress.albumName}+ />+ </FullScreenDropZone><EditLocationDialog{...editLocationVisibilityProps}files={selectedFilesInView}onConfirm={handleEditLocationConfirm}/>- </FullScreenDropZone>+ </>);};