Thanks to visit codestin.com
Credit goes to github.com

Skip to content

toastr fix #385

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

Merged
ajinkyaa merged 1 commit into from
May 18, 2022
Merged

toastr fix #385

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
4 changes: 1 addition & 3 deletions app/controllers/internal_api/v1/project_members_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ def update
update_existing_members
remove_members
end
render json: {
notice: I18n.t("projects.update_members.success.message")
}, status: :ok
render json: {}, status: :ok
end

private
Expand Down
4 changes: 3 additions & 1 deletion app/javascript/src/apis/axios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export const setAuthHeaders = () => {
const handleSuccessResponse = response => {
if (response) {
response.success = response.status === 200;
if (response?.data?.notice) Toastr.success(response.data.notice);
if (response?.data?.notice) {
Toastr.success(response.data.notice);
}
}
return response;
};
Expand Down
4 changes: 3 additions & 1 deletion app/javascript/src/components/Projects/Details/EditMembersList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from "react";

import companyUsersApi from "apis/company-users";
import projectMembersApi from "apis/project-members";
import Toastr from "common/Toastr";
import { X } from "phosphor-react";

import EditMembersListForm from "./EditMembersListForm";
Expand Down Expand Up @@ -69,6 +70,7 @@ const EditMembersList = ({ setShowAddMemberDialog, addedMembers, projectId, hand
setExistingMembers(members);
handleAddProjectDetails();
closeAddRemoveMembers();
Toastr.success("Changes saved successfully");
}
catch (err) {
// add error handling
Expand Down Expand Up @@ -96,7 +98,7 @@ const EditMembersList = ({ setShowAddMemberDialog, addedMembers, projectId, hand
allMemberList={allMemberList}
updateMemberState={updateMemberState}
setMembers={setMembers}
handleSubmit={handleSubmit}/>
handleSubmit={handleSubmit} />
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/javascript/src/components/Projects/Details/EditMembersListForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const EditMembersListForm = ({ members, allMemberList, updateMemberState, setMem
<button
name="add"
className="text-miru-han-purple-1000 "
type="button"
onClick={addNewMemberRowHandler}
>
+ Add another team member
Expand Down
8 changes: 5 additions & 3 deletions app/javascript/src/components/Projects/Details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from "react";
import { useParams, useNavigate } from "react-router-dom";
import { ToastContainer } from "react-toastify";
import { setAuthHeaders, registerIntercepts } from "apis/axios";
import projectAPI from "apis/projects";
import AmountBoxContainer from "common/AmountBox";
Expand Down Expand Up @@ -67,7 +68,7 @@ const ProjectDetails = () => {
.show(params.projectId);
setProject(unmapper(res.data.project_details));
} catch (e) {
console.log(e); // eslint-disable-line
console.log(e); // eslint-disable-line
}
};

Expand Down Expand Up @@ -145,6 +146,7 @@ const ProjectDetails = () => {

return (
<>
<ToastContainer />
<div className="my-6">
<div className="flex min-w-0 items-center justify-between">
<div className="flex items-center">
Expand Down Expand Up @@ -179,8 +181,8 @@ const ProjectDetails = () => {
onClick={() =>
document.location.assign(
window.location.origin +
"/invoices/generate?" +
project.client.name
"/invoices/generate?" +
project.client.name
)
}
className="menuButton__list-item"
Expand Down