moved async functions to helper file

ksraj123 · ksraj123 · commit 2c8035e36947 · 2020-10-14T14:12:40.000+05:30
diff --git a/src/user/Admin/Tickets/TicketDashboard.js b/src/user/Admin/Tickets/TicketDashboard.js
@@ -18,6 +18,7 @@ import { Drawer, List, ListItem } from "@material-ui/core";
 import donutIcon from "../../../assets/svgs/donut-icon.svg";
 import Navigation from "../../dashboard/navigation/navigation";
 import TicketDisscussion from "./TicketDiscussion/TicketDiscussions";
+import { createNewTicket, deleteTicket } from "../../../utils/ticket";
 import NotificationsNoneOutlinedIcon from "@material-ui/icons/NotificationsNoneOutlined";
 
 class TicketDashboard extends Component {
@@ -98,7 +99,7 @@ class TicketDashboard extends Component {
       ).data.notifications;
       this.setState({ notifications });
     } catch (err) {
-      console.log(err)
+      console.log(err);
     }
   };
 
@@ -107,25 +108,7 @@ class TicketDashboard extends Component {
       {
         spinner: "Creating new Ticket...",
       },
-      async () => {
-        try {
-          const ticket = (await axios.post(`${BASE_URL}/ticket`, newTicket, {
-            cancelToken: this.axiosCancel.token,
-          }))
-            .data.ticket;
-          ticket.comments = 0;
-          this.setState({
-            all: [ticket, ...this.state.all],
-            filtered: [ticket, ...this.state.all],
-            editorMode: false,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could create Ticket");
-          this.setState({ spinner: "" });
-        }
-      }
+      createNewTicket.bind(this, newTicket)
     );
   };
 
@@ -176,25 +159,9 @@ class TicketDashboard extends Component {
   };
 
   deleteTicket = (id) => {
-    const newTickets = this.state.all.filter((ele) => ele._id !== id);
     this.setState(
       { spinner: "Deleting Ticket,,,", viewingTicket: null },
-      async () => {
-        try {
-          await axios.delete(`${BASE_URL}/ticket/${id}`, {
-            cancelToken: this.axiosCancel.token,
-          });
-          this.setState({
-            all: [...newTickets],
-            filtered: [...newTickets],
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not delete Ticket");
-          this.setState({ spinner: "" });
-        }
-      }
+      deleteTicket.bind(this, id)
     );
   };
 
diff --git a/src/user/Admin/Tickets/TicketDiscussion/Layout/EditableCard.js b/src/user/Admin/Tickets/TicketDiscussion/Layout/EditableCard.js
@@ -5,6 +5,7 @@ import Button from "react-bootstrap/Button";
 import SaveButton from "@material-ui/icons/SaveOutlined";
 import EditButton from "@material-ui/icons/EditOutlined";
 import CancelButton from "@material-ui/icons/ClearOutlined";
+import { saveTicketSummary } from '../../../../../utils/ticket';
 
 class EditableCard extends Component {
   constructor(props) {
@@ -26,15 +27,7 @@ class EditableCard extends Component {
   };
 
   save = () => {
-    this.setState({ editor: false }, async () => {
-      await this.props.updateTicket({
-        type: "shortDescription",
-        shortDescription: this.state.data,
-      });
-      this.props.singleUpdate(this.props.ticketId, {
-        shortDescription: this.state.data,
-      });
-    });
+    this.setState({ editor: false }, saveTicketSummary.bind(this));
   };
 
   render() {
diff --git a/src/user/Admin/Tickets/TicketDiscussion/Layout/Title.js b/src/user/Admin/Tickets/TicketDiscussion/Layout/Title.js
@@ -6,6 +6,7 @@ import EditButton from "@material-ui/icons/EditOutlined";
 import SaveButton from "@material-ui/icons/SaveOutlined";
 import BadgeElement from "../../TicketContent/BadgeElement";
 import CancelButton from "@material-ui/icons/ClearOutlined";
+import { saveTicketTitle } from "../../../../../utils/ticket";
 import DeleteOutlineOutlinedIcon from "@material-ui/icons/DeleteOutlineOutlined";
 
 class Title extends Component {
@@ -30,15 +31,7 @@ class Title extends Component {
   };
 
   handleSave = () => {
-    this.setState({ editor: false }, async () => {
-      await this.props.updateTicket({
-        type: "title",
-        title: this.state.title,
-      });
-      this.props.singleUpdate(this.props.ticket._id, {
-        title: this.state.title,
-      });
-    });
+    this.setState({ editor: false }, saveTicketTitle.bind(this));
   };
 
   render() {
diff --git a/src/user/Admin/Tickets/TicketDiscussion/TicketDiscussions.js b/src/user/Admin/Tickets/TicketDiscussion/TicketDiscussions.js
@@ -6,7 +6,7 @@ import History from "./History/History";
 import Disscussion from "./Discussion/Discussion";
 import "react-mde/lib/styles/css/react-mde-all.css";
 import { ToastContainer, toast } from "react-toastify";
-import { BASE_URL } from "../../../../actions/baseApi";
+import { getTicket, createCommnet, updateTicket, upvoteComment, downvoteComment, deleteComment, addTag, deleteTag } from "../../../../utils/ticket";
 
 class TicketDiscussions extends Component {
   constructor(props) {
@@ -24,21 +24,7 @@ class TicketDiscussions extends Component {
       {
         spinner: "Loading Ticket...",
       },
-      async () => {
-        const ticket = (
-          await axios.get(`${BASE_URL}/ticket/${this.props.ticketId}`, {
-            cancelToken: this.axiosCancel.token,
-          })
-        ).data.ticket;
-        this.editsAllowed =
-          localStorage.getItem("ticketModerator") === "true" ||
-          localStorage.getItem("admin") === "true" ||
-          localStorage.getItem("userId") === ticket.createdBy.id;
-        this.deleteAllowed =
-          localStorage.getItem("ticketModerator") === "true" ||
-          localStorage.getItem("admin") === "true";
-        this.setState({ ticket: ticket, spinner: "" });
-      }
+      getTicket.bind(this)
     );
   };
 
@@ -59,52 +45,16 @@ class TicketDiscussions extends Component {
       {
         spinner: "Adding comment...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.post(
-                `${BASE_URL}/ticket/${this.state.ticket._id}/comment`,
-                {
-                  content,
-                },
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not add comment");
-          this.setState({ spinner: "" });
-        }
-      }
+      createCommnet.bind(this, content)
     );
   };
 
-  handleUpdateTicket = async (updates) => {
+  handleUpdateTicket = (updates) => {
     this.setState(
       {
         spinner: "Updating Ticket...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.put(
-                `${BASE_URL}/ticket/${this.state.ticket._id}`,
-                updates,
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not update Ticket");
-          this.setState({ spinner: "" });
-        }
-      }
+      updateTicket.bind(this, updates)
     );
   };
 
@@ -113,79 +63,29 @@ class TicketDiscussions extends Component {
       {
         spinner: "Adding vote to comment...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.put(
-                `${BASE_URL}/ticket/${this.state.ticket._id}/comment/${commentId}/upvote`,
-                {},
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not upvote comment");
-          this.setState({ spinner: "" });
-        }
-      }
+      upvoteComment.bind(this, commentId)
     );
   };
 
-  handleCommentDownvote = async (commentId) => {
+  handleCommentDownvote = (commentId) => {
     this.setState(
       {
         spinner: "Removing vote from comment...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.put(
-                `${BASE_URL}/ticket/${this.state.ticket._id}/comment/${commentId}/downvote`,
-                {},
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not downvote comment");
-          this.setState({ spinner: "" });
-        }
-      }
+      downvoteComment.bind(this, commentId)
     );
   };
 
-  handleCommentDelete = async (commentId) => {
+  handleCommentDelete = (commentId) => {
     this.setState(
       {
         spinner: "Removig comment...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.delete(
-                `${BASE_URL}/ticket/${this.state.ticket._id}/comment/${commentId}`,
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not remove comment");
-          this.setState({ spinner: "" });
-        }
-      }
+      deleteComment.bind(this, commentId)
     );
   };
 
-  handleAddTag = async (tagName) => {
+  handleAddTag = (tagName) => {
     if (this.state.ticket.tags.indexOf(tagName) !== -1) {
       toast.error("Tag already present");
     } else if (tagName.length > 10) {
@@ -197,52 +97,17 @@ class TicketDiscussions extends Component {
         {
           spinner: "Adding Tag...",
         },
-        async () => {
-          try {
-            this.setState({
-              ticket: (
-                await axios.post(
-                  `${BASE_URL}/ticket/${this.state.ticket._id}/tag/${tagName}`,
-                  {},
-                  { cancelToken: this.axiosCancel.token }
-                )
-              ).data.ticket,
-              spinner: "",
-            });
-            this.props.addTag(this.state.ticket._id, tagName);
-          } catch (err) {
-            console.log(err);
-            toast.error("Something went wrong! could not add tag");
-            this.setState({ spinner: "" });
-          }
-        }
+        addTag.bind(this, tagName)
       );
     }
   };
 
-  handleDeleteTag = async (tagName) => {
+  handleDeleteTag = (tagName) => {
     this.setState(
       {
         spinner: "Removing Tag...",
       },
-      async () => {
-        try {
-          this.setState({
-            ticket: (
-              await axios.delete(
-                `${BASE_URL}/ticket/${this.state.ticket._id}/tag/${tagName}`,
-                { cancelToken: this.axiosCancel.token }
-              )
-            ).data.ticket,
-            spinner: "",
-          });
-          this.props.addTag(this.state.ticket._id, tagName);
-        } catch (err) {
-          console.log(err);
-          toast.error("Something went wrong! could not remove tag");
-          this.setState({ spinner: "" });
-        }
-      }
+      deleteTag.bind(this, tagName)
     );
   };
 
diff --git a/src/utils/ticket.js b/src/utils/ticket.js
