Add type to listing view (#1797)

nationalarchives · Mar 4, 2025 · e6a55c4 · e6a55c4
1 parent d6789cd
commit e6a55c4
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 0 deletions.
diff --git a/etna/api/tests/expected_results/article.json b/etna/api/tests/expected_results/article.json
@@ -320,6 +320,7 @@
             "short_title": null,
             "url": "/article_index/focused_article/",
             "full_url": "http://localhost/article_index/focused_article/",
+            "type": "articles.FocusedArticlePage",
             "type_label": "Focus on",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -350,6 +351,7 @@
             "short_title": null,
             "url": "/arts/",
             "full_url": "http://localhost/arts/",
+            "type": "collections.TopicExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -378,6 +380,7 @@
             "short_title": null,
             "url": "/early_modern/",
             "full_url": "http://localhost/early_modern/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -404,6 +407,7 @@
             "short_title": null,
             "url": "/postwar/",
             "full_url": "http://localhost/postwar/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/article_index.json b/etna/api/tests/expected_results/article_index.json
@@ -76,6 +76,7 @@
         "short_title": null,
         "url": "/article_index/article/",
         "full_url": "http://localhost/article_index/article/",
+        "type": "articles.ArticlePage",
         "type_label": "The story of",
         "teaser_text": "Teaser text",
         "teaser_image": {
@@ -110,6 +111,7 @@
                         "short_title": null,
                         "url": "/article_index/article/",
                         "full_url": "http://localhost/article_index/article/",
+                        "type": "articles.ArticlePage",
                         "type_label": "The story of",
                         "teaser_text": "Teaser text",
                         "teaser_image": {
@@ -137,6 +139,7 @@
                         "short_title": null,
                         "url": "/article_index/focused_article/",
                         "full_url": "http://localhost/article_index/focused_article/",
+                        "type": "articles.FocusedArticlePage",
                         "type_label": "Focus on",
                         "teaser_text": "Teaser text",
                         "teaser_image": {

diff --git a/etna/api/tests/expected_results/arts.json b/etna/api/tests/expected_results/arts.json
@@ -123,6 +123,7 @@
             "short_title": null,
             "url": "/article_index/focused_article/",
             "full_url": "http://localhost/article_index/focused_article/",
+            "type": "articles.FocusedArticlePage",
             "type_label": "Focus on",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -150,6 +151,7 @@
             "short_title": null,
             "url": "/article_index/article/",
             "full_url": "http://localhost/article_index/article/",
+            "type": "articles.ArticlePage",
             "type_label": "The story of",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -179,6 +181,7 @@
             "short_title": null,
             "url": "/arts/highlight_gallery/",
             "full_url": "http://localhost/arts/highlight_gallery/",
+            "type": "collections.HighlightGalleryPage",
             "type_label": "In pictures",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/early_modern.json b/etna/api/tests/expected_results/early_modern.json
@@ -122,6 +122,7 @@
             "short_title": null,
             "url": "/article_index/focused_article/",
             "full_url": "http://localhost/article_index/focused_article/",
+            "type": "articles.FocusedArticlePage",
             "type_label": "Focus on",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -149,6 +150,7 @@
             "short_title": null,
             "url": "/article_index/article/",
             "full_url": "http://localhost/article_index/article/",
+            "type": "articles.ArticlePage",
             "type_label": "The story of",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -178,6 +180,7 @@
             "short_title": null,
             "url": "/arts/highlight_gallery/",
             "full_url": "http://localhost/arts/highlight_gallery/",
+            "type": "collections.HighlightGalleryPage",
             "type_label": "In pictures",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/focused_article.json b/etna/api/tests/expected_results/focused_article.json
@@ -133,6 +133,7 @@
             "short_title": null,
             "url": "/article_index/article/",
             "full_url": "http://localhost/article_index/article/",
+            "type": "articles.ArticlePage",
             "type_label": "The story of",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -163,6 +164,7 @@
             "short_title": null,
             "url": "/arts/",
             "full_url": "http://localhost/arts/",
+            "type": "collections.TopicExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -191,6 +193,7 @@
             "short_title": null,
             "url": "/early_modern/",
             "full_url": "http://localhost/early_modern/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -219,6 +222,7 @@
             "short_title": null,
             "url": "/people/author/",
             "full_url": "http://localhost/people/author/",
+            "type": "people.PersonPage",
             "type_label": null,
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/highlight_gallery.json b/etna/api/tests/expected_results/highlight_gallery.json
@@ -77,6 +77,7 @@
         "short_title": null,
         "url": "/article_index/article/",
         "full_url": "http://localhost/article_index/article/",
+        "type": "articles.ArticlePage",
         "type_label": "The story of",
         "teaser_text": "Teaser text",
         "teaser_image": {
@@ -161,6 +162,7 @@
             "short_title": null,
             "url": "/arts/",
             "full_url": "http://localhost/arts/",
+            "type": "collections.TopicExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -189,6 +191,7 @@
             "short_title": null,
             "url": "/early_modern/",
             "full_url": "http://localhost/early_modern/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/pages.json b/etna/api/tests/expected_results/pages.json
@@ -9,6 +9,7 @@
             "short_title": null,
             "url": "/",
             "full_url": "http://localhost/",
+            "type": "home.HomePage",
             "type_label": null,
             "teaser_text": "",
             "teaser_image": null,
@@ -20,6 +21,7 @@
             "short_title": null,
             "url": "/arts/",
             "full_url": "http://localhost/arts/",
+            "type": "collections.TopicExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -46,6 +48,7 @@
             "short_title": null,
             "url": "/arts/highlight_gallery/",
             "full_url": "http://localhost/arts/highlight_gallery/",
+            "type": "collections.HighlightGalleryPage",
             "type_label": "In pictures",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -73,6 +76,7 @@
             "short_title": null,
             "url": "/early_modern/",
             "full_url": "http://localhost/early_modern/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -99,6 +103,7 @@
             "short_title": null,
             "url": "/postwar/",
             "full_url": "http://localhost/postwar/",
+            "type": "collections.TimePeriodExplorerPage",
             "type_label": "Explore the collection",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -125,6 +130,7 @@
             "short_title": null,
             "url": "/people/",
             "full_url": "http://localhost/people/",
+            "type": "people.PeopleIndexPage",
             "type_label": null,
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -151,6 +157,7 @@
             "short_title": null,
             "url": "/people/author/",
             "full_url": "http://localhost/people/author/",
+            "type": "people.PersonPage",
             "type_label": null,
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -219,6 +226,7 @@
             "short_title": null,
             "url": "/article_index/",
             "full_url": "http://localhost/article_index/",
+            "type": "articles.ArticleIndexPage",
             "type_label": null,
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -245,6 +253,7 @@
             "short_title": null,
             "url": "/article_index/article/",
             "full_url": "http://localhost/article_index/article/",
+            "type": "articles.ArticlePage",
             "type_label": "The story of",
             "teaser_text": "Teaser text",
             "teaser_image": {
@@ -272,6 +281,7 @@
             "short_title": null,
             "url": "/article_index/focused_article/",
             "full_url": "http://localhost/article_index/focused_article/",
+            "type": "articles.FocusedArticlePage",
             "type_label": "Focus on",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/people.json b/etna/api/tests/expected_results/people.json
@@ -82,6 +82,7 @@
             "short_title": null,
             "url": "/people/author/",
             "full_url": "http://localhost/people/author/",
+            "type": "people.PersonPage",
             "type_label": null,
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/api/tests/expected_results/postwar.json b/etna/api/tests/expected_results/postwar.json
@@ -122,6 +122,7 @@
             "short_title": null,
             "url": "/article_index/article/",
             "full_url": "http://localhost/article_index/article/",
+            "type": "articles.ArticlePage",
             "type_label": "The story of",
             "teaser_text": "Teaser text",
             "teaser_image": {

diff --git a/etna/core/models/basepage.py b/etna/core/models/basepage.py
@@ -158,12 +158,17 @@ def mourning_notice(self):
 
         return MourningNotice.objects.first()
 
+    @cached_property
+    def type(self):
+        return self._meta.label
+
     default_api_fields = [
         APIField("id"),
         APIField("title"),
         APIField("short_title"),
         APIField("url"),
         APIField("full_url"),
+        APIField("type"),
         APIField("type_label"),
         APIField("teaser_text"),
         APIField(