use a lookup

shapiromatron · Sep 10, 2024 · 6e0f54d · 6e0f54d
1 parent 066b816
commit 6e0f54d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/frontend/animal/EndpointForm/constants.js b/frontend/animal/EndpointForm/constants.js
@@ -9,6 +9,8 @@ const termUrlLookupMap = {
         "effect_term_id-2": "/vocab/api/toxrefdb/effect/?format=json",
         "effect_subtype_term_id-2": "/vocab/api/toxrefdb/effect_subtype/?format=json",
         "name_term_id-2": "/vocab/api/toxrefdb/endpoint_name/?format=json",
+        "id-lookup-1": "/vocab/api/ehv/:id/endpoint-name-lookup/",
+        "id-lookup-2": "/vocab/api/toxrefdb/:id/endpoint-name-lookup/",
     },
     termUrlLookup = function(term, vocab) {
         return termUrlLookupMap[`${term}-${vocab}`];

diff --git a/frontend/animal/EndpointForm/store.js b/frontend/animal/EndpointForm/store.js
@@ -2,6 +2,8 @@ import _ from "lodash";
 import {action, computed, observable} from "mobx";
 import h from "shared/utils/helpers";
 
+import {termUrlLookup} from "./constants";
+
 const fields = ["system", "organ", "effect", "effect_subtype", "name"];
 
 class EndpointFormStore {
@@ -34,7 +36,7 @@ class EndpointFormStore {
 
     @action.bound
     endpointNameLookup(val) {
-        const url = this.config.vocabulary_api.replace("9999", val);
+        const url = termUrlLookup("id-lookup", this.config.vocabulary).replace(":id", val);
 
         if (!val) {
             return;

diff --git a/hawc/apps/animal/models.py b/hawc/apps/animal/models.py
@@ -811,7 +811,6 @@ def get_vocabulary_settings(cls, assessment: Assessment, form: ModelForm) -> str
         return json.dumps(
             {
                 "vocabulary": vocab.value if vocab else None,
-                "vocabulary_api": vocab.api_root if vocab else None,
                 "vocabulary_display": vocab.display_name if vocab else None,
                 "object": {
                     "system": form["system"].value() or "",

diff --git a/hawc/apps/vocab/constants.py b/hawc/apps/vocab/constants.py
@@ -15,14 +15,6 @@ class VocabularyNamespace(IntegerChoices):
     def display_choices(cls) -> list:
         return [(item, item.display_name) for item in cls]
 
-    @property
-    def api_root(self) -> str:
-        match self:
-            case self.EHV:
-                return reverse("vocab:api:ehv-endpoint-name-lookup", args=(9999,))
-            case self.ToxRefDB:
-                return reverse("vocab:api:toxrefdb-endpoint-name-lookup", args=(9999,))
-
     @property
     def display_url(self) -> str:
         match self: