Open KT & Operation addresses when searching (#363)

* Move to KT1 or TZ1

* wait until suggests are loaded

* use already written code

package.json

@@ -14,6 +14,7 @@
     "@sentry/integrations": "^5.27.6",
     "@taquito/beacon-wallet": "^11.0.2",
     "@taquito/taquito": "^11.0.2",
+    "async-wait-until": "^2.0.12",
     "axios": "^0.21.4",
     "bignumber.js": "^9.0.1",
     "bs58check": "^2.1.2",

src/components/SearchBox.vue

@@ -184,6 +184,8 @@ import {
   removeHistoryItem,
 } from "@/utils/history.js";
 import {SEARCH_TABS} from "../constants/searchTabs";
+import { isKT1Address, isOperationHash } from "../utils/tz";
+import waitUntil from "async-wait-until";
 
 export default {
   props: {
@@ -197,19 +199,23 @@ export default {
     _locked: false,
     _timerId: null,
     isFocused: false,
+    isSearchCalled: false,
     seqno: 0,
     menuProps: {},
   }),
   created() {
     this.suggests = this.getHistoryItems("");
   },
+  destroyed() {
+    clearTimeout(this._timerId);
+  },
   computed: {
     searchBoxClassName() {
       if (this.isFocused) {
         return 'focused-searchbar';
       }
       return 'unfocused-searchbar';
-    }
+    },
   },
   methods: {
     ...mapActions(["showError"]),
@@ -284,14 +290,31 @@ export default {
       }
       return historyItem;
     },
-    onEnter(searchText) {
+    async onEnter(searchText) {
       this.isFocused = true;
 
+      await waitUntil(() => this.isSearchCalled === false);
+      if (isKT1Address(searchText)) {
+        const firstContractSuggest = this.suggests.find((suggest) => suggest.type === 'contract');
+        if (firstContractSuggest) {
+          const { body } = firstContractSuggest;
+          await this.$router.push({path: `/${body.network}/${body.address}`});
+          return;
+        }
+      }
+      if (isOperationHash(searchText)) {
+        const firstOperationSuggest = this.suggests.find((suggest) => suggest.type === 'operation');
+        if (firstOperationSuggest) {
+          const { body } = firstOperationSuggest;
+          await this.$router.push({path: `/${body.network}/opg/${body.hash}`});
+          return;
+        }
+      }
       if (searchText !== null && searchText.length > 2) {
         addHistoryItem({
           value: searchText,
         });
-        this.$router.push({ name: "search", query: { text: searchText } });
+        await this.$router.push({ name: "search", query: { text: searchText } });
       }
     },
     getHistoryItems(searchText) {
@@ -321,6 +344,7 @@ export default {
     fetchSearchDebounced(text, seqno) {
       if (!text || text.length < 3) return;
 
+      this.isSearchCalled = true;
       clearTimeout(this._timerId);
 
       this._timerId = setTimeout(() => {
@@ -344,6 +368,7 @@ export default {
           })
           .finally(() => {
             this.isSuggestionsLoading = false;
+            this.isSearchCalled = false;
           });
       }, 500);
     },

src/utils/tz.js

@@ -100,3 +100,11 @@ export function round(value, decimals) {
     }
     return parseFloat((value / 10 ** decimals).toFixed(decimals));
 }
+
+export function isKT1Address(val) {
+    return /^(KT)[1-9A-HJ-NP-Za-km-z]{34}$/.test(val);
+}
+
+export function isOperationHash(val) {
+    return /^o[1-9A-HJ-NP-Za-km-z]{50}$/.test(val);
+}

src/views/extended_search/ExtendedSearch.vue

@@ -322,12 +322,6 @@ export default {
           });
       }, 500);
     },
-    isAddress() {
-      return /^(tz|KT)[1-9A-HJ-NP-Za-km-z]{34}$/.test(this.searchText);
-    },
-    isOpgHash() {
-      return /^o[1-9A-HJ-NP-Za-km-z]{50}$/.test(this.searchText);
-    },
     clearTotal() {
       this.suggests = [];
       this.total = 0;