poi-plugin-quest-info-2 0.8.9 → 0.9.2

package/i18n/ko-KR.json

@@ -3,10 +3,11 @@
   "Show task information & enhance task panel": "임무 공략 데이터와 임무 패널 강화. 데이터는 [kcanotify](https://github.com/antest1/kcanotify-gamedata) & [KC3Kai](https://github.com/KC3Kai/kc3-translations) 에서 제공되고 있습니다.",
   "Search": "검색",
   "All": "전체",
-  "Locked": "잠김",
+  "Locked": "잠김 {{number}}",
+  "Unlocked": "잠김 풀림 {{number}}",
   "In Progress": "진행 중 {{number}}",
   "Completed": "달성",
-  "Already Completed": "완료",
+  "Already Completed": "완료 {{number}}",
   "Unknown": "알 수 없는 상태",
   "Version": "버전: {{version}}",
   "Data Version": "데이터 버전: {{version}}",

package/i18n/zh-CN.json

@@ -18,13 +18,13 @@
   "Quarterly": "季常",
   "Yearly": "年常",
   "One-time": "单次",
-  "Locked": "未解锁",
+  "Locked": "未解锁 {{number}}",
+  "Unlocked": "已解锁 {{number}}",
   "In Progress": "进行中 {{number}}",
   "Completed": "达成",
-  "Already Completed": "已完成",
+  "Already Completed": "已完成 {{number}}",
   "Unknown": "状态未知",
   "TotalQuests": "一共 {{number}} 个任务",
-  "Sync with game": "与游戏同步（仅展示游戏内任务）",
   "Version": "版本: {{version}}",
   "Data Version": "数据版本: {{version}}",
   "View source code on GitHub": "去 GitHub 查看源码",

package/i18n/zh-TW.json

@@ -18,13 +18,13 @@
   "Quarterly": "每季",
   "Yearly": "每年",
   "One-time": "單次",
-  "Locked": "未解鎖",
+  "Locked": "未解鎖 {{number}}",
+  "Unlocked": "已解鎖 {{number}}",
   "In Progress": "進行中 {{number}}",
   "Completed": "達成",
-  "Already Completed": "已完成",
+  "Already Completed": "已完成 {{number}}",
   "Unknown": "未知狀態",
   "TotalQuests": "一共 {{number}} 個任務",
-  "Sync with game": "與遊戲同步",
   "Version": "版本: {{version}}",
   "Data Version": "資料版本: {{version}}",
   "View source code on GitHub": "去 GitHub 查看源碼",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.8.9",
+  "version": "0.9.2",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",
@@ -31,7 +31,9 @@
     "storybook": "start-storybook -p 6006",
     "test": "jest",
     "typeCheck": "tsc --noEmit",
