poi-plugin-quest-info-2 0.13.2 → 0.14.0

package/build/questCodeMap.json

@@ -572,7 +572,7 @@
   "B202": 1015,
   "B204": 1017,
   "By15": 1018,
-  "2049B1": 1020,
+  "2409B1": 1020,
   "F96": 1101,
   "F97": 1102,
   "Fy5": 1103,

package/i18n/en-US.json

@@ -42,5 +42,8 @@
   "Search in KanColle Wiki": "Search in KanColle Wiki",
   "Search in Richelieu Manager": "Search in Richelieu Manager",
   "Star project, support the author": "Star project, support the author",
+  "Data Source": "Data Source",
+  "Auto detect": "Auto detect",
+  "Report issue": "Report issue",
   "": ""
 }

package/i18n/ja-JP.json

@@ -37,5 +37,8 @@
   "Search in KanColle Wiki": "KanColle Wikiでこのタスクを検索",
   "Search in Richelieu Manager": "リシュリューの任務マネージャを検索",
   "Star project, support the author": "Starプロジェクト、著者をサポート",
+  "Data Source": "データソース",
+  "Auto detect": "自動検出",
+  "Report issue": "問題を報告する",
   "": ""
 }

package/i18n/ko-KR.json

@@ -21,5 +21,8 @@
   "Search in KanColle Wiki": "KanColle Wiki에서 이 작업 검색",
   "Search in Richelieu Manager": "リシュリューの任務マネージャ에서 이 작업 검색",
   "Star project, support the author": "스타 프로젝트, 작가 지원",
+  "Data Source": "데이터 소스",
+  "Auto detect": "자동 감지",
+  "Report issue": "문제 보고",
   "": ""
 }

package/i18n/zh-CN.json

@@ -37,5 +37,8 @@
   "Search in KanColle Wiki": "在 英wiki 搜索该任务",
   "Search in Richelieu Manager": "在 黎塞留任务管理器 搜索该任务",
   "Star project, support the author": "Star 项目，支持作者",
+  "Data Source": "数据源",
+  "Auto detect": "自动检测",
+  "Report issue": "报告问题",
   "": ""
 }

package/i18n/zh-TW.json

@@ -37,5 +37,8 @@
   "Search in KanColle Wiki": "在 KanColle Wiki 搜索該任務",
   "Search in Richelieu Manager": "在 黎塞留任務管理器 搜索該任務",
   "Star project, support the author": "Star項目，支持作者",
+  "Data Source": "資料來源",
+  "Auto detect": "自動偵測",
+  "Report issue": "報告問題",
   "": ""
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",
@@ -51,6 +51,7 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.2",
     "@blueprintjs/core": "^4.19.5",
+    "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.7",
     "@storybook/addon-actions": "^7.5.2",
     "@storybook/addon-essentials": "^7.5.2",

package/src/Settings.tsx

