Skip to content
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

Jump to bottom

[enhancement]: minimise promise chaining #261

Closed
wants to merge 2 commits into from
Closed

[enhancement]: minimise promise chaining #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ebfb8a
[enhancement]: minimise promise chaining
pulkit-30 Sep 6, 2022
b4a6546
[enhancement]: minimise promise chaining
pulkit-30 Sep 8, 2022
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
17 changes: 9 additions & 8 deletions src/components/Footer/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ const Footer = () => {
const [version, setVersion] = useState(
getSessionStorage("fossologyVersion") || null
);
const fetchVersion = () => {
return getFossologyVersion()
.then((res) => {
setSessionStorage("fossologyVersion", res);
setVersion(res);
return res;
})
.catch(() => null);
const fetchVersion = async () => {
try {
const res = await getFossologyVersion();
setSessionStorage("fossologyVersion", res);
setVersion(res);
return res;
} catch (error) {
return null;
}
};
useEffect(() => {
if (!version) {
Expand Down
14 changes: 9 additions & 5 deletions src/components/Upload/CommonFields/UploadReuse/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,15 @@ const UploadReuse = ({ reuse, handleChange }) => {
}, []);

useEffect(() => {
getAllFolders(reuse.reuseGroup)
.then((res) => {
setReuseData((prevData) => ({ ...prevData, folderList: res }));
})
.catch(() => {});
const folderData = async () => {
try {
const res = await getAllFolders(reuse.reuseGroup);
return setReuseData((prevData) => ({ ...prevData, folderList: res }));
} catch (error) {
return {};
}
};
return folderData;
}, [reuse.reuseGroup]);

useEffect(() => {
Expand Down
32 changes: 15 additions & 17 deletions src/pages/Admin/Group/Create/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,24 @@ const GroupCreate = () => {
setGroupName(e.target.value);
};

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
setLoading(true);
createGroup(groupName)
.then(() => {
setMessage({
type: "success",
text: messages.groupCreate,
});
})
.catch((error) => {
setMessage({
type: "danger",
text: error.message,
});
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await createGroup(groupName);
setMessage({
type: "success",
text: messages.groupCreate,
});
} catch (error) {
setMessage({
type: "danger",
text: error.message,
});
} finally {
setLoading(false);
setShowMessage(true);
}
};
return (
<>
Expand Down
39 changes: 17 additions & 22 deletions src/pages/Admin/Users/Delete/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,32 +87,27 @@ const DeleteUser = () => {
});
};

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
if (confirm) {
setLoading(true);
deleteUser(id)
.then(() => {
setMessage({
type: "success",
text: messages.deletedUser,
});
})
.then(() => {
getAllUsersName().then((res) => {
setDefaultsForDropdown(res);
});
})
.catch((error) => {
if (id === 0) {
const err = new Error("Default users cannot be deleted");
handleError(err, setMessage);
} else handleError(error, setMessage);
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await deleteUser(id);
setMessage({
type: "success",
text: messages.deletedUser,
});
const res = await getAllUsersName();
setDefaultsForDropdown(res);
} catch (error) {
if (id === 0) {
const err = new Error("Default users cannot be deleted");
handleError(err, setMessage);
} else handleError(error, setMessage);
} finally {
setLoading(false);
setShowMessage(true);
}
} else {
setMessage({
type: "danger",
Expand Down
21 changes: 11 additions & 10 deletions src/pages/Home/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,19 @@ const Home = ({ location }) => {
setValues({ ...values, [name]: event.target.value });
};

const handleSubmit = (event) => {
const handleSubmit = async (event) => {
event.preventDefault();
setLoading(true);
fetchToken(values)
.then(() => getUserSelf())
.then(() => fetchAllGroups())
.then(() => history.push(routes.browse))
.catch((err) => {
setLoading(false);
setErrorMessage(err.message);
setShowError(true);
});
try {
await fetchToken(values);
await getUserSelf();
await fetchAllGroups();
history.push(routes.browse);
} catch (err) {
setLoading(false);
setErrorMessage(err.message);
setShowError(true);
}
};

useEffect(() => {
Expand Down
44 changes: 21 additions & 23 deletions src/pages/Jobs/ScheduleAgents/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,32 +98,30 @@ const ScheduleAgents = () => {
const [showMessage, setShowMessage] = useState(false);
const [message, setMessage] = useState();

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
setLoading(true);
scheduleAnalysis(
scheduleAnalysisData.folderId,
scheduleAnalysisData.uploadId,
scanFileData
)
.then(() => {
setMessage({
type: "success",
text: messages.jobsAdded,
});
setScheduleAnalysisData(initialScheduleAnalysisData);
setScanFileData(initialScanFileData);
})
.catch((error) => {
setMessage({
type: "danger",
text: error.message,
});
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await scheduleAnalysis(
scheduleAnalysisData.folderId,
scheduleAnalysisData.uploadId,
scanFileData
);
setMessage({
type: "success",
text: messages.jobsAdded,
});
setScheduleAnalysisData(initialScheduleAnalysisData);
setScanFileData(initialScanFileData);
} catch (error) {
setMessage({
type: "danger",
text: error.message,
});
} finally {
setLoading(false);
setShowMessage(true);
}
};
const handleChange = (e) => {
setScheduleAnalysisData({
Expand Down
26 changes: 12 additions & 14 deletions src/pages/Organize/Folder/Create/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,21 @@ const CreateFolder = () => {
});
};

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
setLoading(true);
createFolder(createFolderData)
.then(() => {
setMessage({
type: "success",
text: messages.createdFolder,
});
})
.catch((error) => {
handleError(error, setMessage);
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await createFolder(createFolderData);
setMessage({
type: "success",
text: messages.createdFolder,
});
} catch (error) {
handleError(error, setMessage);
} finally {
setLoading(false);
setShowMessage(true);
}
};

useEffect(() => {
Expand Down
34 changes: 15 additions & 19 deletions src/pages/Organize/Folder/Delete/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,28 +68,24 @@ const DeleteFolder = () => {
[e.target.name]: e.target.value,
});

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
setLoading(true);
deleteFolder(deleteFolderData)
.then(() => {
setMessage({
type: "success",
text: messages.deletedFolder,
});
})
.then(() => {
getAllFolders().then((res) => {
setFolderList(res);
});
})
.catch((error) => {
handleError(error, setMessage);
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await deleteFolder(deleteFolderData);
setMessage({
type: "success",
text: messages.deletedFolder,
});
getAllFolders().then((res) => {
setFolderList(res);
});
} catch (error) {
handleError(error, setMessage);
} finally {
setLoading(false);
setShowMessage(true);
}
};

useEffect(() => {
Expand Down
26 changes: 12 additions & 14 deletions src/pages/Organize/Folder/Edit/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,21 @@ const EditFolder = () => {
});
};

const handleSubmit = (e) => {
const handleSubmit = async (e) => {
e.preventDefault();
setLoading(true);
editFolder(editFolderData)
.then(() => {
setMessage({
type: "success",
text: messages.updatedFolderProps,
});
})
.catch((error) => {
handleError(error, setMessage);
})
.finally(() => {
setLoading(false);
setShowMessage(true);
try {
await editFolder(editFolderData);
setMessage({
type: "success",
text: messages.updatedFolderProps,
});
} catch (error) {
handleError(error, setMessage);
} finally {
setLoading(false);
setShowMessage(true);
}
};

useEffect(() => {
Expand Down
48 changes: 22 additions & 26 deletions src/pages/Organize/Folder/Move/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,38 +67,34 @@ const MoveFolder = () => {
[e.target.name]: e.target.value,
});

const handleMove = (e) => {
const handleMove = async (e) => {
e.preventDefault();
moveFolder(moveFolderData)
.then(() => {
setMessage({
type: "success",
text: messages.movedFolder,
});
})
.catch((error) => {
handleError(error, setMessage);
})
.finally(() => {
setShowMessage(true);
try {
await moveFolder(moveFolderData);
setMessage({
type: "success",
text: messages.movedFolder,
});
} catch (error) {
handleError(error, setMessage);
} finally {
setShowMessage(true);
}
};

const handleCopy = (e) => {
const handleCopy = async (e) => {
e.preventDefault();
copyFolder(moveFolderData)
.then(() => {
setMessage({
type: "success",
text: messages.copiedFolder,
});
})
.catch((error) => {
handleError(error, setMessage);
})
.finally(() => {
setShowMessage(true);
try {
await copyFolder(moveFolderData);
setMessage({
type: "success",
text: messages.copiedFolder,
});
} catch (error) {
handleError(error, setMessage);
} finally {
setShowMessage(true);
}
};

useEffect(() => {
Expand Down
Loading