Skip to content

Fix incorrect Save As reopen after toast dismiss #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nehayadav827 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect Save As reopen after toast dismiss #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions Govt-Billing-React/src/components/Menu/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const Menu: React.FC<{
const [showAlert4, setShowAlert4] = useState(false);
const [showToast1, setShowToast1] = useState(false);
const [toastMessage, setToastMessage] = useState("");
const [toastFromSaveAs, setToastFromSaveAs] = useState(false);
/* Utility functions */
const _validateName = async (filename) => {
filename = filename.trim();
Expand Down Expand Up @@ -68,15 +69,23 @@ const Menu: React.FC<{
printWindow.print();
}
};
const doSave = () => {
const doSave = async () => {
if (props.file === "default") {
setShowAlert1(true);
return;
}
const content = encodeURIComponent(AppGeneral.getSpreadsheetContent());
const data = props.store._getFile(props.file);
const data = await props.store._getFile(props.file);

if (!data) {
setToastFromSaveAs(false);
setToastMessage("Save failed: file data could not be retrieved.");
setShowToast1(true);
return;
}

const file = new File(
(data as any).created,
data.created,
new Date().toString(),
content,
props.file,
Expand Down Expand Up @@ -108,6 +117,7 @@ const Menu: React.FC<{
props.updateSelectedFile(filename);
setShowAlert4(true);
} else {
setToastFromSaveAs(true);
setShowToast1(true);
}
}
Expand Down Expand Up @@ -230,7 +240,9 @@ const Menu: React.FC<{
isOpen={showToast1}
onDidDismiss={() => {
setShowToast1(false);
setShowAlert3(true);
if (toastFromSaveAs) {
setShowAlert3(true);
}
}}
position="bottom"
message={toastMessage}
Expand Down