Merge pull request #139 from jedmund/fix-title

Refactor party creation

components/CharacterGrid/index.tsx

@@ -11,7 +11,7 @@ import JobSection from '~components/JobSection'
 import CharacterUnit from '~components/CharacterUnit'
 import CharacterConflictModal from '~components/CharacterConflictModal'
 
-import type { JobSkillObject, SearchableObject } from '~types'
+import type { DetailsObject, JobSkillObject, SearchableObject } from '~types'
 
 import api from '~utils/api'
 import { appState } from '~utils/appState'
@@ -23,7 +23,7 @@ import './index.scss'
 interface Props {
   new: boolean
   characters?: GridCharacter[]
-  createParty: () => Promise<AxiosResponse<any, any>>
+  createParty: (details?: DetailsObject) => Promise<Party>
   pushHistory?: (path: string) => void
 }
 
@@ -95,13 +95,8 @@ const CharacterGrid = (props: Props) => {
     const character = object as Character
 
     if (!party.id) {
-      props.createParty().then((response) => {
+      props.createParty().then((team) => {
-        const party = response.data.party
+        saveCharacter(team.id, character, position)
-        appState.party.id = party.id
-        setSlug(party.shortcode)
-
-        if (props.pushHistory) props.pushHistory(`/p/${party.shortcode}`)
-        saveCharacter(party.id, character, position)
           .then((response) => storeGridCharacter(response.data))
           .catch((error) => console.error(error))
       })
@@ -184,19 +179,24 @@ const CharacterGrid = (props: Props) => {
       },
     }
 
-    if (party.id && appState.party.editable) {
+    if (!party.id) {
+      // If the party has no ID, create a new party
+      await props.createParty()
+    }
+
+    if (appState.party.id) {
       const response = await api.updateJob({
-        partyId: party.id,
+        partyId: appState.party.id,
         params: payload,
       })
 
-      const newParty = response.data
+      const team = response.data
 
-      setJob(newParty.job)
+      setJob(team.job)
-      appState.party.job = newParty.job
+      appState.party.job = team.job
 
-      setJobSkills(newParty.job_skills)
+      setJobSkills(team.job_skills)
-      appState.party.jobSkills = newParty.job_skills
+      appState.party.jobSkills = team.job_skills
     }
   }
 

components/LabelledInput/index.tsx

@@ -26,7 +26,7 @@ const LabelledInput = React.forwardRef<HTMLInputElement, Props>(function Input(
 
   // Classes
   const classes = classNames({ Input: true }, props.className)
-  const { defaultValue, ...inputProps } = props
+  const { defaultValue, visible, ...inputProps } = props
 
   // Change value when prop updates
   useEffect(() => {

components/Party/index.tsx

@@ -11,7 +11,7 @@ import CharacterGrid from '~components/CharacterGrid'
 
 import api from '~utils/api'
 import { appState, initialAppState } from '~utils/appState'
-import { GridType, TeamElement } from '~utils/enums'
+import { GridType } from '~utils/enums'
 import type { DetailsObject } from '~types'
 
 import './index.scss'
@@ -40,66 +40,62 @@ const Party = (props: Props) => {
   }, [])
 
   // Methods: Creating a new party
-  async function createParty(extra: boolean = false) {
+  async function createParty(details?: DetailsObject) {
-    return await api.endpoints.parties.create({
+    let payload = {}
-      party: {
+    if (details) payload = formatDetailsObject(details)
-        extra: extra,
+
-      },
+    return await api.endpoints.parties
-    })
+      .create(payload)
+      .then((response) => storeParty(response.data.party))
   }
 
   // Methods: Updating the party's details
+  async function updateDetails(details: DetailsObject) {
+    if (!appState.party.id) return await createParty(details)
+    else updateParty(details)
+  }
+
+  function formatDetailsObject(details: DetailsObject) {
+    const payload: { [key: string]: any } = {}
+
+    if (details.name) payload.name = details.name
+    if (details.description) payload.description = details.description
+    if (details.raid) payload.raid_id = details.raid.id
+    if (details.chargeAttack) payload.charge_attack = details.chargeAttack
+    if (details.fullAuto) payload.full_auto = details.fullAuto
+    if (details.autoGuard) payload.auto_guard = details.autoGuard
+    if (details.clearTime) payload.clear_time = details.clearTime
+    if (details.buttonCount) payload.button_count = details.buttonCount
+    if (details.chainCount) payload.chain_count = details.chainCount
+    if (details.turnCount) payload.turn_count = details.turnCount
+    if (details.extra) payload.extra = details.extra
+    if (details.job) payload.job_id = details.job.id
+
+    if (Object.keys(payload).length > 1) return { party: payload }
+    else return {}
+  }
+
+  async function updateParty(details: DetailsObject) {
+    const payload = formatDetailsObject(details)
+
+    if (appState.party.id) {
+      return await api.endpoints.parties
+        .update(appState.party.id, payload)
+        .then((response) => storeParty(response.data.party))
+    }
+  }
+
   function checkboxChanged(event: React.ChangeEvent<HTMLInputElement>) {
     appState.party.extra = event.target.checked
 
-    if (party.id) {
+    // Only save if this is a saved party
-      api.endpoints.parties.update(party.id, {
+    if (appState.party.id) {
+      api.endpoints.parties.update(appState.party.id, {
         party: { extra: event.target.checked },
       })
     }
   }
 
-  function updateDetails(details: DetailsObject) {
-    if (
-      appState.party.name !== details.name ||
-      appState.party.description !== details.description ||
-      appState.party.raid?.id !== details.raid?.id
-    ) {
-      if (appState.party.id)
-        api.endpoints.parties
-          .update(appState.party.id, {
-            party: {
-              name: details.name,
-              description: details.description,
-              raid_id: details.raid?.id,
-              charge_attack: details.chargeAttack,
-              full_auto: details.fullAuto,
-              auto_guard: details.autoGuard,
-              clear_time: details.clearTime,
-              button_count: details.buttonCount,
-              chain_count: details.chainCount,
-              turn_count: details.turnCount,
-            },
-          })
-          .then(() => {
-            appState.party.name = details.name
-            appState.party.description = details.description
-            appState.party.raid = details.raid
-
-            appState.party.chargeAttack = details.chargeAttack
-            appState.party.fullAuto = details.fullAuto
-            appState.party.autoGuard = details.autoGuard
-
-            appState.party.clearTime = details.clearTime
-            appState.party.buttonCount = details.buttonCount
-            appState.party.chainCount = details.chainCount
-            appState.party.turnCount = details.turnCount
-
-            appState.party.updated_at = party.updated_at
-          })
-    }
-  }
-
   // Deleting the party
   function deleteTeam(event: React.MouseEvent<HTMLButtonElement, MouseEvent>) {
     if (appState.party.editable && appState.party.id) {
@@ -126,7 +122,7 @@ const Party = (props: Props) => {
 
   // Methods: Storing party data
   const storeParty = function (team: Party) {
-    // Store the important party and state-keeping values
+    // Store the important party and state-keeping values in global state
     appState.party.name = team.name
     appState.party.description = team.description
     appState.party.raid = team.raid
@@ -147,6 +143,11 @@ const Party = (props: Props) => {
     storeCharacters(team.characters)
     storeWeapons(team.weapons)
     storeSummons(team.summons)
+
+    // Then, push the browser history to the new party's URL
+    if (props.pushHistory) props.pushHistory(`/p/${team.shortcode}`)
+
+    return team
   }
 
   const storeCharacters = (list: Array<GridCharacter>) => {

components/PartyDetails/index.tsx

@@ -252,11 +252,14 @@ const PartyDetails = (props: Props) => {
   }
 
   function toggleDetails() {
-    if (name !== party.name) {
+    // Enabling this code will make live updates not work,
-      const resetName = party.name ? party.name : 'Untitled'
+    // but I'm not sure why it's here, so we're not going to remove it.
-      setName(resetName)
+
-      if (nameInput.current) nameInput.current.value = resetName
+    // if (name !== party.name) {
-    }
+    //   const resetName = party.name ? party.name : ''
+    //   setName(resetName)
+    //   if (nameInput.current) nameInput.current.value = resetName
+    // }
     setOpen(!open)
   }
 
@@ -270,7 +273,6 @@ const PartyDetails = (props: Props) => {
   }
 
   function updateDetails(event: React.MouseEvent) {
-    const nameValue = nameInput.current?.value
     const descriptionValue = descriptionInput.current?.value
     const raid = raids.find((raid) => raid.slug === raidSlug)
 
@@ -282,7 +284,7 @@ const PartyDetails = (props: Props) => {
       buttonCount: buttonCount,
       turnCount: turnCount,
       chainCount: chainCount,
-      name: nameValue,
+      name: name,
       description: descriptionValue,
       raid: raid,
     }

components/SummonGrid/index.tsx

@@ -13,7 +13,7 @@ import ExtraSummons from '~components/ExtraSummons'
 import api from '~utils/api'
 import { appState } from '~utils/appState'
 import { accountState } from '~utils/accountState'
-import type { SearchableObject } from '~types'
+import type { DetailsObject, SearchableObject } from '~types'
 
 import './index.scss'
 
@@ -21,7 +21,7 @@ import './index.scss'
 interface Props {
   new: boolean
   summons?: GridSummon[]
-  createParty: () => Promise<AxiosResponse<any, any>>
+  createParty: (details?: DetailsObject) => Promise<Party>
   pushHistory?: (path: string) => void
 }
 
@@ -86,14 +86,8 @@ const SummonGrid = (props: Props) => {
     const summon = object as Summon
 
     if (!party.id) {
-      props.createParty().then((response) => {
+      props.createParty().then((team) => {
-        const party = response.data.party
+        saveSummon(team.id, summon, position).then((response) =>
-        appState.party.id = party.id
-        setSlug(party.shortcode)
-
-        if (props.pushHistory) props.pushHistory(`/p/${party.shortcode}`)
-
-        saveSummon(party.id, summon, position).then((response) =>
           storeGridSummon(response.data)
         )
       })

components/SummonUnit/index.scss

@@ -91,7 +91,7 @@
   img {
     position: relative;
     width: 100%;
-    z-index: 0;
+    z-index: 2;
 
     &.Placeholder {
       opacity: 0;

components/WeaponGrid/index.tsx

@@ -13,7 +13,7 @@ import ExtraWeapons from '~components/ExtraWeapons'
 import api from '~utils/api'
 import { appState } from '~utils/appState'
 
-import type { SearchableObject } from '~types'
+import type { DetailsObject, SearchableObject } from '~types'
 
 import './index.scss'
 import WeaponConflictModal from '~components/WeaponConflictModal'
@@ -24,7 +24,7 @@ import { accountState } from '~utils/accountState'
 interface Props {
   new: boolean
   weapons?: GridWeapon[]
-  createParty: (extra: boolean) => Promise<AxiosResponse<any, any>>
+  createParty: (details: DetailsObject) => Promise<Party>
   pushHistory?: (path: string) => void
 }
 
@@ -89,16 +89,11 @@ const WeaponGrid = (props: Props) => {
     if (position == 1) appState.party.element = weapon.element
 
     if (!party.id) {
-      props.createParty(party.extra).then((response) => {
+      const payload: DetailsObject = { extra: party.extra }
-        const party = response.data.party
+      props.createParty(payload).then((team) => {
-        appState.party.id = party.id
+        saveWeapon(team.id, weapon, position).then((response) => {
-        setSlug(party.shortcode)
-
-        if (props.pushHistory) props.pushHistory(`/p/${party.shortcode}`)
-
-        saveWeapon(party.id, weapon, position).then((response) =>
           storeGridWeapon(response.data.grid_weapon)
-        )
+        })
       })
     } else {
       if (party.editable)

types/index.d.ts

@@ -22,14 +22,16 @@ export type PaginationObject = {
 
 export type DetailsObject = {
   [key: string]: boolean | number | string | Raid | undefined
-  fullAuto: boolean
+  fullAuto?: boolean
-  autoGuard: boolean
+  autoGuard?: boolean
-  chargeAttack: boolean
+  chargeAttack?: boolean
-  clearTime: number
+  clearTime?: number
   buttonCount?: number
   turnCount?: number
   chainCount?: number
   name?: string
   description?: string
   raid?: Raid
+  job?: Job
+  extra?: boolean
 }