code smells, small refactor, adding toasts

bcgov · Oct 17, 2023 · 177cc65 · 177cc65
1 parent f9cecd8
commit 177cc65
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 49 deletions.
diff --git a/frontend/src/app/components/containers/complaints/details/complaint-details-create.tsx b/frontend/src/app/components/containers/complaints/details/complaint-details-create.tsx
@@ -41,6 +41,8 @@ import {
 } from "../../../../store/reducers/complaints";
 import { from } from "linq-to-typescript";
 import { Complaint } from "../../../../types/complaints/complaint";
+import { ToggleError } from "../../../../common/toast";
+import { ToastContainer } from "react-toastify";
 
 export const CreateComplaint: FC = () => {
   const dispatch = useAppDispatch();
@@ -65,9 +67,9 @@ export const CreateComplaint: FC = () => {
         display_order: "",
         active_ind: "",
         create_user_id: "",
-        create_utc_timestamp: "",
+        create_utc_timestamp: null,
         update_user_id: "",
-        update_utc_timestamp: "",
+        update_utc_timestamp: null
       },
       location_geometry_point: {
         type: "",
@@ -106,9 +108,9 @@ export const CreateComplaint: FC = () => {
         display_order: 0,
         active_ind: false,
         create_user_id: "",
-        create_utc_timestamp: "",
+        create_utc_timestamp: null,
         update_user_id: "",
-        update_utc_timestamp: "",
+        update_utc_timestamp: null,
       },
       cos_geo_org_unit: {
         zone_code: "",
@@ -306,9 +308,9 @@ export const CreateComplaint: FC = () => {
         const { violation_code: source } = update;
         const updatedEntity = {
           ...source,
-          short_description: value as string,
+          short_description: value,
           long_description: label as string,
-          violation_code: value as string,
+          violation_code: value,
         };
 
         update.violation_code = updatedEntity;
@@ -536,9 +538,9 @@ export const CreateComplaint: FC = () => {
             display_order: "",
             active_ind: "",
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
           hwcrComplaint.complaint_identifier.cos_geo_org_unit.area_code =
             selectedOption.value;
@@ -558,9 +560,9 @@ export const CreateComplaint: FC = () => {
             display_order: "",
             active_ind: "",
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
           allegationComplaint.complaint_identifier.cos_geo_org_unit.area_code =
             selectedOption.value;
@@ -787,9 +789,9 @@ export const CreateComplaint: FC = () => {
             display_order: 0,
             active_ind: true,
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
 
       const updatedParent = {
@@ -999,13 +1001,16 @@ export const CreateComplaint: FC = () => {
           navigate("/complaint/" + complaintType + "/" + complaintId);
         }
       }
+      setErrorNotificationClass("comp-complaint-error display-none");
     } else {
+      ToggleError("Errors in form");
       setErrorNotificationClass("comp-complaint-error");
     }
   };
 
   return (
     <div className="comp-complaint-details">
+      <ToastContainer />
       <CreateComplaintHeader
         complaintType={COMPLAINT_TYPES.HWCR}
         cancelButtonClick={cancelButtonClick}
@@ -1105,7 +1110,6 @@ export const CreateComplaint: FC = () => {
           <div className="comp-details-edit-column comp-details-right-column">
             <div className="comp-details-label-input-pair"></div>
             {complaintType === COMPLAINT_TYPES.HWCR && (
-              <>
                 <div
                   className="comp-details-label-input-pair"
                   id="species-pair-id"
@@ -1123,7 +1127,6 @@ export const CreateComplaint: FC = () => {
                     errMsg={speciesErrorMsg}
                   />
                 </div>
-              </>
             )}
             <div
                   className="comp-details-label-input-pair"

diff --git a/frontend/src/app/components/containers/complaints/details/complaint-details-edit.tsx b/frontend/src/app/components/containers/complaints/details/complaint-details-edit.tsx
@@ -175,7 +175,6 @@ export const ComplaintDetailsEdit: FC<ComplaintDetailsProps> = ({
   const complaintStatusCodes = useSelector(
     selectComplaintStatusCodeDropdown,
   ) as Option[];
-  console.log(JSON.stringify(complaintStatusCodes));
   const speciesCodes = useSelector(selectSpeciesCodeDropdown) as Option[];
   const hwcrNatureOfComplaintCodes = useSelector(
     selectHwcrNatureOfComplaintCodeDropdown,
@@ -341,19 +340,21 @@ export const ComplaintDetailsEdit: FC<ComplaintDetailsProps> = ({
   const handleViolationTypeChange = (selected: Option | null) => {
     if (selected) {
       const { label, value } = selected;
+      if(value)
+      {
+        let update = { ...updateComplaint } as AllegationComplaint;
 
-      let update = { ...updateComplaint } as AllegationComplaint;
-
-      const { violation_code: source } = update;
-      const updatedEntity = {
-        ...source,
-        short_description: value as string,
-        long_description: label as string,
-        violation_code: value as string,
-      };
+        const { violation_code: source } = update;
+        const updatedEntity = {
+          ...source,
+          short_description: value,
+          long_description: label as string,
+          violation_code: value,
+        };
 
-      update.violation_code = updatedEntity;
-      setUpdateComplaint(update);
+        update.violation_code = updatedEntity;
+        setUpdateComplaint(update);
+      }
     }
   };
 
@@ -608,9 +609,9 @@ export const ComplaintDetailsEdit: FC<ComplaintDetailsProps> = ({
             display_order: "",
             active_ind: "",
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
           hwcrComplaint.complaint_identifier.cos_geo_org_unit.area_code =
             selectedOption.value;
@@ -630,9 +631,9 @@ export const ComplaintDetailsEdit: FC<ComplaintDetailsProps> = ({
             display_order: "",
             active_ind: "",
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
           allegationComplaint.complaint_identifier.cos_geo_org_unit.area_code =
             selectedOption.value;
@@ -859,9 +860,9 @@ export const ComplaintDetailsEdit: FC<ComplaintDetailsProps> = ({
             display_order: 0,
             active_ind: true,
             create_user_id: "",
-            create_utc_timestamp: "",
+            create_utc_timestamp: null,
             update_user_id: "",
-            update_utc_timestamp: "",
+            update_utc_timestamp: null,
           };
 
       const updatedParent = {

diff --git a/frontend/src/app/store/reducers/complaints.ts b/frontend/src/app/store/reducers/complaints.ts
@@ -430,10 +430,10 @@ export const createAllegationComplaint =
         newComplaintId =
         newAllegationComplaint.complaint_identifier.complaint_identifier;
       });
-      console.log();
+      ToggleSuccess("Complaint has been saved");
       return newComplaintId;
     } catch (error) {
-      console.log(error);
+      ToggleError("Unable to create complaint");
       //-- add error handling
     } finally {
       dispatch(toggleLoading(false));
@@ -473,7 +473,6 @@ export const updateAllegationComplaint =
       ToggleSuccess("Updates have been saved");
     } catch (error) {
       ToggleError("Unable to update complaint");
-      console.log(error);
     } finally {
       dispatch(toggleLoading(false));
     }
@@ -520,10 +519,10 @@ export const createWildlifeComplaint =
         newComplaintId =
           newHwcrComplaint.complaint_identifier.complaint_identifier;
       });
-      console.log();
+      ToggleSuccess("Complaint has been saved");
       return newComplaintId;
     } catch (error) {
-      console.log(error);
+      ToggleError("Unable to create complaint");
       //-- add error handling
     } finally {
       dispatch(toggleLoading(false));

diff --git a/frontend/src/app/types/code-tables/agency-code.ts b/frontend/src/app/types/code-tables/agency-code.ts
@@ -5,7 +5,7 @@ export interface AgencyCode {
   display_order: number;
   active_ind: boolean;
   create_user_id: string;
-  create_utc_timestamp: string;
+  create_utc_timestamp: Date | null;
   update_user_id: string;
-  update_utc_timestamp: string;
+  update_utc_timestamp: Date | null;
 }
diff --git a/frontend/src/app/types/code-tables/attractant-code.ts b/frontend/src/app/types/code-tables/attractant-code.ts
@@ -5,7 +5,7 @@ export interface AttractantCode {
   display_order: string;
   active_ind: string;
   create_user_id: string;
-  create_utc_timestamp: string;
+  create_utc_timestamp: Date | null;
   update_user_id: string;
-  update_utc_timestamp: string;
+  update_utc_timestamp: Date | null;
 }
diff --git a/frontend/src/app/types/code-tables/complaint-status-code.ts b/frontend/src/app/types/code-tables/complaint-status-code.ts
@@ -5,7 +5,7 @@ export interface ComplaintStatusCode {
   display_order: number;
   active_ind: boolean;
   create_user_id: string;
-  create_utc_timestamp: string;
+  create_utc_timestamp: Date | null;
   update_user_id: string;
-  update_utc_timestamp: string;
+  update_utc_timestamp: Date | null;
 }
diff --git a/frontend/src/app/types/code-tables/geo-organization-unit-code.ts b/frontend/src/app/types/code-tables/geo-organization-unit-code.ts
@@ -6,7 +6,7 @@ export interface GeoOrganizationUnitCode
         display_order: string,
         active_ind: string,
         create_user_id: string,
-        create_utc_timestamp: string,
+        create_utc_timestamp: Date | null,
         update_user_id: string,
-        update_utc_timestamp: string
+        update_utc_timestamp: Date | null
 }
diff --git a/frontend/src/app/types/code-tables/geo-orginaization-code.ts b/frontend/src/app/types/code-tables/geo-orginaization-code.ts
@@ -5,7 +5,7 @@ export interface GeoOrganizationCode {
   display_order: number;
   active_ind: boolean;
   create_user_id: string;
-  create_utc_timestamp: string;
+  create_utc_timestamp: Date | null;
   update_user_id: string;
-  update_utc_timestamp: string;
+  update_utc_timestamp: Date | null;
 }
diff --git a/frontend/src/app/types/code-tables/hwcr-nature-of-complaint-code.ts b/frontend/src/app/types/code-tables/hwcr-nature-of-complaint-code.ts
@@ -6,7 +6,7 @@ export interface HwcrNatureOfComplaintCode
         display_order: string,
         active_ind: string,
         create_user_id: string,
-        create_utc_timestamp: string,
+        create_utc_timestamp: Date | null,
         update_user_id: string,
-        update_utc_timestamp: string
+        update_utc_timestamp: Date | null
 }