Collected paradigm generation code and relabelling out of frontend

UAlbertaALTLab · Oct 21, 2024 · 4cf8f96 · 4cf8f96
1 parent 7f94b0c
commit 4cf8f96
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 7 deletions.
diff --git a/frontend/js/paradigm.js b/frontend/js/paradigm.js
@@ -45,7 +45,7 @@ function setupParadigmSizeToggleButton(currentParadigmSize) {
     displayButtonAsLoading(toggleButton);
 
     fetch(
-      window.Urls["cree-dictionary-paradigm-detail"]() +
+      window.Urls["morphodict-paradigm-detail"]() +
         `?lemma-id=${lemmaId}&paradigm-size=${nextParadigmSize}`
     )
       .then((r) => {

diff --git a/src/morphodict/frontend/templates/morphodict/word-detail.html b/src/morphodict/frontend/templates/morphodict/word-detail.html
@@ -71,8 +71,8 @@ <h1 id="head" class="definition-title">
 
         <section id="paradigm">
             {% if paradigm %}
-                {% include './components/paradigm-label-switcher.html' %}
-                {% include './components/paradigm.html' %}
+                {% include 'morphodict/components/paradigm-label-switcher.html' %}
+                {% include 'morphodict/components/paradigm.html' %}
             {% endif %}
         </section>
     </article>

diff --git a/src/morphodict/paradigm/apps.py b/src/morphodict/paradigm/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ParadigmConfig(AppConfig):
+    name = "morphodict.paradigm"
diff --git a/src/morphodict/frontend/ensure_data.py → src/morphodict/paradigm/ensure_data.py b/src/morphodict/frontend/ensure_data.py → src/morphodict/paradigm/ensure_data.py
diff --git a/...t/components/paradigm-label-switcher.html → ...t/components/paradigm-label-switcher.html b/...t/components/paradigm-label-switcher.html → ...t/components/paradigm-label-switcher.html
diff --git a/...dict/components/paradigm-size-button.html → ...dict/components/paradigm-size-button.html b/...dict/components/paradigm-size-button.html → ...dict/components/paradigm-size-button.html
diff --git a/...lates/morphodict/components/paradigm.html → ...lates/morphodict/components/paradigm.html b/...lates/morphodict/components/paradigm.html → ...lates/morphodict/components/paradigm.html
diff --git a/src/morphodict/paradigm/urls.py b/src/morphodict/paradigm/urls.py
@@ -8,6 +8,6 @@
     path(
         "_paradigm_details/",
         views.paradigm_internal,
-        name="cree-dictionary-paradigm-detail",
+        name="morphodict-paradigm-detail",
     ),
 ]
diff --git a/src/morphodict/relabelling/apps.py b/src/morphodict/relabelling/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class RelabellingConfig(AppConfig):
+    name = "morphodict.relabelling"
diff --git a/...dict/frontend/templatetags/relabelling.py → ...t/relabelling/templatetags/relabelling.py b/...dict/frontend/templatetags/relabelling.py → ...t/relabelling/templatetags/relabelling.py
diff --git a/...frontend/templatetags/test_relabelling.py → ...abelling/templatetags/test_relabelling.py b/...frontend/templatetags/test_relabelling.py → ...abelling/templatetags/test_relabelling.py
diff --git a/src/morphodict/site/settings.py b/src/morphodict/site/settings.py
@@ -75,12 +75,14 @@
     "morphodict.lexicon",
     # Internal apps
     # TODO: our internal app organization is kind of a mess 🙃
+    "morphodict.relabelling",
     "morphodict.api",
     "morphodict.frontend",
     "morphodict.cvd",
     "morphodict.search_quality",
     "morphodict.phrase_translate",
     "morphodict.orthography",
+    "morphodict.paradigm",
     # This comes last so that other apps can override templates
     "django.contrib.admin",
 ]

diff --git a/src/morphodict/tests/test_views.py b/src/morphodict/tests/test_views.py
@@ -52,14 +52,14 @@ def test_paradigm_details_internal_400_404(
             get_data["lemma-id"] = lemma_id
         if paradigm_size is not None:
             get_data["paradigm-size"] = paradigm_size
-        response = c.get(reverse("cree-dictionary-paradigm-detail"), get_data)
+        response = c.get(reverse("morphodict-paradigm-detail"), get_data)
         assert response.status_code == expected_code
 
     @pytest.mark.parametrize(("method",), (("post",), ("put",), ("delete",)))
     def test_paradigm_details_internal_wrong_method(self, method: str):
         c = Client()
         response = getattr(c, method)(
-            reverse("cree-dictionary-paradigm-detail"),
+            reverse("morphodict-paradigm-detail"),
             {"lemma-id": 1, "paradigm-size": "BASIC"},
         )
         assert response.status_code == HttpResponseNotAllowed.status_code
@@ -146,7 +146,7 @@ def test_paradigm_from_full_page_and_api(client: Client):
 
     # Get fragment from API request:
     response = client.get(
-        reverse("cree-dictionary-paradigm-detail"),
+        reverse("morphodict-paradigm-detail"),
         cast(
             Dict[str, int | str],
             {