poi-plugin-quest-info-2 0.5.4 → 0.5.8

package/src/components/QuestList.tsx

@@ -9,10 +9,12 @@ import {
 } from 'react-virtualized'
 import type { ListRowProps } from 'react-virtualized'
 import styled from 'styled-components'
-import { KcanotifyQuestExt, QUEST_STATUS } from '../questHelper'
+import { QUEST_STATUS } from '../questHelper'
+import type { UnionQuest } from '../questHelper'
 import { useLargeCard } from '../store'
 import { QuestCard } from './QuestCard'
 import { useIsQuestPluginTab } from '../poi/hooks'
+import { QUEST_API_STATE } from '../poi/types'
 
 const QuestListWrapper = styled.div`
   flex: 1;
@@ -25,10 +27,29 @@ const cache = new CellMeasurerCache({
   fixedWidth: true,
 })
 
-const useQuestsRowRenderer = (quests: KcanotifyQuestExt[]) => {
+const questStateToQuestStatus = (
+  state: QUEST_API_STATE | undefined
+): QUEST_STATUS => {
+  switch (state) {
+    case QUEST_API_STATE.DEFAULT:
+      return QUEST_STATUS.DEFAULT
+    case QUEST_API_STATE.COMPLETED:
+      return QUEST_STATUS.COMPLETED
+    case QUEST_API_STATE.IN_PROGRESS:
+      return QUEST_STATUS.IN_PROGRESS
+    default:
+      return QUEST_STATUS.DEFAULT
+  }
+}
+
+const useQuestsRowRenderer = (quests: UnionQuest[]) => {
   const rowRenderer = useCallback(
     ({ key, index, style, parent }: ListRowProps) => {
-      const { gameId, code, name, desc, memo, active } = quests[index]
+      const quest = quests[index]
+      const { gameId } = quest
+      const { code, name, desc, memo } = quest.docQuest
+      const questStatus = questStateToQuestStatus(quest.gameQuest?.api_state)
+
       return (
         <CellMeasurer
           cache={cache}
@@ -45,7 +66,7 @@ const useQuestsRowRenderer = (quests: KcanotifyQuestExt[]) => {
               name={name}
               desc={desc}
               tips={memo}
-              status={active ? QUEST_STATUS.InProgress : QUEST_STATUS.Default}
+              status={questStatus}
             ></QuestCard>
           </div>
         </CellMeasurer>
@@ -56,12 +77,11 @@ const useQuestsRowRenderer = (quests: KcanotifyQuestExt[]) => {
   return rowRenderer
 }
 
-export const QuestList: React.FC<{ quests: KcanotifyQuestExt[] }> = ({
-  quests,
-}) => {
+export const QuestList: React.FC<{ quests: UnionQuest[] }> = ({ quests }) => {
   const { largeCard } = useLargeCard()
   const activeTab = useIsQuestPluginTab()
   const listRef = useRef<List>(null)
+  const rowRenderer: ListRowRenderer = useQuestsRowRenderer(quests)
 
   useEffect(() => {
     const largeCardIdx = quests.findIndex((i) => i.gameId === largeCard)
@@ -81,8 +101,6 @@ export const QuestList: React.FC<{ quests: KcanotifyQuestExt[] }> = ({
     listRef.current?.recomputeRowHeights()
   }, [])
 
-  const rowRenderer: ListRowRenderer = useQuestsRowRenderer(quests)
-
   if (!quests.length) {
     // Prevent Uncaught Error: Requested index 0 is outside of range 0..0
     // See https://github.com/bvaughn/react-virtualized/issues/1016

package/src/poi/hooks.ts

@@ -25,9 +25,9 @@ export const usePluginTranslation = () => {
 }
 
 export const useGameQuest = () => {
-  const [quests, setQuests] = useState<GameQuest[] | null>(null)
+  const [quests, setQuests] = useState<GameQuest[]>([])
   useEffect(() => {
-    const listener = (quests: GameQuest[] | null) => setQuests(quests)
+    const listener = (quests: GameQuest[] | null) => setQuests(quests ?? [])
     // See reducer.ts
     return observePluginStore(listener, (i) => i?._?.questList)
   }, [])

package/src/poi/types.ts

@@ -1,11 +1,14 @@
 import type { PluginState } from '../reducer'
 
+export enum QUEST_API_STATE {
+  DEFAULT = 1,
+  IN_PROGRESS = 2,
+  COMPLETED = 3,
+}
+
 // See https://github.com/poooi/poi/blob/master/views/redux/info/quests.es
 export type GameQuest = {
-  // 1 Default
-  // 2 In progress
-  // 3 Completed
-  api_state: 1 | 2 | 3
+  api_state: QUEST_API_STATE
   api_no: number
   api_title: string
   api_detail: string

package/src/questHelper.ts

@@ -1,6 +1,7 @@
 import { QuestData } from '../build/kcanotifyGamedata'
+import { GameQuest, QUEST_API_STATE } from './poi/types'
 
-type KcanotifyQuest = {
+type DocQuest = {
   code: string
   name: string
   desc: string
@@ -9,9 +10,10 @@ type KcanotifyQuest = {
   tracking?: number[][]
 }
 
-export type KcanotifyQuestExt = KcanotifyQuest & {
+export type UnionQuest = {
   gameId: string
-  active?: boolean
+  gameQuest?: GameQuest
+  docQuest: DocQuest
 }
 
 const questStartsFilter = (str: string) =>
@@ -26,16 +28,18 @@ export const quarterlyQuest = questStartsFilter('(季任)')
 // (年任) (年任 / x 月)
 export const yearlyQuest = questStartsFilter('(年任')
 
-export const isInProgressQuest = (quest: KcanotifyQuestExt) => quest.active
-export const isDailyQuest = (quest: KcanotifyQuestExt) =>
+export const isInProgressQuest = (quest: UnionQuest) =>
+  quest.gameQuest?.api_state === QUEST_API_STATE.IN_PROGRESS ||
+  quest.gameQuest?.api_state === QUEST_API_STATE.COMPLETED
+export const isDailyQuest = (quest: UnionQuest) =>
   dailyQuest.includes(quest.gameId)
-export const isWeeklyQuest = (quest: KcanotifyQuestExt) =>
+export const isWeeklyQuest = (quest: UnionQuest) =>
   weeklyQuest.includes(quest.gameId)
-export const isMonthlyQuest = (quest: KcanotifyQuestExt) =>
+export const isMonthlyQuest = (quest: UnionQuest) =>
   monthlyQuest.includes(quest.gameId)
-export const isQuarterlyQuest = (quest: KcanotifyQuestExt) =>
+export const isQuarterlyQuest = (quest: UnionQuest) =>
   quarterlyQuest.includes(quest.gameId)
-export const isYearlyQuest = (quest: KcanotifyQuestExt) =>
+export const isYearlyQuest = (quest: UnionQuest) =>
   yearlyQuest.includes(quest.gameId)
 
 export enum QUEST_CATEGORY {
@@ -154,28 +158,28 @@ export const guessQuestCategory = (
   }
 }
 
-export const isCompositionQuest = ({ code }: KcanotifyQuestExt) =>
+export const isCompositionQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Composition
-export const isSortieQuest = ({ code }: KcanotifyQuestExt) =>
+export const isSortieQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Sortie
-export const isExerciseQuest = ({ code }: KcanotifyQuestExt) =>
+export const isExerciseQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Exercise
-export const isExpeditionQuest = ({ code }: KcanotifyQuestExt) =>
+export const isExpeditionQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Expedition
-export const isSupplyOrDockingQuest = ({ code }: KcanotifyQuestExt) =>
+export const isSupplyOrDockingQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.SupplyOrDocking
-export const isArsenalQuest = ({ code }: KcanotifyQuestExt) =>
+export const isArsenalQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Arsenal
-export const isModernizationQuest = ({ code }: KcanotifyQuestExt) =>
+export const isModernizationQuest = ({ code }: DocQuest) =>
   guessQuestCategory(code).type === QUEST_CATEGORY.Modernization
-export const isUnknownCategoryQuest = ({ code }: KcanotifyQuestExt) =>
+export const isUnknownCategoryQuest = ({ code }: DocQuest) =>
   // Starts with unknown character
   /^[^ABCDEFG]/.test(code)
 
 export enum QUEST_STATUS {
-  Locked,
-  Default,
-  InProgress,
-  Completed,
-  AlreadyCompleted,
+  LOCKED,
+  DEFAULT,
+  IN_PROGRESS,
+  COMPLETED,
+  ALREADY_COMPLETED,
 }

package/src/store/quest.ts

@@ -1,13 +1,9 @@
 import { useCallback } from 'react'
-import { checkIsKcwikiSupportedLanguages } from '.'
 import { QuestData } from '../../build/kcanotifyGamedata'
-import {
-  useActiveQuest,
-  useGameQuest,
-  usePluginTranslation,
-} from '../poi/hooks'
-import { getCategory, KcanotifyQuestExt } from '../questHelper'
-import { useKcwikiData } from './kcwiki'
+import { useGameQuest, usePluginTranslation } from '../poi/hooks'
+import { getCategory } from '../questHelper'
+import type { UnionQuest } from '../questHelper'
+import { useKcwikiData, checkIsKcwikiSupportedLanguages } from './kcwiki'
 import { useStore } from './store'
 
 const DEFAULT_LANG = 'ja-JP'
@@ -41,27 +37,21 @@ const useQuestMap = () => {
   return QuestData[lang]
 }
 
-export const useQuest = (): KcanotifyQuestExt[] => {
-  const activeQuest = useActiveQuest()
-  const questMap = useQuestMap()
+export const useQuest = (): UnionQuest[] => {
+  const docQuestMap = useQuestMap()
   const gameQuest = useGameQuest()
   const {
     store: { syncWithGame },
   } = useStore()
 
-  if (syncWithGame) {
-    if (gameQuest == null) {
-      // TODO tip use to sync quest data
-      return []
-    }
+  if (syncWithGame && gameQuest.length) {
     return gameQuest.map((quest) => {
       const gameId = String(quest.api_no)
-      const active = gameId in activeQuest
-      if (gameId in questMap) {
+      if (gameId in docQuestMap) {
         return {
           gameId,
-          active,
-          ...questMap[gameId as unknown as keyof typeof questMap],
+          gameQuest: quest,
+          docQuest: docQuestMap[gameId as keyof typeof docQuestMap],
         }
       }
 
@@ -69,18 +59,21 @@ export const useQuest = (): KcanotifyQuestExt[] => {
       // May be a new quest
       return {
         gameId,
-        active,
-        code: `${getCategory(quest.api_category).wikiSymbol}?`,
-        name: quest.api_title,
-        desc: quest.api_detail,
+        gameQuest: quest,
+        docQuest: {
+          code: `${getCategory(quest.api_category).wikiSymbol}?`,
+          name: quest.api_title,
+          desc: quest.api_detail,
+        },
       }
     })
   } else {
     // Return all recorded quests
-    return Object.entries(questMap).map(([gameId, val]) => ({
+    return Object.entries(docQuestMap).map(([gameId, val]) => ({
       gameId,
-      active: gameId in activeQuest,
-      ...val,
+      // Maybe empty
+      gameQuest: gameQuest.find((quest) => quest.api_no === Number(gameId))!,
+      docQuest: val,
     }))
   }
 }

package/src/tags.ts

@@ -15,6 +15,7 @@ import {
   isUnknownCategoryQuest,
   isInProgressQuest,
 } from './questHelper'
+import type { UnionQuest } from './questHelper'
 
 const yes = () => true as const
 
@@ -25,16 +26,21 @@ export const ALL_CATEGORY_TAG = {
 
 export const ALL_TYPE_TAG = ALL_CATEGORY_TAG
 
+const withDocQuest =
+  (filterFn: (q: UnionQuest['docQuest']) => boolean) =>
+  (unionQuest: UnionQuest) =>
+    filterFn(unionQuest.docQuest)
+
 export const CATEGORY_TAGS = [
   ALL_CATEGORY_TAG,
-  { name: 'Composition', filter: isCompositionQuest },
-  { name: 'Sortie', filter: isSortieQuest },
-  { name: 'Exercise', filter: isExerciseQuest },
-  { name: 'Expedition', filter: isExpeditionQuest },
-  { name: 'Supply / Docking', filter: isSupplyOrDockingQuest },
-  { name: 'Arsenal', filter: isArsenalQuest },
-  { name: 'Modernization', filter: isModernizationQuest },
-  { name: 'Others', filter: isUnknownCategoryQuest },
+  { name: 'Composition', filter: withDocQuest(isCompositionQuest) },
+  { name: 'Sortie', filter: withDocQuest(isSortieQuest) },
+  { name: 'Exercise', filter: withDocQuest(isExerciseQuest) },
+  { name: 'Expedition', filter: withDocQuest(isExpeditionQuest) },
+  { name: 'Supply / Docking', filter: withDocQuest(isSupplyOrDockingQuest) },
+  { name: 'Arsenal', filter: withDocQuest(isArsenalQuest) },
+  { name: 'Modernization', filter: withDocQuest(isModernizationQuest) },
+  { name: 'Others', filter: withDocQuest(isUnknownCategoryQuest) },
 ] as const
 
 export const TYPE_TAGS = [