π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refractor(locker):split-use-locker-actions
Aswin Asok4fe99a371071
diff --git a/web/apps/locker/src/components/collections/DeleteCollectionDialog.tsx b/web/apps/locker/src/components/collections/DeleteCollectionDialog.tsxindex 913a69175a..537c55d546 100644--- a/web/apps/locker/src/components/collections/DeleteCollectionDialog.tsx+++ b/web/apps/locker/src/components/collections/DeleteCollectionDialog.tsx@@ -1,7 +1,7 @@import { LockerConfirmDialog } from "@/components/ui/LockerConfirmDialog";import { t } from "i18next";import React from "react";-import type { DeleteCollectionDialogState } from "../locker/use-locker-actions";+import type { DeleteCollectionDialogState } from "../locker/use-collection-actions";interface DeleteCollectionDialogProps {dialogState: DeleteCollectionDialogState | null;diff --git a/web/apps/locker/src/components/locker/LockerPage.tsx b/web/apps/locker/src/components/locker/LockerPage.tsxindex 8f70a102b3..05b24a00fd 100644--- a/web/apps/locker/src/components/locker/LockerPage.tsx+++ b/web/apps/locker/src/components/locker/LockerPage.tsx@@ -4,9 +4,13 @@ import { CreateItemDialog } from "@/components/create-item/CreateItemDialog";import { ItemList } from "@/components/items/ItemList";import { EmptyTrashDialog } from "@/components/locker/EmptyTrashDialog";import { LockerDragOverlay } from "@/components/locker/LockerDragOverlay";-import { useLockerActions } from "@/components/locker/use-locker-actions";+import { useCollectionActions } from "@/components/locker/use-collection-actions";+import { useItemActions } from "@/components/locker/use-item-actions";+import { useLockerConfirmation } from "@/components/locker/use-locker-confirmation";import { useLockerData } from "@/components/locker/use-locker-data";import { useLockerNavigation } from "@/components/locker/use-locker-navigation";+import { useLockerUploads } from "@/components/locker/use-locker-uploads";+import { useTrashActions } from "@/components/locker/use-trash-actions";import { LockerNavbar } from "@/components/LockerNavbar";import { LockerSidebar } from "@/components/sidebar/LockerSidebar";import { LockerConfirmDialog } from "@/components/ui/LockerConfirmDialog";@@ -28,6 +32,7 @@ export const LockerPage: React.FC = () => {const isLockerI18nReady = useSetupLockerI18n();const [sidebarOpen, setSidebarOpen] = useState(false);const [searchTerm, setSearchTerm] = useState("");+ const [toast, setToast] = useState<string | null>(null);const closeSidebar = useCallback(() => {setSidebarOpen(false);@@ -64,57 +69,85 @@ export const LockerPage: React.FC = () => {visibleConfirmDialog,closeConfirmDialog,handleConfirmDialogConfirm,- createDialogOpen,- deleteCollectionDialog,+ requestConfirmation,+ } = useLockerConfirmation();++ const {editItem,- emptyTrashDialog,- ensureCollectionsExist,- handleConfirmDeleteCollection,- handleConfirmEmptyTrash,- handleCreateCollection,- handleCreateDialogClose,+ setEditItem,handleCreateItem,- handleDeleteCollection,+ handleUpdateItem,handleDeleteItem,handleDeleteItems,- handleDragEnter,- handleDragLeave,- handleDragOver,- handleDrop,handleEditItem,- handleEmptyTrash,- handleLeaveCollection,- handleOpenShareCollection,- handlePermanentlyDelete,+ } = useItemActions({+ collections,+ masterKey,+ selectedCollectionID,+ refreshData,+ setToast,+ requestConfirmation,+ });++ const {+ deleteCollectionDialog,+ visibleDeleteCollectionDialog,+ setDeleteCollectionDialog,+ shareCollectionID,+ setShareCollectionID,+ handleCreateCollection,+ ensureCollectionsExist,handleRenameCollection,- handleRestoreItem,+ handleDeleteCollection,+ handleConfirmDeleteCollection,+ handleOpenShareCollection,handleShareCollection,handleUnshareCollection,- handleUpdateItem,- handleUploadFileWithProgress,- handleUploadItemComplete,- handleUploadsFinished,- isDragActive,- openCreateDialog,- prefilledUploadItems,- setDeleteCollectionDialog,- setEditItem,- setEmptyTrashDialog,- setShareCollectionID,- shareCollectionID,- setToast,- toast,- visibleDeleteCollectionDialog,- visibleEmptyTrashDialog,- } = useLockerActions({+ handleLeaveCollection,+ } = useCollectionActions({collections,- ensureUploadLimitState,masterKey,selectedCollectionID,routerPathname: router.pathname,- refreshData,navigateHome,removeCollectionFromState,+ refreshData,+ setToast,+ requestConfirmation,+ });++ const {+ createDialogOpen,+ prefilledUploadItems,+ isDragActive,+ handleCreateDialogClose,+ openCreateDialog,+ handleUploadFileWithProgress,+ handleUploadsFinished,+ handleUploadItemComplete,+ handleDragEnter,+ handleDragOver,+ handleDragLeave,+ handleDrop,+ } = useLockerUploads({+ masterKey,+ ensureUploadLimitState,+ refreshData,+ setToast,+ });++ const {+ emptyTrashDialog,+ visibleEmptyTrashDialog,+ setEmptyTrashDialog,+ handlePermanentlyDelete,+ handleRestoreItem,+ handleEmptyTrash,+ handleConfirmEmptyTrash,+ } = useTrashActions({+ refreshData,+ requestConfirmation,+ setToast,trashLastUpdatedAt,});diff --git a/web/apps/locker/src/components/locker/use-collection-actions.ts b/web/apps/locker/src/components/locker/use-collection-actions.tsnew file mode 100644index 0000000000..887f073bee--- /dev/null+++ b/web/apps/locker/src/components/locker/use-collection-actions.ts@@ -0,0 +1,341 @@+import {+ createCollection as createCollectionAPI,+ deleteCollection as deleteCollectionAPI,+ deleteCollectionKeepingFiles,+ leaveCollection as leaveCollectionAPI,+ renameCollection as renameCollectionAPI,+ shareCollection as shareCollectionAPI,+ unshareCollection as unshareCollectionAPI,+} from "@/services/remote";+import type { LockerCollection } from "@/types";+import { isCollectionOwner } from "@/types";+import { savedLocalUser } from "ente-accounts/services/accounts-db";+import log from "ente-base/log";+import { t } from "i18next";+import { useCallback, useEffect, useRef, useState } from "react";+import type { ConfirmDialogState } from "./use-locker-confirmation";++export interface DeleteCollectionDialogState {+ collectionID: number;+ collectionName: string;+ hasItems: boolean;+ deleteFromEverywhere: boolean;+ loading: boolean;+ error: string | null;+}++const COLLECTION_MUTATION_REFRESH_DELAY_MS = 750;++interface UseCollectionActionsProps {+ collections: LockerCollection[];+ masterKey?: string;+ selectedCollectionID: number | null;+ routerPathname: string;+ navigateHome: () => void;+ removeCollectionFromState: (collectionID: number) => void;+ refreshData: (masterKey?: string) => Promise<void>;+ setToast: (message: string | null) => void;+ requestConfirmation: (dialog: ConfirmDialogState) => void;+}++export const useCollectionActions = ({+ collections,+ masterKey,+ selectedCollectionID,+ routerPathname,+ navigateHome,+ removeCollectionFromState,+ refreshData,+ setToast,+ requestConfirmation,+}: UseCollectionActionsProps) => {+ const currentUserID = savedLocalUser()?.id;++ const [deleteCollectionDialog, setDeleteCollectionDialog] =+ useState<DeleteCollectionDialogState | null>(null);++ const deleteCollectionDialogRef =+ useRef<DeleteCollectionDialogState | null>(null);++ const [shareCollectionID, setShareCollectionID] = useState<number | null>(+ null,+ );++ const shareCollectionIDRef = useRef<number | null>(shareCollectionID);++ const selectedCollectionIDRef = useRef<number | null>(selectedCollectionID);++ useEffect(() => {+ if (deleteCollectionDialog) {+ deleteCollectionDialogRef.current = deleteCollectionDialog;+ }+ }, [deleteCollectionDialog]);++ useEffect(() => {+ shareCollectionIDRef.current = shareCollectionID;+ }, [shareCollectionID]);++ useEffect(() => {+ selectedCollectionIDRef.current = selectedCollectionID;+ }, [selectedCollectionID]);++ useEffect(() => {+ if (+ shareCollectionID !== null &&+ !collections.some(+ (collection) => collection.id === shareCollectionID,+ )+ ) {+ setShareCollectionID(null);+ }+ }, [collections, shareCollectionID]);++ const visibleDeleteCollectionDialog =+ deleteCollectionDialog ?? deleteCollectionDialogRef.current;++ const refreshCollectionsAfterMutation = useCallback(async () => {+ await new Promise((resolve) =>+ setTimeout(resolve, COLLECTION_MUTATION_REFRESH_DELAY_MS),+ );+ try {+ await refreshData();+ } catch (error) {+ log.error(+ "Failed to refresh locker data after collection mutation",+ error,+ );+ }+ }, [refreshData]);++ const handleCreateCollection = useCallback(+ async (name: string): Promise<number> => {+ if (!masterKey) {+ throw new Error("No master key");+ }+ const id = await createCollectionAPI(name, masterKey);+ await refreshData();+ setToast(t("createCollectionSuccess"));+ return id;+ },+ [masterKey, refreshData, setToast],+ );++ const ensureCollectionsExist = useCallback(+ async (names: string[]) => {+ if (!masterKey) {+ throw new Error("No master key");+ }++ const normalizedNameToID = new Map(+ collections+ .filter(+ (collection) =>+ currentUserID !== undefined &&+ isCollectionOwner(collection, currentUserID),+ )+ .map((collection) => [+ collection.name.trim().toLocaleLowerCase(),+ collection.id,+ ]),+ );+ let createdCollection = false;++ for (const name of names) {+ const normalizedName = name.trim().toLocaleLowerCase();+ if (!normalizedName || normalizedNameToID.has(normalizedName)) {+ continue;+ }++ const id = await createCollectionAPI(name, masterKey);+ normalizedNameToID.set(normalizedName, id);+ createdCollection = true;+ }++ if (createdCollection) {+ await refreshData();+ }++ return normalizedNameToID;+ },+ [collections, currentUserID, masterKey, refreshData],+ );++ const handleRenameCollection = useCallback(+ async (collectionID: number, newName: string) => {+ await renameCollectionAPI(collectionID, newName);+ await refreshData();+ setToast(t("collectionRenamedSuccessfully"));+ },+ [refreshData, setToast],+ );++ const handleDeleteCollection = useCallback(+ (collectionID: number) => {+ const collection = collections.find(+ (candidate) => candidate.id === collectionID,+ );+ if (!collection) {+ log.warn(+ `Ignoring delete for missing collection ${collectionID}`,+ );+ return;+ }++ setDeleteCollectionDialog({+ collectionID,+ collectionName: collection.name,+ hasItems: collection.items.length > 0,+ deleteFromEverywhere: false,+ loading: false,+ error: null,+ });+ },+ [collections],+ );++ const handleConfirmDeleteCollection = useCallback(async () => {+ const dialogState = deleteCollectionDialog;+ if (!dialogState) {+ return;+ }++ const collection = collections.find(+ (candidate) => candidate.id === dialogState.collectionID,+ );+ if (!collection) {+ setDeleteCollectionDialog((current) =>+ current+ ? { ...current, error: t("collectionNotFoundError") }+ : current,+ );+ return;+ }++ const shouldNavigateHome =+ routerPathname === "/collection" &&+ selectedCollectionID === collection.id;++ setDeleteCollectionDialog((current) =>+ current ? { ...current, loading: true, error: null } : current,+ );++ try {+ if (dialogState.deleteFromEverywhere) {+ await deleteCollectionAPI(collection.id);+ } else if (collection.items.length > 0) {+ if (!masterKey) {+ throw new Error("Missing master key");+ }+ await deleteCollectionKeepingFiles(collection, masterKey);+ } else {+ await deleteCollectionAPI(collection.id, { keepFiles: true });+ }++ if (shouldNavigateHome) {+ navigateHome();+ }+ removeCollectionFromState(collection.id);+ setDeleteCollectionDialog(null);+ setToast(t("collectionDeletedSuccessfully"));+ void refreshCollectionsAfterMutation();+ } catch (error) {+ log.error("Failed to delete collection", error);+ setDeleteCollectionDialog((current) =>+ current+ ? {+ ...current,+ loading: false,+ error:+ error instanceof Error+ ? error.message+ : t("failedToDeleteCollection"),+ }+ : current,+ );+ }+ }, [+ collections,+ deleteCollectionDialog,+ masterKey,+ navigateHome,+ refreshCollectionsAfterMutation,+ removeCollectionFromState,+ routerPathname,+ selectedCollectionID,+ setToast,+ ]);++ const handleOpenShareCollection = useCallback(+ (collection: LockerCollection) => {+ setShareCollectionID(collection.id);+ },+ [],+ );++ const handleShareCollection = useCallback(+ async (collectionID: number, email: string) => {+ await shareCollectionAPI(collectionID, email);+ await refreshData();+ setToast(t("collectionSharedSuccessfully"));+ },+ [refreshData, setToast],+ );++ const handleUnshareCollection = useCallback(+ async (collectionID: number, email: string) => {+ await unshareCollectionAPI(collectionID, email);+ await refreshData();+ setToast(t("viewerRemovedSuccessfully"));+ },+ [refreshData, setToast],+ );++ const handleLeaveCollection = useCallback(+ (collection: LockerCollection) => {+ requestConfirmation({+ illustration: "/images/warning-grey.png",+ title: t("leaveCollection"),+ body: t("filesAddedByYouWillBeRemovedFromTheCollection"),+ confirmLabel: t("leaveCollection"),+ tone: "primary",+ action: async () => {+ await leaveCollectionAPI(collection.id);+ if (shareCollectionIDRef.current === collection.id) {+ setShareCollectionID(null);+ }+ if (selectedCollectionIDRef.current === collection.id) {+ navigateHome();+ }+ removeCollectionFromState(collection.id);+ setToast(t("leaveCollectionSuccessfully"));+ void refreshCollectionsAfterMutation();+ },+ loading: false,+ });+ },+ [+ navigateHome,+ refreshCollectionsAfterMutation,+ removeCollectionFromState,+ requestConfirmation,+ setToast,+ ],+ );++ return {+ deleteCollectionDialog,+ visibleDeleteCollectionDialog,+ setDeleteCollectionDialog,+ shareCollectionID,+ setShareCollectionID,+ handleCreateCollection,+ ensureCollectionsExist,+ handleRenameCollection,+ handleDeleteCollection,+ handleConfirmDeleteCollection,+ handleOpenShareCollection,+ handleShareCollection,+ handleUnshareCollection,+ handleLeaveCollection,+ };+};diff --git a/web/apps/locker/src/components/locker/use-item-actions.tsx b/web/apps/locker/src/components/locker/use-item-actions.tsxnew file mode 100644index 0000000000..a2a211ca05--- /dev/null+++ b/web/apps/locker/src/components/locker/use-item-actions.tsx@@ -0,0 +1,286 @@+import {+ createInfoItem,+ setItemImportant,+ trashFiles,+ updateFileItem,+ updateInfoItem,+ updateItemCollections,+} from "@/services/remote";+import type { LockerCollection, LockerItem, LockerItemType } from "@/types";+import { getItemTitle } from "@/types";+import { t } from "i18next";+import { useCallback, useEffect, useState } from "react";+import { Trans } from "react-i18next";+import type { CreateItemDialogEditItem } from "../create-item/use-create-item-dialog-state";+import type { ConfirmDialogState } from "./use-locker-confirmation";++const collectionIDsForItemMutation = (+ item: LockerItem,+ selectedCollectionID: number | null,+) =>+ Array.from(+ new Set(+ selectedCollectionID === null+ ? item.collectionIDs.length > 0+ ? item.collectionIDs+ : [item.collectionID]+ : [item.collectionID],+ ),+ );++interface UseItemActionsProps {+ collections: LockerCollection[];+ masterKey?: string;+ selectedCollectionID: number | null;+ refreshData: (masterKey?: string) => Promise<void>;+ setToast: (message: string | null) => void;+ requestConfirmation: (dialog: ConfirmDialogState) => void;+}++export const useItemActions = ({+ collections,+ masterKey,+ selectedCollectionID,+ refreshData,+ setToast,+ requestConfirmation,+}: UseItemActionsProps) => {+ const [editItem, setEditItem] = useState<CreateItemDialogEditItem | null>(+ null,+ );++ useEffect(() => {+ if (+ editItem &&+ !collections.some((collection) =>+ collection.items.some((item) => item.id === editItem.id),+ )+ ) {+ setEditItem(null);+ }+ }, [collections, editItem]);++ const handleCreateItem = useCallback(+ async (+ type: LockerItemType,+ data: Record<string, unknown>,+ collectionIDs: number[],+ ) => {+ if (!masterKey) {+ throw new Error("No master key");+ }+ await createInfoItem(collectionIDs, type, data, masterKey);+ await refreshData();+ setToast(t("recordSavedSuccessfully"));+ },+ [masterKey, refreshData, setToast],+ );++ const handleUpdateItem = useCallback(+ async (+ type: LockerItemType,+ data: Record<string, unknown>,+ collectionIDs: number[],+ ) => {+ if (!masterKey || !editItem) {+ throw new Error("No master key or item");+ }++ if (type === "file") {+ const editedName =+ typeof data.name === "string" ? data.name : "";+ await updateFileItem(editItem.id, editedName);+ } else {+ await updateInfoItem(editItem.id, type, data);+ }++ await updateItemCollections(editItem.id, collectionIDs, masterKey);+ await refreshData();+ setToast(t("fileUpdatedSuccessfully"));+ },+ [editItem, masterKey, refreshData, setToast],+ );++ const handleDeleteItem = useCallback(+ (item: LockerItem) => {+ const collectionIDs = collectionIDsForItemMutation(+ item,+ selectedCollectionID,+ );++ requestConfirmation({+ illustration: "/images/file_delete_icon.png",+ title: t("areYouSure"),+ body: (+ <Trans+ i18nKey="deleteFileConfirmation"+ components={{+ fileName: <strong>{getItemTitle(item)}</strong>,+ }}+ />+ ),+ confirmLabel: t("yesDeleteFiles", { count: 1 }),+ tone: "critical",+ action: async () => {+ for (const collectionID of collectionIDs) {+ await trashFiles([item.id], collectionID);+ }+ await refreshData();+ setToast(t("fileDeletedSuccessfully"));+ },+ loading: false,+ });+ },+ [refreshData, requestConfirmation, selectedCollectionID, setToast],+ );++ const handleDeleteItems = useCallback(+ (items: LockerItem[]) => {+ if (items.length === 0) {+ return;+ }++ requestConfirmation({+ illustration: "/images/file_delete_icon.png",+ title: t("areYouSure"),+ body: t("deleteMultipleFilesDialogBody", {+ count: items.length,+ }),+ confirmLabel: t("yesDeleteFiles", { count: items.length }),+ tone: "critical",+ action: async () => {+ const fileIDsByCollection = new Map<number, Set<number>>();+ for (const item of items) {+ const collectionIDs = collectionIDsForItemMutation(+ item,+ selectedCollectionID,+ );+ for (const collectionID of collectionIDs) {+ const existing =+ fileIDsByCollection.get(collectionID) ??+ new Set<number>();+ existing.add(item.id);+ fileIDsByCollection.set(collectionID, existing);+ }+ }++ for (const [+ collectionID,+ fileIDs,+ ] of fileIDsByCollection.entries()) {+ await trashFiles([...fileIDs], collectionID);+ }++ await refreshData();+ setToast(+ t("filesDeletedSuccessfully", { count: items.length }),+ );+ },+ loading: false,+ });+ },+ [refreshData, requestConfirmation, selectedCollectionID, setToast],+ );++ const handleEditItem = useCallback(+ (item: LockerItem) => {+ const fullCollectionIDs = Array.from(+ new Set([+ ...item.collectionIDs,+ item.collectionID,+ ...collections+ .filter((collection) =>+ collection.items.some(+ (candidate) => candidate.id === item.id,+ ),+ )+ .map((collection) => collection.id),+ ]),+ );++ setEditItem({+ id: item.id,+ type: item.type,+ data:+ item.type === "file"+ ? { name: getItemTitle(item) }+ : (item.data as unknown as Record<string, unknown>),+ collectionID: item.collectionID,+ collectionIDs: fullCollectionIDs,+ });+ },+ [collections],+ );++ const handleSetItemsImportant = useCallback(+ async (items: LockerItem[], shouldBeImportant: boolean) => {+ if (!masterKey) {+ throw new Error("No master key");+ }+ if (items.length === 0) {+ return;+ }++ let changedCount = 0;+ let pendingError: unknown;+ try {+ for (const item of items) {+ if (+ await setItemImportant(+ item.id,+ shouldBeImportant,+ masterKey,+ )+ ) {+ changedCount += 1;+ }+ }+ } catch (error) {+ pendingError = error;+ }++ if (changedCount > 0) {+ await refreshData();+ }+ if (pendingError) {+ throw pendingError instanceof Error+ ? pendingError+ : new Error(t("failedToUpdateImportantStatus"));+ }++ if (changedCount === 0) {+ if (shouldBeImportant) {+ setToast(t("allItemsAlreadyMarkedAsImportant"));+ }+ return;+ }++ if (shouldBeImportant) {+ setToast(+ changedCount === 1+ ? t("fileMarkedAsImportant")+ : t("itemsMarkedAsImportant", { count: changedCount }),+ );+ return;+ }++ setToast(+ changedCount === 1+ ? t("fileRemovedFromImportant")+ : t("itemsRemovedFromImportant", { count: changedCount }),+ );+ },+ [masterKey, refreshData, setToast],+ );++ return {+ editItem,+ setEditItem,+ handleCreateItem,+ handleUpdateItem,+ handleDeleteItem,+ handleDeleteItems,+ handleEditItem,+ handleSetItemsImportant,+ };+};diff --git a/web/apps/locker/src/components/locker/use-locker-actions.tsx b/web/apps/locker/src/components/locker/use-locker-actions.tsxdeleted file mode 100644index 32fdde6569..0000000000--- a/web/apps/locker/src/components/locker/use-locker-actions.tsx+++ /dev/null@@ -1,1006 +0,0 @@-import {- LOCKER_FILE_LIMIT_PAID,- LOCKER_STORAGE_LIMIT_PAID_BYTES,- lockerUploadAllowance,- type LockerUploadLimitState,- type LockerUploadPreflightFailure,-} from "@/services/locker-limits";-import {- createCollection as createCollectionAPI,- createInfoItem,- deleteCollection as deleteCollectionAPI,- deleteCollectionKeepingFiles,- emptyTrash as emptyTrashAPI,- leaveCollection as leaveCollectionAPI,- permanentlyDeleteFromTrash,- renameCollection as renameCollectionAPI,- restoreFromTrash,- setItemImportant,- shareCollection as shareCollectionAPI,- trashFiles,- unshareCollection as unshareCollectionAPI,- updateFileItem,- updateInfoItem,- updateItemCollections,- uploadLockerFile,- type LockerUploadProgress,-} from "@/services/remote";-import type {- LockerCollection,- LockerItem,- LockerItemType,- LockerUploadCandidate,-} from "@/types";-import { getItemTitle, isCollectionOwner } from "@/types";-import { savedLocalUser } from "ente-accounts/services/accounts-db";-import log from "ente-base/log";-import { t } from "i18next";-import type { DragEvent } from "react";-import { useCallback, useEffect, useRef, useState } from "react";-import { Trans } from "react-i18next";-import { filterNonEmptyUploadItems } from "../create-item/file-upload-helpers";-import {- collectUploadCandidatesFromDrop,- type DragDataTransferItem,-} from "../create-item/scan-dropped-files";-import type { CreateItemDialogEditItem } from "../create-item/use-create-item-dialog-state";-import type { EmptyTrashDialogState } from "./EmptyTrashDialog";--export interface ConfirmDialogState {- illustration: string;- title: string;- body: React.ReactNode;- confirmLabel: string;- tone: "critical" | "primary";- action: () => Promise<void>;- loading: boolean;- error?: string;-}--export interface DeleteCollectionDialogState {- collectionID: number;- collectionName: string;- hasItems: boolean;- deleteFromEverywhere: boolean;- loading: boolean;- error: string | null;-}--const COLLECTION_MUTATION_REFRESH_DELAY_MS = 750;-const UPLOAD_REFRESH_DEBOUNCE_MS = 250;-const UPLOAD_REFRESH_FOLLOW_UP_DELAYS_MS = [1200, 3000, 6000] as const;--const collectionIDsForItemMutation = (- item: LockerItem,- selectedCollectionID: number | null,-) =>- Array.from(- new Set(- selectedCollectionID === null- ? item.collectionIDs.length > 0- ? item.collectionIDs- : [item.collectionID]- : [item.collectionID],- ),- );--interface UseLockerActionsProps {- collections: LockerCollection[];- masterKey?: string;- selectedCollectionID: number | null;- routerPathname: string;- ensureUploadLimitState: () => Promise<- { userDetails: LockerUploadLimitState } | undefined- >;- refreshData: (masterKey?: string) => Promise<void>;- navigateHome: () => void;- removeCollectionFromState: (collectionID: number) => void;- trashLastUpdatedAt: number;-}--export const useLockerActions = ({- collections,- ensureUploadLimitState,- masterKey,- selectedCollectionID,- routerPathname,- refreshData,- navigateHome,- removeCollectionFromState,- trashLastUpdatedAt,-}: UseLockerActionsProps) => {- const currentUserID = savedLocalUser()?.id;- const [createDialogOpen, setCreateDialogOpen] = useState(false);- const [prefilledUploadItems, setPrefilledUploadItems] = useState<- LockerUploadCandidate[]- >([]);- const [editItem, setEditItem] = useState<CreateItemDialogEditItem | null>(- null,- );- const [deleteCollectionDialog, setDeleteCollectionDialog] =- useState<DeleteCollectionDialogState | null>(null);- const deleteCollectionDialogRef =- useRef<DeleteCollectionDialogState | null>(null);- const [emptyTrashDialog, setEmptyTrashDialog] =- useState<EmptyTrashDialogState | null>(null);- const emptyTrashDialogRef = useRef<EmptyTrashDialogState | null>(null);- const [confirmDialog, setConfirmDialog] =- useState<ConfirmDialogState | null>(null);- const confirmDialogRef = useRef<ConfirmDialogState | null>(null);- const [toast, setToast] = useState<string | null>(null);- const [shareCollectionID, setShareCollectionID] = useState<number | null>(- null,- );- const [isDragActive, setIsDragActive] = useState(false);- const dragDepthRef = useRef(0);- const shareCollectionIDRef = useRef<number | null>(shareCollectionID);- const selectedCollectionIDRef = useRef<number | null>(selectedCollectionID);- const uploadRefreshTimeoutRef = useRef<number | null>(null);- const uploadFollowUpRefreshTimeoutsRef = useRef<number[]>([]);-- useEffect(() => {- if (deleteCollectionDialog) {- deleteCollectionDialogRef.current = deleteCollectionDialog;- }- }, [deleteCollectionDialog]);-- useEffect(() => {- if (emptyTrashDialog) {- emptyTrashDialogRef.current = emptyTrashDialog;- }- }, [emptyTrashDialog]);-- useEffect(() => {- if (confirmDialog) {- confirmDialogRef.current = confirmDialog;- }- }, [confirmDialog]);-- useEffect(() => {- shareCollectionIDRef.current = shareCollectionID;- }, [shareCollectionID]);-- useEffect(() => {- selectedCollectionIDRef.current = selectedCollectionID;- }, [selectedCollectionID]);-- const clearUploadRefreshTimeout = useCallback(() => {- if (uploadRefreshTimeoutRef.current !== null) {- window.clearTimeout(uploadRefreshTimeoutRef.current);- uploadRefreshTimeoutRef.current = null;- }- }, []);-- const clearUploadFollowUpRefreshes = useCallback(() => {- uploadFollowUpRefreshTimeoutsRef.current.forEach((timeoutID) => {- window.clearTimeout(timeoutID);- });- uploadFollowUpRefreshTimeoutsRef.current = [];- }, []);-- useEffect(- () => () => {- clearUploadRefreshTimeout();- clearUploadFollowUpRefreshes();- },- [clearUploadFollowUpRefreshes, clearUploadRefreshTimeout],- );-- useEffect(() => {- if (- shareCollectionID !== null &&- !collections.some(- (collection) => collection.id === shareCollectionID,- )- ) {- setShareCollectionID(null);- }- }, [collections, shareCollectionID]);-- useEffect(() => {- if (- editItem &&- !collections.some((collection) =>- collection.items.some((item) => item.id === editItem.id),- )- ) {- setEditItem(null);- }- }, [collections, editItem]);-- const visibleDeleteCollectionDialog =- deleteCollectionDialog ?? deleteCollectionDialogRef.current;-- const visibleEmptyTrashDialog =- emptyTrashDialog ?? emptyTrashDialogRef.current;-- const visibleConfirmDialog = confirmDialog ?? confirmDialogRef.current;-- const closeConfirmDialog = useCallback(() => {- if (!confirmDialog?.loading) setConfirmDialog(null);- }, [confirmDialog]);-- const uploadPreflightFailureMessage = useCallback(- (- failure: LockerUploadPreflightFailure,- projectedFileCount: number,- projectedUsage: number,- ) => {- if (- (projectedFileCount > LOCKER_FILE_LIMIT_PAID ||- projectedUsage > LOCKER_STORAGE_LIMIT_PAID_BYTES) &&- (failure.reason === "fileCountLimit" ||- failure.reason === "storageLimit")- ) {- return t("uploadLockerHardCapErrorBody");- }- switch (failure.reason) {- case "fileCountLimit":- return t("uploadFileCountLimitErrorBody");- case "fileTooLarge":- return t("uploadFileTooLargeErrorBody", {- fileName: failure.fileName ?? "",- });- case "storageLimit":- return t("uploadStorageLimitErrorBody");- }- },- [],- );-- const refreshCollectionsAfterMutation = useCallback(async () => {- await new Promise((resolve) =>- setTimeout(resolve, COLLECTION_MUTATION_REFRESH_DELAY_MS),- );- try {- await refreshData();- } catch (error) {- log.error(- "Failed to refresh locker data after collection mutation",- error,- );- }- }, [refreshData]);-- const scheduleUploadRefresh = useCallback(- (delayMs: number) => {- clearUploadRefreshTimeout();- uploadRefreshTimeoutRef.current = window.setTimeout(() => {- uploadRefreshTimeoutRef.current = null;- void refreshData();- }, delayMs);- },- [clearUploadRefreshTimeout, refreshData],- );-- const scheduleUploadFollowUpRefreshes = useCallback(() => {- clearUploadFollowUpRefreshes();- uploadFollowUpRefreshTimeoutsRef.current =- UPLOAD_REFRESH_FOLLOW_UP_DELAYS_MS.map((delayMs) =>- window.setTimeout(() => {- void refreshData();- }, delayMs),- );- }, [clearUploadFollowUpRefreshes, refreshData]);-- const handleCreateItem = useCallback(- async (- type: LockerItemType,- data: Record<string, unknown>,- collectionIDs: number[],- ) => {- if (!masterKey) {- throw new Error("No master key");- }- await createInfoItem(collectionIDs, type, data, masterKey);- await refreshData();- setToast(t("recordSavedSuccessfully"));- },- [masterKey, refreshData],- );-- const handleUploadFileWithProgress = useCallback(- async (- file: File,- collectionIDs: number[],- onProgress: (progress: LockerUploadProgress) => void,- ) => {- if (!masterKey) {- throw new Error("No master key");- }- await uploadLockerFile(file, collectionIDs, masterKey, onProgress);- },- [masterKey],- );-- const handleUploadsFinished = useCallback(- async (uploadedCount: number) => {- clearUploadRefreshTimeout();- clearUploadFollowUpRefreshes();- await refreshData();- scheduleUploadFollowUpRefreshes();- setToast(- uploadedCount === 1- ? t("uploadComplete")- : t("uploadMultipleComplete", { count: uploadedCount }),- );- },- [- clearUploadFollowUpRefreshes,- clearUploadRefreshTimeout,- refreshData,- scheduleUploadFollowUpRefreshes,- ],- );-- const handleUploadItemComplete = useCallback(() => {- scheduleUploadRefresh(UPLOAD_REFRESH_DEBOUNCE_MS);- }, [scheduleUploadRefresh]);-- const handleUpdateItem = useCallback(- async (- type: LockerItemType,- data: Record<string, unknown>,- collectionIDs: number[],- ) => {- if (!masterKey || !editItem) {- throw new Error("No master key or item");- }-- if (type === "file") {- const editedName =- typeof data.name === "string" ? data.name : "";- await updateFileItem(editItem.id, editedName);- } else {- await updateInfoItem(editItem.id, type, data);- }-- await updateItemCollections(editItem.id, collectionIDs, masterKey);- await refreshData();- setToast(t("fileUpdatedSuccessfully"));- },- [editItem, masterKey, refreshData],- );-- const handleDeleteItem = useCallback(- (item: LockerItem) => {- const collectionIDs = collectionIDsForItemMutation(- item,- selectedCollectionID,- );-- setConfirmDialog({- illustration: "/images/file_delete_icon.png",- title: t("areYouSure"),- body: (- <Trans- i18nKey="deleteFileConfirmation"- components={{- fileName: <strong>{getItemTitle(item)}</strong>,- }}- />- ),- confirmLabel: t("yesDeleteFiles", { count: 1 }),- tone: "critical",- action: async () => {- for (const collectionID of collectionIDs) {- await trashFiles([item.id], collectionID);- }- await refreshData();- setToast(t("fileDeletedSuccessfully"));- },- loading: false,- });- },- [refreshData, selectedCollectionID],- );-- const handleDeleteItems = useCallback(- (items: LockerItem[]) => {- if (items.length === 0) {- return;- }-- setConfirmDialog({- illustration: "/images/file_delete_icon.png",- title: t("areYouSure"),- body: t("deleteMultipleFilesDialogBody", {- count: items.length,- }),- confirmLabel: t("yesDeleteFiles", { count: items.length }),- tone: "critical",- action: async () => {- const fileIDsByCollection = new Map<number, Set<number>>();- for (const item of items) {- const collectionIDs = collectionIDsForItemMutation(- item,- selectedCollectionID,- );- for (const collectionID of collectionIDs) {- const existing =- fileIDsByCollection.get(collectionID) ??- new Set<number>();- existing.add(item.id);- fileIDsByCollection.set(collectionID, existing);- }- }-- for (const [- collectionID,- fileIDs,- ] of fileIDsByCollection.entries()) {- await trashFiles([...fileIDs], collectionID);- }-- await refreshData();- setToast(- t("filesDeletedSuccessfully", { count: items.length }),- );- },- loading: false,- });- },- [refreshData, selectedCollectionID],- );-- const handleEditItem = useCallback(- (item: LockerItem) => {- const fullCollectionIDs = Array.from(- new Set([- ...item.collectionIDs,- item.collectionID,- ...collections- .filter((collection) =>- collection.items.some(- (candidate) => candidate.id === item.id,- ),- )- .map((collection) => collection.id),- ]),- );-- setEditItem({- id: item.id,- type: item.type,- data:- item.type === "file"- ? { name: getItemTitle(item) }- : (item.data as unknown as Record<string, unknown>),- collectionID: item.collectionID,- collectionIDs: fullCollectionIDs,- });- },- [collections],- );-- const handlePermanentlyDelete = useCallback(- (items: LockerItem[]) => {- setConfirmDialog({- illustration: "/images/warning-red.png",- title: t("permanentlyDelete"),- body: t("permanentlyDeleteFilesBody", { count: items.length }),- confirmLabel: t("permanentlyDelete"),- tone: "critical",- action: async () => {- await permanentlyDeleteFromTrash(- items.map((item) => item.id),- );- await refreshData();- setToast(- t("filesDeletedPermanently", { count: items.length }),- );- },- loading: false,- });- },- [refreshData],- );-- const handleRestoreItem = useCallback(- async (item: LockerItem, collectionID: number) => {- await restoreFromTrash(- [{ id: item.id, collectionID: item.collectionID }],- collectionID,- );- await refreshData();- setToast(t("filesRestoredSuccessfully", { count: 1 }));- },- [refreshData],- );-- const handleEmptyTrash = useCallback(() => {- setEmptyTrashDialog({ loading: false });- }, []);-- const handleConfirmEmptyTrash = useCallback(async () => {- if (!emptyTrashDialog || emptyTrashDialog.loading) {- return;- }-- setEmptyTrashDialog({ loading: true });- try {- await emptyTrashAPI(trashLastUpdatedAt);- await refreshData();- setToast(t("trashClearedSuccessfully"));- setEmptyTrashDialog(null);- } catch (error) {- log.error("Failed to empty Locker trash", error);- setEmptyTrashDialog((current) =>- current- ? {- ...current,- error:- error instanceof Error- ? error.message- : t("generic_error"),- }- : current,- );- } finally {- setEmptyTrashDialog((current) =>- current ? { ...current, loading: false } : current,- );- }- }, [emptyTrashDialog, refreshData, trashLastUpdatedAt]);-- const handleConfirmDialogConfirm = useCallback(async () => {- if (!confirmDialog || confirmDialog.loading) {- return;- }-- setConfirmDialog({ ...confirmDialog, loading: true, error: undefined });- try {- await confirmDialog.action();- setConfirmDialog(null);- } catch (error) {- log.error("Failed to confirm Locker action", error);- setConfirmDialog((current) =>- current- ? {- ...current,- error:- error instanceof Error- ? error.message- : t("generic_error"),- }- : current,- );- } finally {- setConfirmDialog((current) =>- current ? { ...current, loading: false } : current,- );- }- }, [confirmDialog]);-- const handleCreateCollection = useCallback(- async (name: string): Promise<number> => {- if (!masterKey) {- throw new Error("No master key");- }- const id = await createCollectionAPI(name, masterKey);- await refreshData();- setToast(t("createCollectionSuccess"));- return id;- },- [masterKey, refreshData],- );-- const ensureCollectionsExist = useCallback(- async (names: string[]) => {- if (!masterKey) {- throw new Error("No master key");- }-- const normalizedNameToID = new Map(- collections- .filter(- (collection) =>- currentUserID !== undefined &&- isCollectionOwner(collection, currentUserID),- )- .map((collection) => [- collection.name.trim().toLocaleLowerCase(),- collection.id,- ]),- );- let createdCollection = false;-- for (const name of names) {- const normalizedName = name.trim().toLocaleLowerCase();- if (!normalizedName || normalizedNameToID.has(normalizedName)) {- continue;- }-- const id = await createCollectionAPI(name, masterKey);- normalizedNameToID.set(normalizedName, id);- createdCollection = true;- }-- if (createdCollection) {- await refreshData();- }-- return normalizedNameToID;- },- [collections, currentUserID, masterKey, refreshData],- );-- const handleCreateDialogClose = useCallback(() => {- setCreateDialogOpen(false);- setPrefilledUploadItems([]);- }, []);-- const openUploadDialogForItems = useCallback(- (items: LockerUploadCandidate[]) => {- const nonEmptyItems = filterNonEmptyUploadItems(items);- if (nonEmptyItems.length === 0) {- return;- }- setPrefilledUploadItems(nonEmptyItems);- setCreateDialogOpen(true);- },- [],- );-- const openCreateDialog = useCallback(() => {- setPrefilledUploadItems([]);- setCreateDialogOpen(true);- }, []);-- const handleDragEnter = useCallback((event: DragEvent<HTMLElement>) => {- if (!event.dataTransfer.types.includes("Files")) {- return;- }- event.preventDefault();- event.stopPropagation();- dragDepthRef.current += 1;- setIsDragActive(true);- }, []);-- const handleDragOver = useCallback((event: DragEvent<HTMLElement>) => {- if (!event.dataTransfer.types.includes("Files")) {- return;- }- event.preventDefault();- event.stopPropagation();- event.dataTransfer.dropEffect = "copy";- }, []);-- const handleDragLeave = useCallback((event: DragEvent<HTMLElement>) => {- if (!event.dataTransfer.types.includes("Files")) {- return;- }- event.preventDefault();- event.stopPropagation();- dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);- if (dragDepthRef.current === 0) {- setIsDragActive(false);- }- }, []);-- const handleDrop = useCallback(- async (event: DragEvent<HTMLElement>) => {- event.preventDefault();- event.stopPropagation();- dragDepthRef.current = 0;- setIsDragActive(false);-- try {- const uploadLimitState = await ensureUploadLimitState();- if (!uploadLimitState) {- setToast(t("generic_error_retry"));- return;- }-- const allowance = lockerUploadAllowance(- uploadLimitState.userDetails,- );- const droppedItems = Array.from(- event.dataTransfer.items,- ) as DragDataTransferItem[];- const scanResult = await collectUploadCandidatesFromDrop(- droppedItems,- Array.from(event.dataTransfer.files),- {- remainingFileCount: allowance.remainingFileCount,- freeStorage: allowance.freeStorage,- },- );-- if (scanResult.preflightFailure) {- setToast(- uploadPreflightFailureMessage(- scanResult.preflightFailure,- lockerUploadAllowance(uploadLimitState.userDetails)- .currentFileCount +- scanResult.scannedNonEmptyFileCount,- uploadLimitState.userDetails.usage +- scanResult.scannedTotalSize,- ),- );- return;- }-- openUploadDialogForItems(scanResult.items);- } catch (error) {- log.error("Failed to process dropped Locker files", error);- setToast(t("generic_error_retry"));- }- },- [- ensureUploadLimitState,- openUploadDialogForItems,- uploadPreflightFailureMessage,- ],- );-- const handleRenameCollection = useCallback(- async (collectionID: number, newName: string) => {- await renameCollectionAPI(collectionID, newName);- await refreshData();- setToast(t("collectionRenamedSuccessfully"));- },- [refreshData],- );-- const handleDeleteCollection = useCallback(- (collectionID: number) => {- const collection = collections.find(- (candidate) => candidate.id === collectionID,- );- if (!collection) {- log.warn(- `Ignoring delete for missing collection ${collectionID}`,- );- return;- }-- setDeleteCollectionDialog({- collectionID,- collectionName: collection.name,- hasItems: collection.items.length > 0,- deleteFromEverywhere: false,- loading: false,- error: null,- });- },- [collections],- );-- const handleConfirmDeleteCollection = useCallback(async () => {- const dialogState = deleteCollectionDialog;- if (!dialogState) {- return;- }-- const collection = collections.find(- (candidate) => candidate.id === dialogState.collectionID,- );- if (!collection) {- setDeleteCollectionDialog((current) =>- current- ? { ...current, error: t("collectionNotFoundError") }- : current,- );- return;- }-- const shouldNavigateHome =- routerPathname === "/collection" &&- selectedCollectionID === collection.id;-- setDeleteCollectionDialog((current) =>- current ? { ...current, loading: true, error: null } : current,- );-- try {- if (dialogState.deleteFromEverywhere) {- await deleteCollectionAPI(collection.id);- } else if (collection.items.length > 0) {- if (!masterKey) {- throw new Error("Missing master key");- }- await deleteCollectionKeepingFiles(collection, masterKey);- } else {- await deleteCollectionAPI(collection.id, { keepFiles: true });- }-- if (shouldNavigateHome) {- navigateHome();- }- removeCollectionFromState(collection.id);- setDeleteCollectionDialog(null);- setToast(t("collectionDeletedSuccessfully"));- void refreshCollectionsAfterMutation();- } catch (error) {- log.error("Failed to delete collection", error);- setDeleteCollectionDialog((current) =>- current- ? {- ...current,- loading: false,- error:- error instanceof Error- ? error.message- : t("failedToDeleteCollection"),- }- : current,- );- }- }, [- collections,- deleteCollectionDialog,- masterKey,- navigateHome,- refreshCollectionsAfterMutation,- removeCollectionFromState,- routerPathname,- selectedCollectionID,- ]);-- const handleOpenShareCollection = useCallback(- (collection: LockerCollection) => {- setShareCollectionID(collection.id);- },- [],- );-- const handleShareCollection = useCallback(- async (collectionID: number, email: string) => {- await shareCollectionAPI(collectionID, email);- await refreshData();- setToast(t("collectionSharedSuccessfully"));- },- [refreshData],- );-- const handleUnshareCollection = useCallback(- async (collectionID: number, email: string) => {- await unshareCollectionAPI(collectionID, email);- await refreshData();- setToast(t("viewerRemovedSuccessfully"));- },- [refreshData],- );-- const handleLeaveCollection = useCallback(- (collection: LockerCollection) => {- setConfirmDialog({- illustration: "/images/warning-grey.png",- title: t("leaveCollection"),- body: t("filesAddedByYouWillBeRemovedFromTheCollection"),- confirmLabel: t("leaveCollection"),- tone: "primary",- action: async () => {- await leaveCollectionAPI(collection.id);- if (shareCollectionIDRef.current === collection.id) {- setShareCollectionID(null);- }- if (selectedCollectionIDRef.current === collection.id) {- navigateHome();- }- removeCollectionFromState(collection.id);- setToast(t("leaveCollectionSuccessfully"));- void refreshCollectionsAfterMutation();- },- loading: false,- });- },- [- navigateHome,- refreshCollectionsAfterMutation,- removeCollectionFromState,- ],- );-- const handleSetItemsImportant = useCallback(- async (items: LockerItem[], shouldBeImportant: boolean) => {- if (!masterKey) {- throw new Error("No master key");- }- if (items.length === 0) {- return;- }-- let changedCount = 0;- let pendingError: unknown;- try {- for (const item of items) {- if (- await setItemImportant(- item.id,- shouldBeImportant,- masterKey,- )- ) {- changedCount += 1;- }- }- } catch (error) {- pendingError = error;- }-- if (changedCount > 0) {- await refreshData();- }- if (pendingError) {- throw pendingError instanceof Error- ? pendingError- : new Error(t("failedToUpdateImportantStatus"));- }-- if (changedCount === 0) {- if (shouldBeImportant) {- setToast(t("allItemsAlreadyMarkedAsImportant"));- }- return;- }-- if (shouldBeImportant) {- setToast(- changedCount === 1- ? t("fileMarkedAsImportant")- : t("itemsMarkedAsImportant", { count: changedCount }),- );- return;- }-- setToast(- changedCount === 1- ? t("fileRemovedFromImportant")- : t("itemsRemovedFromImportant", { count: changedCount }),- );- },- [masterKey, refreshData],- );-- return {- confirmDialog,- visibleConfirmDialog,- closeConfirmDialog,- handleConfirmDialogConfirm,- createDialogOpen,- deleteCollectionDialog,- editItem,- emptyTrashDialog,- ensureCollectionsExist,- handleConfirmDeleteCollection,- handleConfirmEmptyTrash,- handleCreateCollection,- handleCreateDialogClose,- handleCreateItem,- handleDeleteCollection,- handleDeleteItem,- handleDeleteItems,- handleDragEnter,- handleDragLeave,- handleDragOver,- handleDrop,- handleEditItem,- handleEmptyTrash,- handleOpenShareCollection,- handlePermanentlyDelete,- handleLeaveCollection,- handleRenameCollection,- handleRestoreItem,- handleSetItemsImportant,- handleShareCollection,- handleUnshareCollection,- handleUpdateItem,- handleUploadFileWithProgress,- handleUploadItemComplete,- handleUploadsFinished,- isDragActive,- openCreateDialog,- prefilledUploadItems,- setDeleteCollectionDialog,- setEditItem,- setEmptyTrashDialog,- setShareCollectionID,- shareCollectionID,- toast,- setToast,- visibleDeleteCollectionDialog,- visibleEmptyTrashDialog,- };-};diff --git a/web/apps/locker/src/components/locker/use-locker-confirmation.ts b/web/apps/locker/src/components/locker/use-locker-confirmation.tsnew file mode 100644index 0000000000..487dc4741b--- /dev/null+++ b/web/apps/locker/src/components/locker/use-locker-confirmation.ts@@ -0,0 +1,69 @@+import log from "ente-base/log";+import { t } from "i18next";+import { useCallback, useEffect, useRef, useState } from "react";++export interface ConfirmDialogState {+ illustration: string;+ title: string;+ body: React.ReactNode;+ confirmLabel: string;+ tone: "critical" | "primary";+ action: () => Promise<void>;+ loading: boolean;+ error?: string;+}++export const useLockerConfirmation = () => {+ const [confirmDialog, setConfirmDialog] =+ useState<ConfirmDialogState | null>(null);+ const confirmDialogRef = useRef<ConfirmDialogState | null>(null);++ useEffect(() => {+ if (confirmDialog) {+ confirmDialogRef.current = confirmDialog;+ }+ }, [confirmDialog]);++ const visibleConfirmDialog = confirmDialog ?? confirmDialogRef.current;++ const closeConfirmDialog = useCallback(() => {+ if (!confirmDialog?.loading) setConfirmDialog(null);+ }, [confirmDialog]);++ const handleConfirmDialogConfirm = useCallback(async () => {+ if (!confirmDialog || confirmDialog.loading) {+ return;+ }++ setConfirmDialog({ ...confirmDialog, loading: true, error: undefined });+ try {+ await confirmDialog.action();+ setConfirmDialog(null);+ } catch (error) {+ log.error("Failed to confirm Locker action", error);+ setConfirmDialog((current) =>+ current+ ? {+ ...current,+ error:+ error instanceof Error+ ? error.message+ : t("generic_error"),+ }+ : current,+ );+ } finally {+ setConfirmDialog((current) =>+ current ? { ...current, loading: false } : current,+ );+ }+ }, [confirmDialog]);++ return {+ confirmDialog,+ visibleConfirmDialog,+ requestConfirmation: setConfirmDialog,+ closeConfirmDialog,+ handleConfirmDialogConfirm,+ };+};diff --git a/web/apps/locker/src/components/locker/use-locker-uploads.ts b/web/apps/locker/src/components/locker/use-locker-uploads.tsnew file mode 100644index 0000000000..8e6bc8d9b2--- /dev/null+++ b/web/apps/locker/src/components/locker/use-locker-uploads.ts@@ -0,0 +1,287 @@+import {+ LOCKER_FILE_LIMIT_PAID,+ LOCKER_STORAGE_LIMIT_PAID_BYTES,+ lockerUploadAllowance,+ type LockerUploadLimitState,+ type LockerUploadPreflightFailure,+} from "@/services/locker-limits";+import { uploadLockerFile, type LockerUploadProgress } from "@/services/remote";+import type { LockerUploadCandidate } from "@/types";+import log from "ente-base/log";+import { t } from "i18next";+import type { DragEvent } from "react";+import { useCallback, useEffect, useRef, useState } from "react";+import { filterNonEmptyUploadItems } from "../create-item/file-upload-helpers";+import {+ collectUploadCandidatesFromDrop,+ type DragDataTransferItem,+} from "../create-item/scan-dropped-files";++const UPLOAD_REFRESH_DEBOUNCE_MS = 250;++const UPLOAD_REFRESH_FOLLOW_UP_DELAYS_MS = [1200, 3000, 6000] as const;++interface UseLockerUploadsProps {+ masterKey?: string;+ ensureUploadLimitState: () => Promise<+ { userDetails: LockerUploadLimitState } | undefined+ >;+ refreshData: (masterKey?: string) => Promise<void>;+ setToast: (message: string | null) => void;+}++export const useLockerUploads = ({+ masterKey,+ ensureUploadLimitState,+ refreshData,+ setToast,+}: UseLockerUploadsProps) => {+ const [createDialogOpen, setCreateDialogOpen] = useState(false);++ const [prefilledUploadItems, setPrefilledUploadItems] = useState<+ LockerUploadCandidate[]+ >([]);++ const [isDragActive, setIsDragActive] = useState(false);++ const dragDepthRef = useRef(0);++ const uploadRefreshTimeoutRef = useRef<number | null>(null);++ const uploadFollowUpRefreshTimeoutsRef = useRef<number[]>([]);++ const clearUploadRefreshTimeout = useCallback(() => {+ if (uploadRefreshTimeoutRef.current !== null) {+ window.clearTimeout(uploadRefreshTimeoutRef.current);+ uploadRefreshTimeoutRef.current = null;+ }+ }, []);++ const clearUploadFollowUpRefreshes = useCallback(() => {+ uploadFollowUpRefreshTimeoutsRef.current.forEach((timeoutID) => {+ window.clearTimeout(timeoutID);+ });+ uploadFollowUpRefreshTimeoutsRef.current = [];+ }, []);++ useEffect(+ () => () => {+ clearUploadRefreshTimeout();+ clearUploadFollowUpRefreshes();+ },+ [clearUploadFollowUpRefreshes, clearUploadRefreshTimeout],+ );++ const uploadPreflightFailureMessage = useCallback(+ (+ failure: LockerUploadPreflightFailure,+ projectedFileCount: number,+ projectedUsage: number,+ ) => {+ if (+ (projectedFileCount > LOCKER_FILE_LIMIT_PAID ||+ projectedUsage > LOCKER_STORAGE_LIMIT_PAID_BYTES) &&+ (failure.reason === "fileCountLimit" ||+ failure.reason === "storageLimit")+ ) {+ return t("uploadLockerHardCapErrorBody");+ }+ switch (failure.reason) {+ case "fileCountLimit":+ return t("uploadFileCountLimitErrorBody");+ case "fileTooLarge":+ return t("uploadFileTooLargeErrorBody", {+ fileName: failure.fileName ?? "",+ });+ case "storageLimit":+ return t("uploadStorageLimitErrorBody");+ }+ },+ [],+ );++ const scheduleUploadRefresh = useCallback(+ (delayMs: number) => {+ clearUploadRefreshTimeout();+ uploadRefreshTimeoutRef.current = window.setTimeout(() => {+ uploadRefreshTimeoutRef.current = null;+ void refreshData();+ }, delayMs);+ },+ [clearUploadRefreshTimeout, refreshData],+ );++ const scheduleUploadFollowUpRefreshes = useCallback(() => {+ clearUploadFollowUpRefreshes();+ uploadFollowUpRefreshTimeoutsRef.current =+ UPLOAD_REFRESH_FOLLOW_UP_DELAYS_MS.map((delayMs) =>+ window.setTimeout(() => {+ void refreshData();+ }, delayMs),+ );+ }, [clearUploadFollowUpRefreshes, refreshData]);++ const handleUploadFileWithProgress = useCallback(+ async (+ file: File,+ collectionIDs: number[],+ onProgress: (progress: LockerUploadProgress) => void,+ ) => {+ if (!masterKey) {+ throw new Error("No master key");+ }+ await uploadLockerFile(file, collectionIDs, masterKey, onProgress);+ },+ [masterKey],+ );++ const handleUploadsFinished = useCallback(+ async (uploadedCount: number) => {+ clearUploadRefreshTimeout();+ clearUploadFollowUpRefreshes();+ await refreshData();+ scheduleUploadFollowUpRefreshes();+ setToast(+ uploadedCount === 1+ ? t("uploadComplete")+ : t("uploadMultipleComplete", { count: uploadedCount }),+ );+ },+ [+ clearUploadFollowUpRefreshes,+ clearUploadRefreshTimeout,+ refreshData,+ scheduleUploadFollowUpRefreshes,+ setToast,+ ],+ );++ const handleUploadItemComplete = useCallback(() => {+ scheduleUploadRefresh(UPLOAD_REFRESH_DEBOUNCE_MS);+ }, [scheduleUploadRefresh]);++ const handleCreateDialogClose = useCallback(() => {+ setCreateDialogOpen(false);+ setPrefilledUploadItems([]);+ }, []);++ const openUploadDialogForItems = useCallback(+ (items: LockerUploadCandidate[]) => {+ const nonEmptyItems = filterNonEmptyUploadItems(items);+ if (nonEmptyItems.length === 0) {+ return;+ }+ setPrefilledUploadItems(nonEmptyItems);+ setCreateDialogOpen(true);+ },+ [],+ );++ const openCreateDialog = useCallback(() => {+ setPrefilledUploadItems([]);+ setCreateDialogOpen(true);+ }, []);++ const handleDragEnter = useCallback((event: DragEvent<HTMLElement>) => {+ if (!event.dataTransfer.types.includes("Files")) {+ return;+ }+ event.preventDefault();+ event.stopPropagation();+ dragDepthRef.current += 1;+ setIsDragActive(true);+ }, []);++ const handleDragOver = useCallback((event: DragEvent<HTMLElement>) => {+ if (!event.dataTransfer.types.includes("Files")) {+ return;+ }+ event.preventDefault();+ event.stopPropagation();+ event.dataTransfer.dropEffect = "copy";+ }, []);++ const handleDragLeave = useCallback((event: DragEvent<HTMLElement>) => {+ if (!event.dataTransfer.types.includes("Files")) {+ return;+ }+ event.preventDefault();+ event.stopPropagation();+ dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);+ if (dragDepthRef.current === 0) {+ setIsDragActive(false);+ }+ }, []);++ const handleDrop = useCallback(+ async (event: DragEvent<HTMLElement>) => {+ event.preventDefault();+ event.stopPropagation();+ dragDepthRef.current = 0;+ setIsDragActive(false);++ try {+ const uploadLimitState = await ensureUploadLimitState();+ if (!uploadLimitState) {+ setToast(t("generic_error_retry"));+ return;+ }++ const allowance = lockerUploadAllowance(+ uploadLimitState.userDetails,+ );+ const droppedItems = Array.from(+ event.dataTransfer.items,+ ) as DragDataTransferItem[];+ const scanResult = await collectUploadCandidatesFromDrop(+ droppedItems,+ Array.from(event.dataTransfer.files),+ {+ remainingFileCount: allowance.remainingFileCount,+ freeStorage: allowance.freeStorage,+ },+ );++ if (scanResult.preflightFailure) {+ setToast(+ uploadPreflightFailureMessage(+ scanResult.preflightFailure,+ lockerUploadAllowance(uploadLimitState.userDetails)+ .currentFileCount ++ scanResult.scannedNonEmptyFileCount,+ uploadLimitState.userDetails.usage ++ scanResult.scannedTotalSize,+ ),+ );+ return;+ }++ openUploadDialogForItems(scanResult.items);+ } catch (error) {+ log.error("Failed to process dropped Locker files", error);+ setToast(t("generic_error_retry"));+ }+ },+ [+ ensureUploadLimitState,+ openUploadDialogForItems,+ uploadPreflightFailureMessage,+ setToast,+ ],+ );++ return {+ createDialogOpen,+ prefilledUploadItems,+ isDragActive,+ handleCreateDialogClose,+ openCreateDialog,+ handleUploadFileWithProgress,+ handleUploadsFinished,+ handleUploadItemComplete,+ handleDragEnter,+ handleDragOver,+ handleDragLeave,+ handleDrop,+ };+};diff --git a/web/apps/locker/src/components/locker/use-trash-actions.ts b/web/apps/locker/src/components/locker/use-trash-actions.tsnew file mode 100644index 0000000000..4c856723b8--- /dev/null+++ b/web/apps/locker/src/components/locker/use-trash-actions.ts@@ -0,0 +1,118 @@+import {+ emptyTrash as emptyTrashAPI,+ permanentlyDeleteFromTrash,+ restoreFromTrash,+} from "@/services/remote";+import type { LockerItem } from "@/types";+import log from "ente-base/log";+import { t } from "i18next";+import { useCallback, useEffect, useRef, useState } from "react";+import type { EmptyTrashDialogState } from "./EmptyTrashDialog";+import type { ConfirmDialogState } from "./use-locker-confirmation";++interface UseTrashActionsProps {+ refreshData: (masterKey?: string) => Promise<void>;+ requestConfirmation: (dialog: ConfirmDialogState) => void;+ setToast: (message: string | null) => void;+ trashLastUpdatedAt: number;+}++export const useTrashActions = ({+ refreshData,+ requestConfirmation,+ setToast,+ trashLastUpdatedAt,+}: UseTrashActionsProps) => {+ const [emptyTrashDialog, setEmptyTrashDialog] =+ useState<EmptyTrashDialogState | null>(null);+ const emptyTrashDialogRef = useRef<EmptyTrashDialogState | null>(null);++ useEffect(() => {+ if (emptyTrashDialog) {+ emptyTrashDialogRef.current = emptyTrashDialog;+ }+ }, [emptyTrashDialog]);++ const visibleEmptyTrashDialog =+ emptyTrashDialog ?? emptyTrashDialogRef.current;++ const handlePermanentlyDelete = useCallback(+ (items: LockerItem[]) => {+ requestConfirmation({+ illustration: "/images/warning-red.png",+ title: t("permanentlyDelete"),+ body: t("permanentlyDeleteFilesBody", { count: items.length }),+ confirmLabel: t("permanentlyDelete"),+ tone: "critical",+ action: async () => {+ await permanentlyDeleteFromTrash(+ items.map((item) => item.id),+ );+ await refreshData();+ setToast(+ t("filesDeletedPermanently", { count: items.length }),+ );+ },+ loading: false,+ });+ },+ [refreshData, requestConfirmation, setToast],+ );++ const handleRestoreItem = useCallback(+ async (item: LockerItem, collectionID: number) => {+ await restoreFromTrash(+ [{ id: item.id, collectionID: item.collectionID }],+ collectionID,+ );+ await refreshData();+ setToast(t("filesRestoredSuccessfully", { count: 1 }));+ },+ [refreshData, setToast],+ );++ const handleEmptyTrash = useCallback(() => {+ setEmptyTrashDialog({ loading: false });+ }, []);++ const handleConfirmEmptyTrash = useCallback(async () => {+ if (!emptyTrashDialog || emptyTrashDialog.loading) {+ return;+ }++ setEmptyTrashDialog({ loading: true });+ try {+ await emptyTrashAPI(trashLastUpdatedAt);+ await refreshData();+ setToast(t("trashClearedSuccessfully"));+ setEmptyTrashDialog(null);+ } catch (error) {+ log.error("Failed to empty Locker trash", error);+ setEmptyTrashDialog((current) =>+ current+ ? {+ ...current,+ error:+ error instanceof Error+ ? error.message+ : t("generic_error"),+ }+ : current,+ );+ } finally {+ setEmptyTrashDialog((current) =>+ current ? { ...current, loading: false } : current,+ );+ }+ }, [emptyTrashDialog, refreshData, setToast, trashLastUpdatedAt]);++ return {+ emptyTrashDialog,+ visibleEmptyTrashDialog,+ setEmptyTrashDialog,+ handlePermanentlyDelete,+ handleRestoreItem,+ handleEmptyTrash,+ handleConfirmEmptyTrash,+ };+};