Allow setting job to "No job" after it has been set

components/CharacterGrid/index.tsx

@@ -175,15 +175,19 @@ const CharacterGrid = (props: Props) => {
   }
 
   // Methods: Saving job and job skills
-  const saveJob = function (job: Job) {
+  const saveJob = async function (job?: Job) {
     const payload = {
       party: {
-        job_id: job ? job.id : '',
+        job_id: job ? job.id : -1,
       },
     }
 
     if (party.id && appState.party.editable) {
-      api.updateJob({ partyId: party.id, params: payload }).then((response) => {
+      const response = await api.updateJob({
+        partyId: party.id,
+        params: payload,
+      })
+
       const newParty = response.data
 
       setJob(newParty.job)
@@ -191,7 +195,6 @@ const CharacterGrid = (props: Props) => {
 
       setJobSkills(newParty.job_skills)
       appState.party.jobSkills = newParty.job_skills
-      })
     }
   }
 

components/JobSection/index.tsx

@@ -18,7 +18,7 @@ interface Props {
   job?: Job
   jobSkills: JobSkillObject
   editable: boolean
-  saveJob: (job: Job) => void
+  saveJob: (job?: Job) => void
   saveSkill: (skill: JobSkill, position: number) => void
 }
 
@@ -41,7 +41,6 @@ const JobSection = (props: Props) => {
 
   useEffect(() => {
     // Set current job based on ID
-    if (props.job) {
     setJob(props.job)
     setSkills({
       0: props.jobSkills[0],
@@ -50,8 +49,7 @@ const JobSection = (props: Props) => {
       3: props.jobSkills[3],
     })
 
-      if (selectRef.current) selectRef.current.value = props.job.id
+    if (selectRef.current && props.job) selectRef.current.value = props.job.id
-    }
   }, [props])
 
   useEffect(() => {
@@ -68,11 +66,9 @@ const JobSection = (props: Props) => {
   }, [job])
 
   function receiveJob(job?: Job) {
-    if (job) {
     setJob(job)
     props.saveJob(job)
   }
-  }
 
   function generateImageUrl() {
     let imgSrc = ''