Skip to content

Fix async save flow handling in React app #85

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 async save flow handling in React app #85

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 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 @@ -68,15 +68,22 @@ 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) {
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
26 changes: 22 additions & 4 deletions Govt-Billing-React/src/components/NewFile/NewFile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from "react";
import * as AppGeneral from "../socialcalc/index.js";
import { File, Local } from "../Storage/LocalStorage";
import { DATA } from "../../app-data.js";
import { IonAlert, IonIcon } from "@ionic/react";
import { IonAlert, IonIcon, IonToast } from "@ionic/react";
import { add } from "ionicons/icons";

const NewFile: React.FC<{
Expand All @@ -12,12 +12,22 @@ const NewFile: React.FC<{
billType: number;
}> = (props) => {
const [showAlertNewFileCreated, setShowAlertNewFileCreated] = useState(false);
const newFile = () => {
const [showToast, setShowToast] = useState(false);
const [toastMessage, setToastMessage] = useState("");

const newFile = async () => {
if (props.file !== "default") {
const content = encodeURIComponent(AppGeneral.getSpreadsheetContent());
const data = props.store._getFile(props.file);
const data = await props.store._getFile(props.file);

if (!data) {
setToastMessage("Could not persist current file before reset.");
setShowToast(true);
return;
}

const file = new File(
(data as any).created,
data.created,
new Date().toString(),
content,
props.file,
Expand Down Expand Up @@ -52,6 +62,14 @@ const NewFile: React.FC<{
message={"New file created!"}
buttons={["Ok"]}
/>
<IonToast
animated
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
position="bottom"
message={toastMessage}
duration={1500}
/>
</React.Fragment>
);
};
Expand Down