more validation and fixed db

This commit is contained in:
subnub
2024-10-11 14:23:00 -04:00
parent ee10d308c0
commit 1a41e31f53
16 changed files with 519 additions and 585 deletions
+14 -15
View File
@@ -112,8 +112,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Renamed",
error: "Error Renaming",
});
invalidateFilesCache();
invalidateQuickFilesCache();
reloadItems();
} catch (e) {
console.log("Error renaming file", e);
}
@@ -126,7 +125,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Renamed",
error: "Error Renaming",
});
invalidateFoldersCache();
reloadItems();
} catch (e) {
console.log("Error renaming folder", e);
}
@@ -145,9 +144,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Trashed",
error: "Error Trashing",
});
invalidateFilesCache();
invalidateQuickFilesCache();
dispatch(resetSelected());
reloadItems();
} catch (e) {
console.log("Error trashing file", e);
}
@@ -161,8 +158,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Trashed",
error: "Error Trashing",
});
invalidateFoldersCache();
dispatch(resetSelected());
reloadItems();
} catch (e) {
console.log("Error trashing folder", e);
}
@@ -181,9 +177,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Deleted",
error: "Error Deleting",
});
invalidateFilesCache();
invalidateQuickFilesCache();
dispatch(resetSelected());
reloadItems();
} catch (e) {
console.log("Error deleting file", e);
}
@@ -197,8 +191,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Deleted",
error: "Error Deleting",
});
invalidateFoldersCache();
dispatch(resetSelected());
reloadItems();
} catch (e) {
console.log("Error deleting folder", e);
}
@@ -216,7 +209,7 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Restored",
error: "Error Restoring",
});
invalidateFilesCache();
reloadItems();
} catch (e) {
console.log("Error restoring file", e);
}
@@ -227,13 +220,19 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
success: "Restored",
error: "Error Restoring",
});
invalidateFoldersCache();
reloadItems();
} catch (e) {
console.log("Error restoring folder", e);
}
}
};
const reloadItems = () => {
invalidateFilesCache();
invalidateQuickFilesCache();
dispatch(resetSelected());
};
const openMoveItemModal = async () => {
closeContext();
if (!folderMode && file) {
+5 -2
View File
@@ -14,7 +14,7 @@ import {
makePublicAPI,
removeLinkAPI,
} from "../../api/filesAPI";
import { useFilesClient } from "../../hooks/files";
import { useFilesClient, useQuickFilesClient } from "../../hooks/files";
import {
resetShareModal,
setMainSelect,
@@ -28,6 +28,7 @@ const SharePopup = memo(() => {
const [shareLink, setShareLink] = useState("");
const dispatch = useAppDispatch();
const { invalidateFilesCache } = useFilesClient();
const { invalidateQuickFilesCache } = useQuickFilesClient();
const imageColor = useMemo(
() => getFileColor(file.filename),
@@ -70,6 +71,7 @@ const SharePopup = memo(() => {
);
dispatch(setShareModal(updatedFile));
invalidateFilesCache();
invalidateQuickFilesCache();
} catch (e) {
console.log("Error making file public", e);
} finally {
@@ -100,6 +102,7 @@ const SharePopup = memo(() => {
);
dispatch(setShareModal(updatedFile));
invalidateFilesCache();
invalidateQuickFilesCache();
} catch (e) {
console.log("Error making file public", e);
} finally {
@@ -127,6 +130,7 @@ const SharePopup = memo(() => {
);
dispatch(setShareModal(updatedFile));
invalidateFilesCache();
invalidateQuickFilesCache();
setShareLink("");
} catch (e) {
console.log("Error removing link", e);
@@ -152,7 +156,6 @@ const SharePopup = memo(() => {
useEffect(() => {
if (!file.metadata.link) return;
const url = `${window.location.origin}/public-download/${file._id}/${file.metadata.link}`;
console.log("url", url);
setShareLink(url);
}, [file.metadata.link]);