-    "update": "npm run downloadKcanotifyData && npm run downloadKcQuestsData && npm run genQuestData"
+    "update": "npm run downloadKcanotifyData && npm run downloadKcQuestsData && npm run genQuestData",
+    "changeset": "changeset",
+    "release": "npm run build && npm publish"
   },
   "dependencies": {
     "moize": "^6.1.1",
@@ -42,6 +44,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@blueprintjs/core": "^3.52.0",
+    "@changesets/cli": "^2.25.0",
     "@storybook/addon-actions": "^6.3.4",
     "@storybook/addon-essentials": "^6.3.4",
     "@storybook/addon-links": "^6.3.4",

package/shims/globals.d.ts

@@ -21,4 +21,10 @@ interface Window {
   language: string
   getStore: (path?: string) => any
   isMain: boolean
+
+  toast: (message: string) => void
+  // log: (message: string) => void
+  // warn: (message: string) => void
+  // error: (message: string) => void
+  // success: (message: string) => void
 }

package/src/Settings.tsx

@@ -1,15 +1,25 @@
-import React, { StrictMode, useCallback } from 'react'
-import { Button, AnchorButton, Text, Checkbox } from '@blueprintjs/core'
+import {
+  AnchorButton,
+  Button,
+  Checkbox,
+  Intent,
+  Text,
+  TextArea,
+} from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
+import type { ChangeEvent } from 'react'
+import React, { StrictMode, useCallback, useState } from 'react'
 import styled from 'styled-components'
-import { version as PACKAGE_VERSION, homepage } from '../package.json'
 import { version as DATA_VERSION } from '../build/kcanotifyGamedata'
-import { usePluginTranslation } from './poi/hooks'
+import { homepage, version as PACKAGE_VERSION } from '../package.json'
+import { IN_POI } from './poi/env'
+import { usePluginTranslation, useStateExporter } from './poi/hooks'
+import { tips } from './poi/utils'
 import {
-  useRemoveStorage,
   StoreProvider,
   useLanguage,
   usePreferKcwiki,
+  useRemoveStorage,
 } from './store'
 
 const Container = styled.div`
@@ -25,6 +35,54 @@ const Container = styled.div`
 
 const useIsSimplifiedChinese = () => useLanguage() === 'zh-CN'
 
+const DataExportArea = () => {
+  const [text, setText] = useState<string>('')
+  const { t } = usePluginTranslation()
+  const { exportQuestDataToClipboard, importAsPoiState } = useStateExporter()
+
+  const handleChange = useCallback((e: ChangeEvent<HTMLTextAreaElement>) => {
+    setText(e.target.value)
+  }, [])
+
+  const handleImportData = useCallback(() => {
+    importAsPoiState(text)
+    setText('')
+    tips.success(t('Import data success'))
+  }, [importAsPoiState, t, text])
+
+  const handleExportData = useCallback(async () => {
+    try {
+      await exportQuestDataToClipboard()
+      tips.success(t('Copied data to clipboard'))
+    } catch (error) {
+      console.error(error)
+      tips.error(t('Failed to export quest data! Please sync quest data first'))
+    }
+  }, [exportQuestDataToClipboard, t])
+
+  return IN_POI ? (
+    <Button
+      icon={IconNames.EXPORT}
+      text={t('Export quest data')}
+      onClick={handleExportData}
+    />
+  ) : (
+    <>
+      <TextArea
+        growVertically={false}
+        intent={Intent.PRIMARY}
+        onChange={handleChange}
+        value={text}
+      />
+      <Button
+        icon={IconNames.IMPORT}
+        text={t('Import quest data')}
+        onClick={handleImportData}
+      />
+    </>
+  )
+}
+
 const SettingsMain = () => {
   const { t } = usePluginTranslation()
   const isSimplifiedChinese = useIsSimplifiedChinese()
@@ -52,13 +110,15 @@ const SettingsMain = () => {
         text={t('View source code on GitHub')}
         href={homepage}
         target="_blank"
-      ></AnchorButton>
+      />
 
       <Button
         icon={IconNames.TRASH}
         text={t('Restore defaults')}
         onClick={removeStorage}
-      ></Button>
+      />
+
+      <DataExportArea />
     </>
   )
 }

package/src/Toolbar.tsx

@@ -1,14 +1,18 @@
-import { Button, InputGroup, Intent, Tooltip } from '@blueprintjs/core'
+import { Button, InputGroup } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { useCallback } from 'react'
 import { useThrottle } from 'react-use'
 import styled from 'styled-components'
-import { IN_POI } from './poi/env'
 import { usePluginTranslation } from './poi/hooks'
-import type { UnionQuest } from './questHelper'
-import { useQuest, useSyncWithGame } from './store'
-import { useFilterTags, useSyncGameTagEffect } from './store/filterTags'
+import { QUEST_STATUS, UnionQuest } from './questHelper'
+import { PROGRESS_TAG, useQuest } from './store'
+import {
+  useFilterProgressTag,
+  useFilterTags,
+  useSyncGameTagEffect,
+} from './store/filterTags'
+import { useGlobalQuestStatusQuery } from './store/gameQuest'
 import { useSearchInput } from './store/search'
 import { CategoryTags, CATEGORY_TAGS, TypeTags, TYPE_TAGS } from './tags'
 import { And, Or } from './utils'
@@ -23,30 +27,6 @@ const ToolbarWrapper = styled.div`
   }
 `
 
-const SyncButton = () => {
-  const { t } = usePluginTranslation()
-  const { searchInput } = useSearchInput()
-  const { syncWithGame, toggleSyncWithGame } = useSyncWithGame()
-  const handleClick = useCallback(() => {
-    toggleSyncWithGame()
-  }, [toggleSyncWithGame])
-  const intent = syncWithGame
-    ? searchInput
-      ? Intent.WARNING
-      : Intent.SUCCESS
-    : Intent.NONE
-  return (
-    <Tooltip content={t('Sync with game')}>
-      <Button
-        icon={IconNames.EXCHANGE}
-        intent={intent}
-        disabled={!IN_POI}
-        onClick={handleClick}
-      />
-    </Tooltip>
-  )
-}
-
 export const SearchInput: React.FC = () => {
   const { t } = usePluginTranslation()
   const { searchInput, setSearchInput } = useSearchInput()
@@ -70,7 +50,6 @@ export const SearchInput: React.FC = () => {
           {!!searchInput && (
             <Button icon={IconNames.CROSS} onClick={handleClear} />
           )}
-          <SyncButton></SyncButton>
         </>
       }
       type="text"
@@ -79,6 +58,7 @@ export const SearchInput: React.FC = () => {
 }
 
 export const Toolbar = () => {
+  // TODO remove
   useSyncGameTagEffect()
 
   return (
@@ -116,10 +96,43 @@ const useInputStringFilter = () => {
   return stringFilter
 }
 
-const useToolbarFilter = () => {
-  const stringFilter = useInputStringFilter()
+const useToolbarFilter = (): ((quest: UnionQuest) => boolean) => {
+  const searchFilter = useInputStringFilter()
   const { typeTags, categoryTags } = useFilterTags()
 
+  const { progressTag } = useFilterProgressTag()
+  const questStatusQuery = useGlobalQuestStatusQuery()
+
+  const progressTagFilter = useCallback(
+    (quest: UnionQuest): boolean => {
+      const questStatus = questStatusQuery(quest.gameId)
+      switch (progressTag) {
+        case PROGRESS_TAG.All:
+          return true
+        case PROGRESS_TAG.Locked:
+          return (
+            questStatus === QUEST_STATUS.LOCKED ||
+            questStatus === QUEST_STATUS.UNKNOWN
+          )
+        case PROGRESS_TAG.Unlocked:
+          return (
+            questStatus === QUEST_STATUS.DEFAULT ||
+            questStatus === QUEST_STATUS.IN_PROGRESS ||
+            questStatus === QUEST_STATUS.COMPLETED
+          )
+        case PROGRESS_TAG.AlreadyCompleted:
+          return (
+            questStatus === QUEST_STATUS.COMPLETED ||
+            questStatus === QUEST_STATUS.ALREADY_COMPLETED
+          )
+        default:
+          console.warn('Unknown progressTag type!', progressTag)
+      }
+      return true
+    },
+    [progressTag, questStatusQuery]
+  )
+
   const typeTagsFilter = Or(
     ...TYPE_TAGS.filter((tag) => typeTags[tag.name]).map((tag) => tag.filter)
   )
@@ -128,7 +141,14 @@ const useToolbarFilter = () => {
       (tag) => tag.filter
     )
   )
-  const toolbarFilter = And(stringFilter, typeTagsFilter, categoryTagsFilter)
+
+  const toolbarFilter = And(
+    searchFilter,
+    typeTagsFilter,
+    categoryTagsFilter,
+    progressTagFilter
+  )
+
   return toolbarFilter
 }
 

package/src/__tests__/fixtures/firstLoginWithOneComplete.json

@@ -0,0 +1,72 @@
+[
+  {
+    "api_no": 101,
+    "api_category": 1,
+    "api_type": 4,
+    "api_label_type": 1,
+    "api_state": 2,
+    "api_title": "はじめての「編成」！",
+    "api_detail": "２隻以上の艦で構成される「艦隊」を編成せよ！",
+    "api_voice_id": 0,
+    "api_get_material": [20, 20, 0, 0],
+    "api_bonus_flag": 1,
+    "api_progress_flag": 0,
+    "api_invalid_flag": 0
+  },
+  {
+    "api_no": 202,
+    "api_category": 2,
+    "api_type": 4,
+    "api_label_type": 1,
+    "api_state": 2,
+    "api_title": "はじめての「出撃」！",
+    "api_detail": "艦隊を出撃させ、敵艦隊と交戦せよ！",
+    "api_voice_id": 0,
+    "api_get_material": [20, 20, 0, 0],
+    "api_bonus_flag": 1,
+    "api_progress_flag": 0,
+    "api_invalid_flag": 0
+  },
+  {
+    "api_no": 301,
+    "api_category": 3,
+    "api_type": 4,
+    "api_label_type": 1,
+    "api_state": 3,
+    "api_title": "はじめての「演習」！",
+    "api_detail": "他の提督(プレイヤー)の艦隊と「演習」を行おう！",
+    "api_voice_id": 0,
+    "api_get_material": [10, 10, 0, 0],
+    "api_bonus_flag": 1,
+    "api_progress_flag": 0,
+    "api_invalid_flag": 0
+  },
+  {
+    "api_no": 601,
+    "api_category": 6,
+    "api_type": 4,
+    "api_label_type": 1,
+    "api_state": 2,
+    "api_title": "はじめての「建造」！",
+    "api_detail": "「工廠」で鋼材などの資材を使って新しい艦を「建造」しよう！",
+    "api_voice_id": 0,
+    "api_get_material": [50, 50, 50, 50],
+    "api_bonus_flag": 1,
+    "api_progress_flag": 0,
+    "api_invalid_flag": 0
+  },
+  {
+    "api_no": 701,
+    "api_category": 7,
+    "api_type": 4,
+    "api_label_type": 1,
+    "api_state": 1,
+    "api_title": "はじめての「近代化改修」！",
+    "api_detail": "任意の艦を近代化改修(合成)して、強化せよ！",
+    "api_voice_id": 0,
+    "api_get_material": [0, 0, 50, 30],
+    "api_bonus_flag": 1,
+    "api_progress_flag": 0,
+    "api_invalid_flag": 0
+  }
+]