post from admin setup. assignment/work all that left

cdalton713 · Nov 29, 2020 · e4086a8 · e4086a8
1 parent f356db6
commit e4086a8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 35 deletions.
diff --git a/client/src/components/form/ManageTicketForm/adminView.js b/client/src/components/form/ManageTicketForm/adminView.js
@@ -11,20 +11,14 @@ import {
   EuiTitle,
 } from "@elastic/eui";
 import React, { useState } from "react";
-import { MyTextField } from "../MyTextField";
 import { MySelectField } from "../MySelectField";
-import { addToast } from "../../toast";
-import { DEBUG } from "../../app/app";
 import { errorMessages } from "./fields";
 import {
   handleDateChange,
   handleFormFieldBlur,
   handleFormFieldChange,
 } from "./handlers";
 import { selectOptions } from "../selectOptions";
-import { MyDatePicker } from "../MyDatePicker";
-import { TicketAssignmentTable } from "../../table/AssignedToTable";
-import { AddTechnicianPopover } from "../../popover/TechnicianPopover";
 import { TimeLogTable } from "../../table/TimeLogTable";
 
 var _ = require("lodash");
@@ -44,7 +38,7 @@ export const AdminView = (
           <MySelectField
             data={data}
             name={"core_issue"}
-            selectOptions={selectOptions}
+            selectOptions={selectOptions.find((o) => o.name === "core_issue")}
             handleBlur={(e) => handleFormFieldBlur(e, data, dispatch)}
             handleChange={(e) => handleFormFieldChange(e, data, dispatch)}
           />
@@ -53,7 +47,7 @@ export const AdminView = (
           <MySelectField
             data={data}
             name={"component"}
-            selectOptions={selectOptions}
+            selectOptions={selectOptions.find((o) => o.name === "component")}
             handleBlur={(e) => handleFormFieldBlur(e, data, dispatch)}
             handleChange={(e) => handleFormFieldChange(e, data, dispatch)}
           />
@@ -67,20 +61,21 @@ export const AdminView = (
       <EuiFlexGroup style={{ maxWidth: 1000 }}>
         <EuiFlexItem style={{ maxWidth: 1000 }}>
           <EuiFormRow
-            label={_.find(data, ["name", "description"]).label}
+            label={_.find(data, ["name", "notes"]).label}
             error={[
               _.find(errorMessages, [
                 "error_type",
-                _.find(data, ["name", "description"]).error_type,
+                _.find(data, ["name", "notes"]).error_type,
               ]).error_message,
             ]}
-            isInvalid={_.find(data, ["name", "description"]).error}
+            isInvalid={_.find(data, ["name", "notes"]).error}
           >
             <EuiTextArea
               placeholder={"Ticket notes..."}
               name={_.find(data, ["name", "notes"]).name}
               onChange={(e) => handleFormFieldChange(e, data, dispatch)}
               onBlur={(e) => handleFormFieldBlur(e, data, dispatch)}
+              value={_.find(data, ["name", "description"]).value}
             />
           </EuiFormRow>
         </EuiFlexItem>
@@ -149,7 +144,7 @@ export const AdminView = (
             <MySelectField
               handleChange={(e) => handleFormFieldChange(e, data, dispatch)}
               handleBlur={(e) => handleFormFieldBlur(e, data, dispatch)}
-              selectOptions={selectOptions}
+              selectOptions={selectOptions.find((o) => o.name === "status")}
               data={data}
               name={"status"}
             />

diff --git a/client/src/components/form/ManageTicketForm/userView.js b/client/src/components/form/ManageTicketForm/userView.js
@@ -159,6 +159,7 @@ export const UserView = ({ data, dispatch }, ...props) => {
               name={_.find(data, ["name", "description"]).name}
               onChange={(e) => handleFormFieldChange(e, data, dispatch)}
               onBlur={(e) => handleFormFieldBlur(e, data, dispatch)}
+              value={_.find(data, ["name", "description"]).value}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/client/src/components/table/TicketsTable.js b/client/src/components/table/TicketsTable.js
@@ -5,18 +5,6 @@ import { AdminTicketFlyout } from "../flyout/flyout";
 import { dataFetchReducer } from "../../api/reducers";
 import { ErrorCallout } from "../callout/Callout";
 
-const userTest = [
-  {
-    id: "1",
-    firstName: "john",
-    lastName: "doe",
-    github: "johndoe",
-    dateOfBirth: Date.now(),
-    nationality: "NL",
-    online: true,
-  },
-];
-
 export const TicketsTable = (
   { handleTicketSelection, tickets, isLoading },
   ...props
@@ -54,6 +42,15 @@ export const TicketsTable = (
     {
       field: "problem_category",
       name: "Problem Category",
+      render: (problem_category) => {
+        String.prototype.toProperCase = function () {
+          return this.replace(/\w\S*/g, function (txt) {
+            return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+          });
+        };
+
+        return problem_category.replace("_", " ").toProperCase();
+      },
     },
     {
       field: "status",

diff --git a/client/src/routes/admin/ManageTicket.js b/client/src/routes/admin/ManageTicket.js
@@ -77,8 +77,8 @@ const TicketForm = ({ setSelectedTicket, selectedTicket }, ...props) => {
       };
 
       try {
+        dispatch({ type: "CLEAR_FORM" });
         const result = await axios.get("/ticket/" + selectedTicket.ticket_id);
-        const userResult = await axios.get("/user/" + selectedTicket.lsu_id);
         let final = [];
         for (const [key, value] of Object.entries(result.data)) {
           console.log(`${key}: ${value}`);
@@ -91,16 +91,6 @@ const TicketForm = ({ setSelectedTicket, selectedTicket }, ...props) => {
           });
         }
 
-        for (const [key, value] of Object.entries(userResult.data)) {
-          console.log(`${key}: ${value}`);
-          final.push({
-            name: key,
-            value: value,
-            error: false,
-            error_type: "none",
-            label: key.replace("_", " ").toProperCase(),
-          });
-        }
         const union = _.unionBy(final, fields, "name");
         dispatch({
           type: "FETCH_TICKET_SUCCESS",