From 7f01e26a2df7e6dfb7c3e17278b333375fae6b32 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sun, 15 Mar 2020 22:44:36 +0300
Subject: [PATCH] Adapt search for auto linker, admin token and auth settings

---
 src/store/modules/normalizers.js                            | 4 ++--
 .../settings/components/inputComponents/CrontabInput.vue    | 2 +-
 src/views/settings/index.vue                                | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js
index c7dca1b6..6eecebca 100644
--- a/src/store/modules/normalizers.js
+++ b/src/store/modules/normalizers.js
@@ -283,9 +283,9 @@ export const formSearchObject = description => {
     const searchArray = _.compact([setting.key, setting.label, setting.description]).map(el => el.toLowerCase())
     const resultObject = { label: setting.label, key: setting.key || setting.group, groupKey: setting.key || setting.group, groupLabel: setting.label, search: searchArray }
     if (setting.children) {
-      const updatedAcc = [...acc, resultObject]
+      const updatedAcc = !setting.key && setting.group === ':pleroma' ? acc : [...acc, resultObject]
       return [...updatedAcc, ...parseNestedSettings(setting.children, setting.label, setting.key || setting.group)]
     }
-    return [...acc, resultObject]
+    return !setting.key && setting.group === ':pleroma' ? acc : [...acc, resultObject]
   }, [])
 }
diff --git a/src/views/settings/components/inputComponents/CrontabInput.vue b/src/views/settings/components/inputComponents/CrontabInput.vue
index f3f16d26..89a14915 100644
--- a/src/views/settings/components/inputComponents/CrontabInput.vue
+++ b/src/views/settings/components/inputComponents/CrontabInput.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form :label-width="labelWidth" :label-position="isMobile ? 'top' : 'right'" class="crontab">
-    <el-form-item v-for="worker in workers" :key="worker" :label="worker" class="crontab-container">
+    <el-form-item v-for="worker in workers" :key="worker" :label="worker" :data-search="setting.key" class="crontab-container">
       <el-input
         :value="data[worker]"
         :placeholder="getSuggestion(worker) || null"
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 76fe458f..048939a3 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -226,7 +226,7 @@ export default {
     },
     async handleSearchSelect(selectedValue) {
       const tab = Object.keys(this.tabs).find(tab => {
-        return this.tabs[tab].settings.includes(selectedValue.group)
+        return this.tabs[tab].settings.includes(selectedValue.group === ':pleroma' ? selectedValue.key : selectedValue.group)
       })
       await this.$store.dispatch('SetActiveTab', tab)
       const selectedSetting = document.querySelector(`[data-search="${selectedValue.key}"]`)
@@ -237,7 +237,9 @@ export default {
     querySearch(queryString, cb) {
       const results = this.searchData.filter(searchObj => searchObj.search.find(el => el.includes(queryString.toLowerCase())))
         .map(searchObj => {
-          return { value: `${searchObj.label} in ${searchObj.groupLabel}`, group: searchObj.groupKey, key: searchObj.key }
+          return searchObj.groupKey === ':opts'
+            ? { value: `${searchObj.label} in Auto Linker`, group: searchObj.groupKey, key: searchObj.key }
+            : { value: `${searchObj.label} in ${searchObj.groupLabel}`, group: searchObj.groupKey, key: searchObj.key }
         })
       cb(results)
     }