poi-plugin-quest-info-2 0.7.1 → 0.7.2

package/README.md

@@ -9,6 +9,8 @@ A [poi](https://github.com/poooi/poi) plugin that helps you view quest info. Dat
 
 ## Installation
 
+Paste `poi-plugin-quest-info-2` in the plugins tab and click the install button.
+
 ![image](https://user-images.githubusercontent.com/18554747/161830757-0a4e500c-f246-4dbd-820d-0b9a9c5a34a4.png)
 
 ## Features

package/i18n/en-US.json

@@ -11,7 +11,7 @@
   "Arsenal": "Arsenal",
   "Modernization": "Modernization",
   "Others": "Others",
-  "New": "New",
+  "New": "New {{number}}",
   "Daily": "Daily",
   "Weekly": "Weekly",
   "Monthly": "Monthly",
@@ -19,9 +19,9 @@
   "Yearly": "Yearly",
   "One-time": "One-time",
   "Locked": "Locked",
-  "In Progress": "In Progress",
+  "In Progress": "In Progress {{number}}",
   "Completed": "Completed",
-  "TotalQuests": "Total {{count}} quests",
+  "TotalQuests": "Total {{number}} quests",
   "Sync with game": "Sync with game (Show in-game quests only)",
   "Version": "Version: {{version}}",
   "Data Version": "Data Version: {{version}}",

package/i18n/ja-JP.json

@@ -11,7 +11,7 @@
   "Arsenal": "工廠",
   "Modernization": "改装",
   "Others": "その他",
-  "New": "最新任務",
+  "New": "最新任務 {{number}}",
   "Daily": "デイリー",
   "Weekly": "ウィークリー",
   "Monthly": "マンスリー",
@@ -19,9 +19,9 @@
   "Yearly": "イヤーリー",
   "One-time": "単発",
   "Locked": "ロック中",
-  "In Progress": "進行中",
+  "In Progress": "進行中 {{number}}",
   "Completed": "完了",
-  "TotalQuests": "全て {{count}} 個の任務",
+  "TotalQuests": "全て {{number}} 個の任務",
   "Sync with game": "ゲームと連動(インゲームクエストのみ表示する)",
   "Version": "バージョン: {{version}}",
   "Data Version": "データ バージョン: {{version}}",

package/i18n/ko-KR.json

@@ -4,7 +4,7 @@
   "Search": "검색",
   "All": "전체",
   "Locked": "잠김",
-  "In Progress": "진행 중",
+  "In Progress": "진행 중 {{number}}",
   "Completed": "완료",
   "Version": "버전: {{version}}",
   "Data Version": "데이터 버전: {{version}}",

package/i18n/zh-CN.json

@@ -11,7 +11,7 @@
   "Arsenal": "工厂",
   "Modernization": "改装",
   "Others": "其他",
-  "New": "新任务",
+  "New": "新任务 {{number}}",
   "Daily": "日常",
   "Weekly": "周常",
   "Monthly": "月常",
@@ -19,9 +19,9 @@
   "Yearly": "年常",
   "One-time": "单次",
   "Locked": "未解锁",
-  "In Progress": "进行中",
+  "In Progress": "进行中 {{number}}",
   "Completed": "已完成",
-  "TotalQuests": "一共 {{count}} 个任务",
+  "TotalQuests": "一共 {{number}} 个任务",
   "Sync with game": "与游戏同步（仅展示游戏内任务）",
   "Version": "版本: {{version}}",
   "Data Version": "数据版本: {{version}}",

package/i18n/zh-TW.json

@@ -11,7 +11,7 @@
   "Arsenal": "工廠",
   "Modernization": "改装",
   "Others": "其他",
-  "New": "新任務",
+  "New": "新任務 {{number}}",
   "Daily": "每日",
   "Weekly": "每週",
   "Monthly": "每月",
@@ -19,9 +19,9 @@
   "Yearly": "每年",
   "One-time": "單次",
   "Locked": "未解鎖",
-  "In Progress": "進行中",
+  "In Progress": "進行中 {{number}}",
   "Completed": "已完成",
-  "TotalQuests": "一共 {{count}} 個任務",
+  "TotalQuests": "一共 {{number}} 個任務",
   "Sync with game": "與遊戲同步",
   "Version": "版本: {{version}}",
   "Data Version": "資料版本: {{version}}",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",

package/src/App.tsx

@@ -31,7 +31,7 @@ const Main: React.FC = () => {
   return (
     <>
       <Toolbar></Toolbar>
-      <CountText>{t('TotalQuests', { count: quests.length })}</CountText>
+      <CountText>{t('TotalQuests', { number: quests.length })}</CountText>
       <QuestList quests={quests}></QuestList>
     </>
   )

package/src/Toolbar.tsx

@@ -1,4 +1,4 @@
-import { Button, InputGroup, Intent, Tag, Tooltip } from '@blueprintjs/core'
+import { Button, InputGroup, Intent, Tooltip } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { useCallback } from 'react'
@@ -10,12 +10,7 @@ import type { UnionQuest } from './questHelper'
 import { useQuest, useSyncWithGame } from './store'
 import { useFilterTags, useSyncGameTagEffect } from './store/filterTags'
 import { useSearchInput } from './store/search'
-import {
-  ALL_CATEGORY_TAG,
-  ALL_TYPE_TAG,
-  CATEGORY_TAGS,
-  TYPE_TAGS,
-} from './tags'
+import { CategoryTags, CATEGORY_TAGS, TypeTags, TYPE_TAGS } from './tags'
 
 const ToolbarWrapper = styled.div`
   display: flex;
@@ -27,15 +22,6 @@ const ToolbarWrapper = styled.div`
   }
 `
 
-const TagsWrapper = styled.div`
-  margin-left: -4px;
-  margin-right: -4px;
-
-  & > * {
-    margin: 4px;
-  }
-`
-
 const SyncButton = () => {
   const { t } = usePluginTranslation()
   const { searchInput } = useSearchInput()
@@ -91,62 +77,14 @@ export const SearchInput: React.FC = () => {
   )
 }
 
-const Tags = () => {
-  const { t } = usePluginTranslation()
-
+export const Toolbar = () => {
   useSyncGameTagEffect()
 
-  const { typeTags, categoryTags, setCategoryTags, setTypeTags } =
-    useFilterTags()
-
-  return (
-    <>
-      <TagsWrapper>
-        {CATEGORY_TAGS.map(({ name }) => (
-          <Tag
-            onClick={() => setCategoryTags(name)}
-            intent={
-              categoryTags[name]
-                ? name === ALL_CATEGORY_TAG.name
-                  ? 'success'
-                  : 'primary'
-                : 'none'
-            }
-            interactive={true}
-            key={name}
-          >
-            {t(name)}
-          </Tag>
-        ))}
-      </TagsWrapper>
-      <TagsWrapper>
-        {TYPE_TAGS.map((tag) => (
-          <Tag
-            onClick={() => setTypeTags(tag.name)}
-            intent={
-              typeTags[tag.name]
-                ? tag.name === ALL_TYPE_TAG.name
-                  ? 'success'
-                  : 'primary'
-                : 'none'
-            }
-            interactive={true}
-            key={tag.name}
-          >
-            {t(tag.name)}
-            {'suffix' in tag && ' ' + tag.suffix}
-          </Tag>
-        ))}
-      </TagsWrapper>
-    </>
-  )
-}
-
-export const Toolbar = () => {
   return (
     <ToolbarWrapper>
       <SearchInput></SearchInput>
-      <Tags></Tags>
+      <CategoryTags />
+      <TypeTags />
     </ToolbarWrapper>
   )
 }

package/src/questHelper.ts

@@ -42,9 +42,9 @@ const yearlyQuest = new Set(questCategory.yearlyQuest)
 const singleQuest = new Set(questCategory.singleQuest)
 const newQuest = new Set(newQuestData)
 
-export const isInProgressQuest = (quest: UnionQuest) =>
-  quest.gameQuest?.api_state === QUEST_API_STATE.IN_PROGRESS ||
-  quest.gameQuest?.api_state === QUEST_API_STATE.COMPLETED
+export const isInProgressQuest = (quest: GameQuest) =>
+  quest.api_state === QUEST_API_STATE.IN_PROGRESS ||
+  quest.api_state === QUEST_API_STATE.COMPLETED
 
 export const isDailyQuest = (quest: UnionQuest) => dailyQuest.has(quest.gameId)
 export const isWeeklyQuest = (quest: UnionQuest) =>

package/src/tags.tsx

@@ -0,0 +1,172 @@
+import { Tag } from '@blueprintjs/core'
+import React from 'react'
+import styled from 'styled-components'
+import { IN_POI } from './poi/env'
+import { useGameQuest, useGameTab, usePluginTranslation } from './poi/hooks'
+import { GameQuest, QuestTab } from './poi/types'
+import type { UnionQuest } from './questHelper'
+import {
+  hasNewQuest,
+  isArsenalQuest,
+  isCompositionQuest,
+  isDailyQuest,
+  isExerciseQuest,
+  isExpeditionQuest,
+  isInProgressQuest,
+  isModernizationQuest,
+  isMonthlyQuest,
+  isNewQuest,
+  isQuarterlyQuest,
+  isSingleQuest,
+  isSortieQuest,
+  isSupplyOrDockingQuest,
+  isUnknownCategoryQuest,
+  isWeeklyQuest,
+  isYearlyQuest,
+  newQuestNumber,
+} from './questHelper'
+import { useSyncWithGame } from './store'
+import { useFilterTags } from './store/filterTags'
+
+const yes = () => true as const
+
+export const ALL_CATEGORY_TAG = {
+  name: 'All',
+  filter: yes,
+} as const
+
+export const ALL_TYPE_TAG = ALL_CATEGORY_TAG
+
+const withDocQuest =
+  <T extends any>(filterFn: (q: UnionQuest['docQuest']) => T) =>
+  (unionQuest: UnionQuest) =>
+    filterFn(unionQuest.docQuest)
+
+const withGameQuestOr =
+  <T extends any>(filterFn: (q: GameQuest) => T, fallback: T) =>
+  ({ gameQuest }: UnionQuest) => {
+    if (!gameQuest) {
+      return fallback
+    }
+    return filterFn(gameQuest)
+  }
+
+export const CATEGORY_TAGS = [
+  ALL_CATEGORY_TAG,
+  { 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 = [
+  ALL_TYPE_TAG,
+  {
+    name: 'In Progress',
+    filter: withGameQuestOr(isInProgressQuest, false),
+  },
+  { name: 'New', filter: isNewQuest },
+  { name: 'Daily', filter: isDailyQuest },
+  { name: 'Weekly', filter: isWeeklyQuest },
+  { name: 'Monthly', filter: isMonthlyQuest },
+  { name: 'One-time', filter: isSingleQuest },
+  { name: 'Quarterly', filter: isQuarterlyQuest },
+  { name: 'Yearly', filter: isYearlyQuest },
+] as const
+
+// TODO tag Lock / Completed
+
+const TagsWrapper = styled.div`
+  margin-left: -4px;
+  margin-right: -4px;
+
+  & > * {
+    margin: 4px;
+  }
+`
+
+export const CategoryTags = () => {
+  const { t } = usePluginTranslation()
+
+  const { categoryTags, setCategoryTags } = useFilterTags()
+  return (
+    <TagsWrapper>
+      {CATEGORY_TAGS.map(({ name }) => (
+        <Tag
+          onClick={() => setCategoryTags(name)}
+          intent={
+            categoryTags[name]
+              ? name === ALL_CATEGORY_TAG.name
+                ? 'success'
+                : 'primary'
+              : 'none'
+          }
+          interactive={true}
+          key={name}
+        >
+          {t(name)}
+        </Tag>
+      ))}
+    </TagsWrapper>
+  )
+}
+
+export const TypeTags = () => {
+  const { t } = usePluginTranslation()
+  const gameTab = useGameTab()
+  const { syncWithGame } = useSyncWithGame()
+  const gameQuests = useGameQuest()
+  const inProgressQuest = gameQuests.filter((gameQuest) =>
+    isInProgressQuest(gameQuest)
+  )
+  const { typeTags, setTypeTags } = useFilterTags()
+
+  const limitSwitch = syncWithGame && gameTab !== QuestTab.ALL
+
+  return (
+    <TagsWrapper>
+      <Tag
+        intent={typeTags['All'] ? 'success' : 'none'}
+        interactive={true}
+        onClick={() => setTypeTags('All')}
+      >
+        {t('All')}
+      </Tag>
+      {IN_POI && (
+        <Tag
+          intent={typeTags['In Progress'] ? 'primary' : 'none'}
+          interactive={true}
+          onClick={() => setTypeTags('In Progress')}
+        >
+          {t('In Progress', { number: inProgressQuest.length })}
+        </Tag>
+      )}
+      {hasNewQuest && (
+        <Tag
+          intent={typeTags['New'] ? 'primary' : 'none'}
+          interactive={true}
+          onClick={() => setTypeTags('New')}
+        >
+          {t('New', { number: newQuestNumber })}
+        </Tag>
+      )}
+
+      {TYPE_TAGS.slice(3).map((tag) => (
+        <Tag
+          onClick={() => setTypeTags(tag.name)}
+          intent={
+            typeTags[tag.name] ? (limitSwitch ? 'warning' : 'primary') : 'none'
+          }
+          interactive={true}
+          key={tag.name}
+        >
+          {t(tag.name)}
+        </Tag>
+      ))}
+    </TagsWrapper>
+  )
+}

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +0,0 @@
----
-name: Bug report 代码缺陷汇报
-about: Create a report to help us improve 汇报程序代码错误
----
-
-**poi 版本 / poi version:**
-
-**操作系统 / OS:**
-
-**插件版本 / Plugin version:**
-
-**你遇到了什么样的问题 / The problem you've met:**
-
-**有没有重现的方法，或者与问题相关的任何信息 / How to reproduce, or any information that might be related:**

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,12 +0,0 @@
----
-name: Feature request 功能建议
-about: Suggest an idea 帮助我们改进插件的功能
----
-
-**poi 版本 / poi version:**
-
-**操作系统 / OS:**
-
-**插件版本 / Plugin version:**
-
-**功能的详细描述 / Details on the feature:**

package/.github/workflows/build.yml

@@ -1,51 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        node-version: [16.x]
-        os: [ubuntu-latest]
-
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install node modules
-        uses: bahmutov/npm-install@v1
-
-      - name: Build
-        run: npm run build
-
-      - name: Lint
-        run: npm run lint -- --max-warnings=0
-
-      - name: Type check
-        run: npm run typeCheck
-
-      - name: Test
-        run: npm run test -- --coverage
-
-      - name: Build storybook
-        run: npm run build-storybook
-
-      - name: Deploy GitHub Pages
-        if: github.ref == 'refs/heads/main'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: storybook-static
-          force_orphan: true

package/.github/workflows/publish.yml

@@ -1,45 +0,0 @@
-name: Publish
-
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        node-version: [16.x]
-        os: [ubuntu-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install node modules
-        uses: bahmutov/npm-install@v1
-
-      - name: Build
-        run: npm run build
-
-      - name: Lint
-        run: npm run lint -- --max-warnings=0
-
-      - name: Type check
-        run: npm run typeCheck
-
-      - name: Test
-        run: npm test
-
-      - name: Publish
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.vscode/extensions.json

@@ -1,6 +0,0 @@
-{
-  "recommendations": [
-    "dbaeumer.vscode-eslint",
-    "streetsidesoftware.code-spell-checker"
-  ]
-}

package/.vscode/settings.json

@@ -1,11 +0,0 @@
-{
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
-  "npm.packageManager": "npm",
-  "cSpell.words": [
-    "Kcanotify",
-    "Kcwiki"
-  ]
-}

package/src/tags.ts

@@ -1,66 +0,0 @@
-import { IN_POI } from './poi/env'
-import {
-  isDailyQuest,
-  isMonthlyQuest,
-  isQuarterlyQuest,
-  isWeeklyQuest,
-  isYearlyQuest,
-  isCompositionQuest,
-  isSortieQuest,
-  isExerciseQuest,
-  isExpeditionQuest,
-  isSupplyOrDockingQuest,
-  isArsenalQuest,
-  isModernizationQuest,
-  isUnknownCategoryQuest,
-  isInProgressQuest,
-  isSingleQuest,
-  hasNewQuest,
-  isNewQuest,
-  newQuestNumber,
-} from './questHelper'
-import type { UnionQuest } from './questHelper'
-
-const yes = () => true as const
-
-export const ALL_CATEGORY_TAG = {
-  name: 'All',
-  filter: yes,
-} as const
-
-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: 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 = [
-  ALL_TYPE_TAG,
-  ...(IN_POI
-    ? ([{ name: 'In Progress', filter: isInProgressQuest }] as const)
-    : []),
-  ...(hasNewQuest
-    ? ([{ name: 'New', filter: isNewQuest, suffix: newQuestNumber }] as const)
-    : []),
-  { name: 'Daily', filter: isDailyQuest },
-  { name: 'Weekly', filter: isWeeklyQuest },
-  { name: 'Monthly', filter: isMonthlyQuest },
-  { name: 'One-time', filter: isSingleQuest },
-  { name: 'Quarterly', filter: isQuarterlyQuest },
-  { name: 'Yearly', filter: isYearlyQuest },
-] as const
-
-// TODO tag In Progress / Lock / Completed