@@ -1,7 +1,7 @@
 import {
   AnchorButton,
   Button,
-  Checkbox,
+  HTMLSelect,
   Intent,
   Text,
   TextArea,
@@ -10,31 +10,23 @@ import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { StrictMode, useCallback, useState } from 'react'
 import styled from 'styled-components'
+import { QUEST_DATA } from '../build'
 import { version as DATA_VERSION } from '../build/kcanotifyGamedata'
 import PKG from '../package.json'
 import { IN_POI } from './poi/env'
 import { usePluginTranslation, useStateExporter } from './poi/hooks'
 import { tips } from './poi/utils'
-import {
-  StoreProvider,
-  useLanguage,
-  usePreferKcwiki,
-  useRemoveStorage,
-} from './store'
+import { StoreProvider, useDataSource, useRemoveStorage } from './store'
 
 const Container = styled.div`
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   user-select: text;
-
-  & > * + * {
-    margin-top: 8px;
-  }
+  gap: 8px;
+  padding: 8px;
 `
 
-const useIsSimplifiedChinese = () => useLanguage() === 'zh-CN'
-
 const DataExportArea = () => {
   const [text, setText] = useState<string>('')
   const { t } = usePluginTranslation()
@@ -83,52 +75,77 @@ const DataExportArea = () => {
   )
 }
 
-const SettingsMain = () => {
+const Group = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: 8px;
+`
+
+export const SettingsMain = () => {
   const { t } = usePluginTranslation()
-  const isSimplifiedChinese = useIsSimplifiedChinese()
   const removeStorage = useRemoveStorage()
-  const [preferKcwiki, setPreferKcwiki] = usePreferKcwiki()
-  const handleEnabledChange: React.FormEventHandler<HTMLInputElement> =
-    useCallback(() => {
-      setPreferKcwiki(!preferKcwiki)
-    }, [preferKcwiki, setPreferKcwiki])
+  const { dataSource, setDataSource } = useDataSource()
 
-  return (
-    <>
-      <Checkbox
-        checked={preferKcwiki}
-        disabled={!isSimplifiedChinese}
-        label={t('Use Kcwiki data')}
-        onChange={handleEnabledChange}
-      />
+  const handleChangeQuestSource = useCallback(
+    (e: ChangeEvent<HTMLSelectElement>) => {
+      const value = e.target.value
+      if (!value) {
+        setDataSource(null)
+        return
+      }
+      setDataSource(value as any)
+    },
+    [setDataSource],
+  )
 
-      <Text>{t('Version', { version: PKG.version })}</Text>
-      <Text>{t('Data Version', { version: DATA_VERSION })}</Text>
-      <AnchorButton
-        icon={IconNames.CODE}
-        rightIcon={IconNames.SHARE}
-        text={t('View source code on GitHub')}
-        href={PKG.homepage}
-        target="_blank"
-      />
+  return (
+    <Container>
+      <Group>
+        <Text>{t('Data Source')}</Text>
+        <HTMLSelect value={dataSource} onChange={handleChangeQuestSource}>
+          <option value="">{t('Auto detect')}</option>
+          {QUEST_DATA.map((source) => (
+            <option key={source.key} value={source.key}>
+              {source.name} ({Object.keys(source.res).length})
+            </option>
+          ))}
+        </HTMLSelect>
+      </Group>
 
       <Button
+        intent={Intent.WARNING}
         icon={IconNames.TRASH}
         text={t('Restore defaults')}
         onClick={removeStorage}
       />
 
+      <AnchorButton
+        icon={IconNames.Bug}
+        rightIcon={IconNames.SHARE}
+        text={t('Report issue')}
+        href={PKG.bugs.url}
+        target="_blank"
+      />
+      <AnchorButton
+        icon={IconNames.Heart}
+        rightIcon={IconNames.SHARE}
+        text={t('Star project, support the author')}
+        href={PKG.homepage}
+        target="_blank"
+      />
       <DataExportArea />
-    </>
+
+      <Text>{t('Version', { version: PKG.version })}</Text>
+      <Text>{t('Data Version', { version: DATA_VERSION })}</Text>
+    </Container>
   )
 }
 
 export const Settings = () => (
   <StrictMode>
     <StoreProvider>
-      <Container>
-        <SettingsMain />
-      </Container>
+      <SettingsMain />
     </StoreProvider>
   </StrictMode>
 )

package/src/Toolbar.tsx

@@ -1,10 +1,11 @@
-import { Button, InputGroup } from '@blueprintjs/core'
+import { Button, InputGroup, Popover } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { useCallback } from 'react'
 import styled from 'styled-components'
 import { usePluginTranslation } from './poi/hooks'
 import { QUEST_STATUS, UnionQuest } from './questHelper'
+import { SettingsMain } from './Settings'
 import { PROGRESS_TAG, useQuest } from './store'
 import {
   useFilterProgressTag,
@@ -20,9 +21,15 @@ const ToolbarWrapper = styled.div`
   display: flex;
   flex-direction: column;
   padding: 4px 8px;
+  gap: 8px;
+`
+
+const Wrapper = styled.div`
+  display: flex;
+  gap: 4px;
 
-  & > * + * {
-    margin-top: 8px;
+  & > *:first-child {
+    flex: 1;
   }
 `
 
@@ -56,13 +63,23 @@ export const SearchInput: React.FC = () => {
   )
 }
 
+const SettingsPopover = () => {
+  return <SettingsMain />
+}
+
 export const Toolbar = () => {
   // TODO remove
   useSyncGameTagEffect()
 
   return (
     <ToolbarWrapper>
-      <SearchInput></SearchInput>
+      <Wrapper>
+        <SearchInput />
+        <Popover content={<SettingsPopover />} placement="bottom">
+          <Button icon={IconNames.Settings} />
+        </Popover>
+      </Wrapper>
+
       <CategoryTags />
       <TypeTags />
     </ToolbarWrapper>

package/src/components/QuestCard/index.tsx

@@ -3,9 +3,7 @@ import {
   Card,
   Elevation,
   H5,
-  Icon,
   Menu,
-  MenuDivider,
   MenuItem,
   Popover,
 } from '@blueprintjs/core'
@@ -177,15 +175,6 @@ export const MoreOptions = forwardRef<
         href={`https://richelieu-manager.net/quest/${code}`}
         target="_blank"
       />
-      <MenuDivider />
-      <MenuItem
-        icon={IconNames.Heart}
-        labelElement={<Icon icon="share" />}
-        text={t('Star project, support the author')}
-        tagName="a"
-        href={`https://github.com/lawvs/poi-plugin-quest-2`}
-        target="_blank"
-      />
     </Menu>
   )
   return (

package/src/patch.ts

@@ -1,13 +1,8 @@
 import type { i18n } from 'i18next'
-import { QuestData } from '../build/kcanotifyGamedata'
-import { KcwikiQuestData } from '../build/kcQuestsData'
+import { QUEST_DATA } from '../build'
 import { importFromPoi, PACKAGE_NAME } from './poi/env'
 import { getPoiStore } from './poi/store'
-import {
-  checkIsKcwikiSupportedLanguages,
-  getStorage,
-  isSupportedLanguages,
-} from './store'
+import { getStorage } from './store'
 
 const LEGACY_QUEST_PLUGIN_ID = 'poi-plugin-quest-info'
 const HACK_KEY = `__patched-from-${PACKAGE_NAME}`
@@ -27,17 +22,13 @@ const isLegacyQuestPluginEnabled = async () => {
 }
 
 const getQuestState = (maybeLanguage: string) => {
-  const supported = isSupportedLanguages(maybeLanguage)
-  if (!supported) {
+  const dataSource = getStorage()?.dataSource
+  const sourceData = QUEST_DATA.find((i) => i.key === dataSource)
+  const defaultData = QUEST_DATA.find((i) => i.lang === maybeLanguage)
+  const data = (sourceData ?? defaultData)?.res
+  if (!data) {
     return {}
   }
-  const preferKcwikiData = getStorage()?.preferKcwikiData ?? true
-  const kcwikiSupported = checkIsKcwikiSupportedLanguages(maybeLanguage)
-
-  const data =
-    preferKcwikiData && kcwikiSupported
-      ? KcwikiQuestData[maybeLanguage]
-      : QuestData[maybeLanguage]
 
   return Object.fromEntries(
     Object.entries(data).map(([apiNo, d]) => {

package/src/questHelper.ts

@@ -1,7 +1,5 @@
 import moize from 'moize'
-import { KcwikiQuestData } from '../build/kcQuestsData'
 import newQuestData from '../build/kcQuestsData/quests-scn-new.json'
-import { QuestData } from '../build/kcanotifyGamedata'
 import prePostQuest from '../build/prePostQuest.json'
 import questCategory from '../build/questCategory.json'
 import questCodeMap from '../build/questCodeMap.json'
@@ -45,9 +43,6 @@ export type UnionQuest = {
   docQuest: DocQuest
 }
 
-export const getKcwikiQuestData = () => KcwikiQuestData
-export const getKcanotifyQuestData = () => QuestData
-
 const dailyQuest = new Set(questCategory.dailyQuest)
 const weeklyQuest = new Set(questCategory.weeklyQuest)
 const monthlyQuest = new Set(questCategory.monthlyQuest)

package/src/store/filterTags.ts

@@ -2,7 +2,7 @@ import { useCallback } from 'react'
 import { useUpdateEffect } from 'react-use'
 import { useGameTab } from '../poi/hooks'
 import { QuestTab } from '../poi/types'
-import { CATEGORY_TAGS, TYPE_TAGS } from '../tags'
+import type { CATEGORY_TAGS, TYPE_TAGS } from '../tags'
 import { ALL_CATEGORY_TAG, ALL_TYPE_TAG, PROGRESS_TAG, useStore } from './store'
 
 export const useFilterTags = () => {

package/src/store/gameQuest.tsx

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react'
 import React, { createContext, useContext } from 'react'
 import { useGameQuest } from '../poi/hooks'
-import { GameQuest } from '../poi/types'
+import type { GameQuest } from '../poi/types'
 import {
   QUEST_STATUS,
   getCompletedQuest,

package/src/store/index.ts

@@ -1,3 +1,2 @@
-export * from './store'
 export * from './quest'
-export * from './kcwiki'
+export * from './store'

package/src/store/quest.ts

@@ -1,47 +1,47 @@
+import { QUEST_DATA } from '../../build'
 import { usePluginTranslation } from '../poi/hooks'
 import {
   DocQuest,
-  getKcanotifyQuestData,
   getQuestIdByCode,
   QUEST_STATUS,
   UnionQuest,
 } from '../questHelper'
 import { useGlobalGameQuest, useGlobalQuestStatusQuery } from './gameQuest'
-import { checkIsKcwikiSupportedLanguages, useKcwikiData } from './kcwiki'
+import { DataSource, useStore } from './store'
 
-const DEFAULT_LANG = 'ja-JP'
-
-const checkIsKcanotifySupportedLanguages = (
-  lang: string,
-): lang is keyof typeof kcaQuestData => {
-  const kcaQuestData = getKcanotifyQuestData()
-  return lang in kcaQuestData
-}
-
-export const isSupportedLanguages = (
-  lang: string,
-): lang is keyof ReturnType<typeof getKcanotifyQuestData> =>
-  checkIsKcanotifySupportedLanguages(lang) ||
-  checkIsKcwikiSupportedLanguages(lang)
-
-export const useLanguage = () => {
+const useLanguage = () => {
   const {
     i18n: { language },
   } = usePluginTranslation()
-  const lang = checkIsKcanotifySupportedLanguages(language)
-    ? language
-    : DEFAULT_LANG
-  return lang
+  return language
 }
 
-const useQuestMap = (): Record<string, DocQuest> => {
+export const useDataSource = () => {
+  const {
+    store: { dataSource },
+    updateStore,
+  } = useStore()
   const lang = useLanguage()
-  const kcwikiData = useKcwikiData(lang)
-  if (kcwikiData) {
-    return kcwikiData
+  const setDataSource = (val: DataSource | null) =>
+    updateStore({ dataSource: val })
+  const isValid =
+    dataSource && Object.values(QUEST_DATA).find((i) => i.key === dataSource)
+  const normalizedDataSource = isValid
+    ? dataSource
+    : (QUEST_DATA.find((i) => i.lang === lang)?.key ?? QUEST_DATA[0].key)
+  return { dataSource: normalizedDataSource, setDataSource }
+}
+
+const useQuestMap = (): Record<string, DocQuest> => {
+  const { dataSource } = useDataSource()
+  if (!QUEST_DATA.length) {
+    throw new Error('QUEST_DATA is empty')
+  }
+  const data = QUEST_DATA.find((i) => i.key === dataSource)
+  if (!data) {
+    return QUEST_DATA[0].res
   }
-  const kcaQuestData = getKcanotifyQuestData()
-  return kcaQuestData[lang]
+  return data.res
 }
 
 export const useQuest = (): UnionQuest[] => {

package/src/store/store.tsx

@@ -7,8 +7,9 @@ import React, {
   useState,
 } from 'react'
 import { useMount, useUpdateEffect } from 'react-use'
+import type { QUEST_DATA } from '../../build'
 import { PACKAGE_NAME } from '../poi/env'
-import { noop, yes } from '../utils'
+import { yes } from '../utils'
 import { GameQuestProvider } from './gameQuest'
 
 export const ALL_CATEGORY_TAG = {
@@ -25,6 +26,9 @@ export enum PROGRESS_TAG {
   AlreadyCompleted = 'AlreadyCompleted',
 }
 
+type Unpacked<T> = T extends (infer U)[] ? U : T
+export type DataSource = Unpacked<typeof QUEST_DATA>['key']
+
 export const initialState = {
   searchInput: '',
   typeTags: {
@@ -35,7 +39,11 @@ export const initialState = {
   } as Record<string, boolean>,
   progressTag: PROGRESS_TAG.All,
   syncWithGame: false as const,
+  /**
+   * @deprecated
+   */
   preferKcwikiData: true,
+  dataSource: null as DataSource | null,
 }
 
 export type State = typeof initialState
@@ -110,16 +118,3 @@ export const useRemoveStorage = () => {
     updateStore(initialState)
   }
 }
-
-/**
- * @deprecated Use progress tag
- */
-export const useSyncWithGame = () => {
-  const setSyncWithGame = noop
-  const toggleSyncWithGame = noop
-  return {
-    syncWithGame: false as const,
-    setSyncWithGame,
-    toggleSyncWithGame,
-  }
-}

package/src/tags.tsx

@@ -1,8 +1,8 @@
 import { Tag } from '@blueprintjs/core'
 import React from 'react'
 import styled from 'styled-components'
-import { useGameTab, usePluginTranslation } from './poi/hooks'
-import { GameQuest, QuestTab } from './poi/types'
+import { usePluginTranslation } from './poi/hooks'
+import type { GameQuest } from './poi/types'
 import type { UnionQuest } from './questHelper'
 import {
   hasNewQuest,
@@ -24,12 +24,7 @@ import {
   isYearlyQuest,
   newQuestNumber,
 } from './questHelper'
-import {
-  ALL_CATEGORY_TAG,
-  ALL_TYPE_TAG,
-  PROGRESS_TAG,
-  useSyncWithGame,
-} from './store'
+import { ALL_CATEGORY_TAG, ALL_TYPE_TAG, PROGRESS_TAG } from './store'
 import { useFilterProgressTag, useFilterTags } from './store/filterTags'
 import { useGlobalGameQuest, useGlobalQuestStatusNum } from './store/gameQuest'
 
@@ -165,8 +160,6 @@ export const CategoryTags = () => {
 
 export const TypeTags = () => {
   const { t } = usePluginTranslation()
-  const gameTab = useGameTab()
-  const { syncWithGame } = useSyncWithGame()
   const gameQuests = useGlobalGameQuest()
   const { progressTag } = useFilterProgressTag()
 
@@ -175,8 +168,6 @@ export const TypeTags = () => {
   )
   const { typeTags, setTypeTags } = useFilterTags()
 
-  const limitSwitch = syncWithGame && gameTab !== QuestTab.ALL
-
   return (
     <TagsWrapper>
       <Tag
@@ -215,9 +206,7 @@ export const TypeTags = () => {
       {TYPE_TAGS.slice(3).map((tag) => (
         <Tag
           onClick={() => setTypeTags(tag.name)}
-          intent={
-            typeTags[tag.name] ? (limitSwitch ? 'warning' : 'primary') : 'none'
-          }
+          intent={typeTags[tag.name] ? 'primary' : 'none'}
           interactive={true}
           key={tag.name}
         >

package/tsconfig.json

@@ -44,7 +44,7 @@
     // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
     // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
     // "noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
-    // "importsNotUsedAsValues": "error",
+    "importsNotUsedAsValues": "error",
 
     /* Module Resolution Options */
     // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */

package/src/store/kcwiki.ts

@@ -1,33 +0,0 @@
-import { useStore } from '.'
-import { getKcwikiQuestData } from '../questHelper'
-
-export const usePreferKcwiki = () => {
-  const {
-    store: { preferKcwikiData },
-    updateStore,
-  } = useStore()
-  const setPreferKcwikiData = (val: boolean) =>
-    updateStore({ preferKcwikiData: val })
-  return [preferKcwikiData, setPreferKcwikiData] as const
-}
-
-export const checkIsKcwikiSupportedLanguages = (
-  lang: string,
-): lang is keyof typeof kcwikiQuestData => {
-  const kcwikiQuestData = getKcwikiQuestData()
-  return lang in kcwikiQuestData
-}
-
-export const useKcwikiData = (lang: string) => {
-  const [preferKcwiki] = usePreferKcwiki()
-  const supported = checkIsKcwikiSupportedLanguages(lang)
-
-  if (!preferKcwiki) {
-    return null
-  }
-  if (!supported) {
-    return null
-  }
-  const kcwikiQuestData = getKcwikiQuestData()
-  return kcwikiQuestData[lang]
-}