fix($searchView): fix some type label don't show

public/_locales/en/messages.json

@@ -32,6 +32,10 @@
     "message": "RCT",
     "description": "Recently closed tabs label in search list"
   },
+  "keyword_label": {
+    "message": "keyword",
+    "description": "keyword label in search list"
+  },
   "contentScript_unavailable": {
     "message": "You cannot open a popup on this page because of browser restrictions.",
     "description": "a tip when content-script is unavailable"

public/_locales/zh_CN/messages.json

@@ -4,7 +4,7 @@
     "description": "扩展描述"
   },
   "contentHotKey": {
-    "message": "open crown extension in your current page",
+    "message": "在网页中打开 Crown 扩展",
     "description": "在网页中唤起 Crown 扩展"
   },
   "searchPlaceholder": {
@@ -32,6 +32,10 @@
     "message": "最近关闭",
     "description": "最近关闭的标签页在搜索列表中的标识"
   },
+  "keyword_label": {
+    "message": "关键词",
+    "description": "检索触发关键词在搜索列表中的标识"
+  },
   "contentScript_unavailable": {
     "message": "因为浏览器的限制, 您无法在改页面唤醒 Crown 扩展",
     "description": "content-script 不可用时的提示语"

src/api/index.ts

@@ -128,7 +128,7 @@ async function queryRecentLyClosed(queryQueue: string[]) {
       isEachEligible(queryQueue, `${item.tab.url} ${item.tab.title}`)
     ) {
       temp.push({
-        type: 'closedTab',
+        type: 'RCT',
         title: item.tab.title,
         subtitle: item.tab.url,
         id: item.tab.sessionId as string,

src/background/default-config.ts

@@ -10,7 +10,7 @@ const defaultConfig: ExtensionConfig = {
       keyword: 't',
       desc: 'Tabs',
     },
-    recentlyClosedTab: {
+    RCT: {
       isDefault: false,
       keyword: 'rct',
       desc: 'Recently Closed Tabs',

src/background/filter-search-data.ts

@@ -1,5 +1,5 @@
 import { queryBM, queryRecentLyClosed, queryTab } from '@/api'
-import { isEachEligible } from '@/common/utils'
+import { getKeys, isEachEligible } from '@/common/utils'
 import store from '@/store'
 
 const extConfig: Readonly<ExtensionConfig> = store.state.config
@@ -24,7 +24,8 @@ function searchKeyword(splitSearchStr: string[]) {
 // Get an array which need to search
 function filterKeyword(splitSearchStr: string[]) {
   const temp: SingleSearch[] = []
-  Object.entries(extConfig.itemSet).some(([key, value]) => {
+  getKeys(extConfig.itemSet).some(key => {
+    const value = extConfig.itemSet[key]
     if (value.keyword === splitSearchStr[0]) {
       // Only search for a category
       temp.length = 0
@@ -63,7 +64,7 @@ async function searchFromType(item: SingleSearch) {
     case 'tab':
       result = await queryTab(item.searchQueue)
       break
-    case 'closedTab':
+    case 'RCT':
       result = await queryRecentLyClosed(item.searchQueue)
       break
     default:

src/background/handle-selected-item.ts

@@ -8,7 +8,7 @@ function handleSelectedItem(item: QueryResultItem) {
     case 'tab':
       updateTabStatus(item.id as number)
       break
-    case 'closedTab':
+    case 'RCT':
       restoreRecentTab(item.id as string)
       break
 

src/common/utils.ts

@@ -15,4 +15,7 @@ function isEachEligible(arr: any[], tested: string): boolean {
   return arr.every(item => new RegExp(`${item}`, 'gi').test(tested))
 }
 
-export { encodeXml, isEachEligible }
+const getKeys = <T extends {}>(o: T): Array<keyof T> =>
+  Object.keys(o) as Array<keyof T>
+
+export { encodeXml, isEachEligible, getKeys }

src/components/searchView.vue

@@ -163,6 +163,6 @@ export default Vue.extend({
 })
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 @import '~@/stylus/popup';
 </style>

src/store.ts

@@ -6,20 +6,20 @@ import createPersistedState from 'vuex-persistedstate'
 Vue.use(Vuex)
 
 interface ChangeItemConfigPayload {
-  type: 'bookmark' | 'tab' | 'recentlyClosedTab'
+  type: 'bookmark' | 'tab' | 'RCT'
   key: 'isDefault' | 'keyword'
   value: string | boolean
 }
 
 export default new Vuex.Store({
   strict: process.env.NODE_ENV !== 'production',
   state: {
-    config: defaultConfig
+    config: defaultConfig,
   },
   mutations: {
     changeItemConfig(state, payload: ChangeItemConfigPayload) {
       state.config.itemSet[payload.type][payload.key] = payload.value
-    }
+    },
   },
-  plugins: [ createPersistedState() ]
+  plugins: [createPersistedState()],
 })

src/types/crown.d.ts

@@ -16,25 +16,11 @@ interface ItemConfig {
   desc: string
 }
 
-interface ItemConfigSet {
-  /** The related settings of bookmark */
-  bookmark: ItemConfig
-  /** The related settings of tab */
-  tab: ItemConfig
-  /** The related settings of recently closed tab */
-  recentlyClosedTab: ItemConfig
-}
-
 interface ExtensionConfig {
   /** Single setting */
   itemSet: ItemConfigSet
 }
 
-interface SingleSearch {
-  type: string
-  searchQueue: string[]
-}
-
 interface SingleOmniboxSearch {
   content: string
   description: string
@@ -67,9 +53,11 @@ interface CMessage4 extends CMessageBasic {
 
 type CMessage = CMessage1 | CMessage2 | CMessage3 | CMessage4
 
+type CMessageType = 'tab' | 'bookmark' | 'RCT' | 'keyword'
+
 interface QueryResultItem {
   /** item of search result's type */
-  type: 'tab' | 'bookmark' | 'closedTab' | 'keyword'
+  type: CMessageType
   /** item of search result's main text */
   title: string | undefined
   /** item of search result's sub text */
@@ -81,3 +69,17 @@ interface QueryResultItem {
   /** item keyword */
   keyword?: string
 }
+
+interface SingleSearch {
+  type: CMessageType
+  searchQueue: string[]
+}
+
+interface ItemConfigSet {
+  /** The related settings of bookmark */
+  bookmark: ItemConfig
+  /** The related settings of tab */
+  tab: ItemConfig
+  /** The related settings of recently closed tab */
+  RCT: ItemConfig
+}

src/views/Options.vue

@@ -91,11 +91,11 @@ export default Vue.extend({
     },
     isRCTDefault: {
       get(): boolean {
-        return this.$store.state.config.itemSet.recentlyClosedTab.isDefault
+        return this.$store.state.config.itemSet.RCT.isDefault
       },
       set(value: boolean) {
         this.$store.commit('changeItemConfig', {
-          type: 'recentlyClosedTab',
+          type: 'RCT',
           key: 'isDefault',
           value,
         })
@@ -127,11 +127,11 @@ export default Vue.extend({
     },
     RCTKeyword: {
       get(): string {
-        return this.$store.state.config.itemSet.recentlyClosedTab.keyword
+        return this.$store.state.config.itemSet.RCT.keyword
       },
       set(value: string) {
         this.$store.commit('changeItemConfig', {
-          type: 'recentlyClosedTab',
+          type: 'RCT',
           key: 'keyword',
           value,
         })