fix: sync accounts and tags

Author: Ciensprog

src/components/selectors/accounts/hooks.ts

@@ -4,7 +4,7 @@ import type {
 } from '../../../components/ui/third-party/extended/input-tags'
 
 import { defaultColor } from '../../../config/constants/colors'
-import { getBulkTags } from '../../../config/constants/tags'
+import { BulkTags, getBulkTags } from '../../../config/constants/tags'
 
 import { useGetAccounts } from '../../../hooks/accounts'
 import { useGetGroups } from '../../../hooks/groups'
@@ -73,7 +73,7 @@ export function useAccountSelectorData({
     const currentTags = parsedSelectedTags.map(({ value }) => value)
     const bulkTags = getBulkTags()
     const hasBulkTag = currentTags.some((tag) =>
-      bulkTags.includes(tag.trim().toLowerCase())
+      bulkTags.includes(tag.trim().toLowerCase() as BulkTags)
     )
 
     if (hasBulkTag) {

src/routes/accounts/remove/-actions.ts

@@ -1,6 +1,7 @@
 import type { GroupRecord } from '../../../types/groups'
 
 import { useNavigate } from '@tanstack/react-router'
+import { useShallow } from 'zustand/react/shallow'
 
 import {
   useGetSaveQuestsActions,
@@ -12,9 +13,64 @@ import {
 } from '../../../hooks/accounts'
 import { useGetGroups } from '../../../hooks/groups'
 
+import { useHomebaseNameStore } from '../../../state/stw-operations/homebase-name'
+import {
+  useClaimRewardsSelectorStore,
+  useKickAllPartySelectorStore,
+  useLeavePartySelectorStore,
+} from '../../../state/stw-operations/party'
+import { useSaveQuestsStore } from '../../../state/stw-operations/save-quests'
+import { useXPBoostsFormStore } from '../../../state/stw-operations/xpboosts/forms/consume-personal'
+
 import { toast } from '../../../lib/notifications'
 import { parseCustomDisplayName } from '../../../lib/utils'
 
+function useClearForms() {
+  const homebaseNameForm = useHomebaseNameStore(
+    useShallow((state) => ({
+      accounts: state.accounts,
+      updateAccounts: state.updateAccounts,
+    }))
+  )
+  const saveQuestsForm = useSaveQuestsStore(
+    useShallow((state) => ({
+      accounts: state.accounts,
+      updateAccounts: state.updateAccounts,
+    }))
+  )
+  const xpBoostsForm = useXPBoostsFormStore(
+    useShallow((state) => ({
+      accounts: state.accounts,
+      updateAccounts: state.updateAccounts,
+    }))
+  )
+
+  return [homebaseNameForm, saveQuestsForm, xpBoostsForm]
+}
+
+function useClearPartySelectors() {
+  const kickAllPartySelector = useKickAllPartySelectorStore(
+    useShallow((state) => ({
+      accounts: state.value,
+      updateAccounts: state.setValue,
+    }))
+  )
+  const claimRewardsSelector = useClaimRewardsSelectorStore(
+    useShallow((state) => ({
+      accounts: state.value,
+      updateAccounts: state.setValue,
+    }))
+  )
+  const leavePartySelector = useLeavePartySelectorStore(
+    useShallow((state) => ({
+      accounts: state.value,
+      updateAccounts: state.setValue,
+    }))
+  )
+
+  return [kickAllPartySelector, claimRewardsSelector, leavePartySelector]
+}
+
 export function useHandleRemove() {
   const navigate = useNavigate()
   const { selected } = useGetSelectedAccount()
@@ -25,6 +81,10 @@ export function useHandleRemove() {
   const { selectedAccounts } = useGetSaveQuestsData()
   const { rawSaveQuestsUpdateAccounts } = useGetSaveQuestsActions()
 
+  // Clear forms
+  const clearPartySelectors = useClearPartySelectors()
+  const clearForms = useClearForms()
+
   const handleRemove = () => {
     if (!selected) {
       return
@@ -41,6 +101,21 @@ export function useHandleRemove() {
       {} as GroupRecord
     )
 
+    clearPartySelectors.forEach((currentForm) => {
+      currentForm.updateAccounts(
+        currentForm.accounts.filter(
+          (option) => option.value !== selected.accountId
+        )
+      )
+    })
+    clearForms.forEach((currentForm) => {
+      currentForm.updateAccounts(
+        currentForm.accounts.filter(
+          (accountId) => accountId !== selected.accountId
+        )
+      )
+    })
+
     registerGroups(newGroups)
     rawSaveQuestsUpdateAccounts(
       selectedAccounts.filter(

src/routes/settings/-tags-management/-hooks.ts

@@ -7,10 +7,18 @@ import { useEffect, useState } from 'react'
 
 import { defaultColor } from '../../../config/constants/colors'
 
+import {
+  useGetHomebaseNameActions,
+  useGetHomebaseNameData,
+} from '../../../hooks/stw-operations/homebase-name'
 import {
   useGetSaveQuestsActions,
   useGetSaveQuestsData,
 } from '../../../hooks/stw-operations/save-quests'
+import {
+  useGetXPBoostsActions,
+  useGetXPBoostsFormData,
+} from '../../../hooks/stw-operations/xpboosts'
 import { useGetGroups } from '../../../hooks/groups'
 import { useGetTags } from '../../../hooks/tags'
 
@@ -113,9 +121,15 @@ export function useFormUpdate({ rawData }: { rawData: Tag }) {
 
   const { groupList, registerGroups } = useGetGroups()
 
-  const { selectedTags } = useGetSaveQuestsData()
+  const saveQuestsData = useGetSaveQuestsData()
   const { rawSaveQuestsUpdateTags } = useGetSaveQuestsActions()
 
+  const homebaseNameData = useGetHomebaseNameData()
+  const { rawHomebaseNameUpdateTags } = useGetHomebaseNameActions()
+
+  const xpBoostsFormData = useGetXPBoostsFormData()
+  const { rawXPBoostsUpdateTags } = useGetXPBoostsActions()
+
   useEffect(() => {
     setColor((rawData.color ?? defaultColor) as string)
   }, [rawData])
@@ -176,12 +190,24 @@ export function useFormUpdate({ rawData }: { rawData: Tag }) {
     )
 
     registerGroups(newGroups)
+
     rawSaveQuestsUpdateTags(
-      selectedTags.map((currentTag) =>
+      saveQuestsData.selectedTags.map((currentTag) =>
+        currentTag === rawData.name ? newData.name : currentTag
+      )
+    )
+    rawHomebaseNameUpdateTags(
+      homebaseNameData.selectedTags.map((currentTag) =>
+        currentTag === rawData.name ? newData.name : currentTag
+      )
+    )
+    rawXPBoostsUpdateTags(
+      xpBoostsFormData.selectedTags.map((currentTag) =>
         currentTag === rawData.name ? newData.name : currentTag
       )
     )
     tagsStore.updateTags(newTags, true)
+
     window.electronAPI.updateTags(newTags)
     window.electronAPI.updateGroups(newGroups)
 
@@ -202,10 +228,24 @@ export function useFormUpdate({ rawData }: { rawData: Tag }) {
     )
 
     registerGroups(newGroups)
+
     rawSaveQuestsUpdateTags(
-      selectedTags.filter((currentTag) => currentTag !== tagName)
+      saveQuestsData.selectedTags.filter(
+        (currentTag) => currentTag !== tagName
+      )
+    )
+    rawHomebaseNameUpdateTags(
+      homebaseNameData.selectedTags.filter(
+        (currentTag) => currentTag !== tagName
+      )
+    )
+    rawXPBoostsUpdateTags(
+      xpBoostsFormData.selectedTags.filter(
+        (currentTag) => currentTag !== tagName
+      )
     )
     tagsStore.updateTags(rawTagsRecord, true)
+
     window.electronAPI.updateTags(rawTagsRecord)
     window.electronAPI.updateGroups(newGroups)
   }

src/routes/stw-operations/party/-hooks.ts

@@ -10,7 +10,10 @@ import { useEffect, useState } from 'react'
 import { useGetAccounts } from '../../../hooks/accounts'
 import { useGetGroups } from '../../../hooks/groups'
 import { useClaimedRewards } from '../../../hooks/stw-operations/claimed-rewards'
-import { usePartyFriendsForm } from '../../../hooks/stw-operations/party'
+import {
+  useInviteFriendsForm,
+  usePartyFriendsForm,
+} from '../../../hooks/stw-operations/party'
 
 import { checkIfCustomDisplayNameIsValid } from '../../../lib/validations/properties'
 import { toast } from '../../../lib/notifications'
@@ -205,6 +208,7 @@ export function useInviteActions({
   const [isInviting, setIsInviting] = useState(false)
   const [inputSearchValue, setInputSearchValue] = useState('')
   const { friends } = usePartyFriendsForm()
+  const { setValue, value } = useInviteFriendsForm()
 
   const friendOptions: Array<ComboboxOption> = Object.values(friends)
     .toSorted(
@@ -245,6 +249,7 @@ export function useInviteActions({
   useEffect(() => {
     const listener = window.electronAPI.notificationRemoveFriend(
       async ({ displayName, status }) => {
+        setValue(value.filter((item) => friends[item.value] !== undefined))
         setIsSubmitting(false)
 
         toast(