Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

refactor(locker):clarify-unsaved-change-detection

Aswin Asoke229d0f9253a
diff --git a/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts b/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
index 9b6faf66cd..e3223a13e4 100644
--- a/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
+++ b/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
@@ -340,23 +340,32 @@ export const useCreateItemDialogState = ({
const pendingUploads = selectedUploadItems.some(
(item) => !completedFileKeys.has(uploadQueueItemKey(item)),
);
- const hasUnsavedChanges =
- isFileMode && !isEditMode
- ? pendingUploads
- : hasUnsavedItemChanges(
- formData,
- editFormData(editItem),
- selectedCollectionIDs,
- normalizeSelectedCollectionIDs(
- isEditMode
- ? editCollectionIDs
- : defaultCollectionID !== null &&
- defaultCollectionID !== undefined
- ? [defaultCollectionID]
- : [],
- ),
- collectionName,
- );
+ let initialCollectionIDs: number[] = [];
+ if (isEditMode) {
+ initialCollectionIDs = editCollectionIDs;
+ } else if (
+ defaultCollectionID !== null &&
+ defaultCollectionID !== undefined
+ ) {
+ initialCollectionIDs = [defaultCollectionID];
+ }
+
+ const initialFormData = editFormData(editItem);
+ const initialSelectedCollectionIDs =
+ normalizeSelectedCollectionIDs(initialCollectionIDs);
+
+ let hasUnsavedChanges: boolean;
+ if (isFileMode && !isEditMode) {
+ hasUnsavedChanges = pendingUploads;
+ } else {
+ hasUnsavedChanges = hasUnsavedItemChanges(
+ formData,
+ initialFormData,
+ selectedCollectionIDs,
+ initialSelectedCollectionIDs,
+ collectionName,
+ );
+ }
const requestExit = useCallback(
(action: "close" | "back") => {