Merge pull request #243 from edmcouncil/242-search-results-unclickable

Search results unclickable
edmcouncil · Sep 6, 2022 · 0c0d4e1 · 0c0d4e1
2 parents fbd9f43 + e0618d4
commit 0c0d4e1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/auto/src/views/Ontology.vue b/auto/src/views/Ontology.vue
@@ -959,6 +959,7 @@
 <script>
 import { mapState } from 'vuex';
 import Multiselect from 'vue-multiselect';
+import customLink from '../components/chunks/link';
 import {
   getEntity, getFindSearch, getModules, getOntologyVersions, getHint,
 } from '../api/ontology';
@@ -971,6 +972,7 @@ export default {
     Stats: () => import(/* webpackChunkName: "Stats" */ "../components/StatsComponent"),
     ResourceSection: () => import(/* webpackChunkName: "ResourceSection" */ "../components/Ontology/ResourceSection"),
     DownloadSection: () => import(/* webpackChunkName: "DownloadSection" */ "../components/Ontology/DownloadSection"),
+    customLink,
     Multiselect,
   },
   props: ['ontology'],

diff --git a/fibo/src/views/Ontology.vue b/fibo/src/views/Ontology.vue
@@ -1133,6 +1133,7 @@
 <script>
 import { mapState } from "vuex";
 import Multiselect from "vue-multiselect";
+import customLink from '../components/chunks/link';
 import { getEntity, getModules, getOntologyVersions, getFindSearch, getFindProperties } from "../api/ontology";
 
 export default {
@@ -1143,6 +1144,7 @@ export default {
     StatsComponent: () => import(/* webpackChunkName: "Stats" */ "../components/StatsComponent"),
     ResourceSection: () => import(/* webpackChunkName: "ResourceSection" */ "../components/Ontology/ResourceSection"),
     DownloadSection: () => import(/* webpackChunkName: "DownloadSection" */ "../components/Ontology/DownloadSection"),
+    customLink,
     Multiselect,
   },
   props: ["ontology"],
@@ -1224,9 +1226,9 @@ export default {
     this.updateServers();
 
     this.query = queryParam;
+    this.fetchSearchProperties();
     this.fetchData(this.query);
     this.fetchModules();
-    this.fetchSearchProperties();
   },
   methods: {
     toggleModuleTree() {
@@ -1528,6 +1530,11 @@ export default {
 
       this.searchBox.debounce = setTimeout(async () => {
         try {
+          // wait for properties to be loaded if they arent
+          while (this.searchBox.findPropertiesAll.length === 0) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+          }
+
           // eslint-disable-next-line max-len
           let domain = encodeURI(`${this.searchServer}?term=${query}&mode=advance&useHighlighting=false&findProperties=${this.searchBox.encodedProperties}`);
           const result = await getFindSearch(domain);

diff --git a/idmp/src/views/Ontology.vue b/idmp/src/views/Ontology.vue
@@ -1135,6 +1135,7 @@
 <script>
 import { mapState } from "vuex";
 import Multiselect from "vue-multiselect";
+import customLink from '../components/chunks/link';
 import { getEntity, getModules, getOntologyVersions, getFindSearch, getFindProperties } from "../api/ontology";
 
 export default {
@@ -1145,6 +1146,7 @@ export default {
     StatsComponent: () => import(/* webpackChunkName: "Stats" */ "../components/StatsComponent"),
     ResourceSection: () => import(/* webpackChunkName: "ResourceSection" */ "../components/Ontology/ResourceSection"),
     DownloadSection: () => import(/* webpackChunkName: "DownloadSection" */ "../components/Ontology/DownloadSection"),
+    customLink,
     Multiselect,
   },
   props: ["ontology"],
@@ -1226,9 +1228,9 @@ export default {
     this.updateServers();
 
     this.query = queryParam;
+    this.fetchSearchProperties();
     this.fetchData(this.query);
     this.fetchModules();
-    this.fetchSearchProperties();
   },
   methods: {
     toggleModuleTree() {
@@ -1509,6 +1511,11 @@ export default {
 
       this.searchBox.debounce = setTimeout(async () => {
         try {
+          // wait for properties to be loaded if they arent
+          while (this.searchBox.findPropertiesAll.length === 0) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+          }
+
           // eslint-disable-next-line max-len
           let domain = encodeURI(`${this.searchServer}?term=${query}&mode=advance&useHighlighting=false&findProperties=${this.searchBox.encodedProperties}`);
           const result = await getFindSearch(domain);