code: correcting code to display item list for a registered model

NOTES.md

@@ -134,4 +134,4 @@ As I started by quickly using a django admin template with CSS to jump start the
 
  - implement views for app
  - implement a static implementation for repository
- 
+ - eventually AdminRegistry needs to become an `Arc<Mutex<T>>`, if internal data needs to change *after* creating the main state.

src/admin/mod.rs

@@ -10,13 +10,10 @@ pub mod views;
 pub fn routes() -> Router<AppState> {
     Router::new()
         .route("/", get(views::index).post(views::index_action))
-        .route("/app/:app_key", get(views::list_app))
+        .route("/app/:app", get(views::list_app))
+        .route("/app/:app/model/:model", get(views::list_item_collection))
         .route(
-            "/app/:app_key/models/:model_key",
-            get(views::list_item_collection),
-        )
-        .route(
-            "/app/:app_key/models/:model_key/detail/:id",
+            "/app/:app/model/:model/detail/:id",
             get(views::item_details),
         )
 }

src/admin/state.rs

@@ -65,8 +65,11 @@ impl AdminRegistry {
     fn model_from_internal(&self, internal_model: &internal::AdminModel) -> AdminModel {
         AdminModel {
             key: internal_model.model_key.clone(),
-            name: internal_model.model_key.clone(),
-            admin_url: "".to_owned(),
+            name: internal_model.name.clone(),
+            admin_url: format!(
+                "{}/app/{}/model/{}",
+                self.base_path, internal_model.app_key, internal_model.model_key
+            ),
             view_only: false,
             add_url: None,
         }
@@ -111,6 +114,14 @@ impl AdminRegistry {
         self.repositories.insert(model_key, Box::new(repository));
         Ok(())
     }
+
+    pub fn get_repository(&self, model_key: &str) -> Result<&Box<dyn AdminRepository>, String> {
+        if let Some(repo) = self.repositories.get(model_key) {
+            return Ok(repo);
+        } else {
+            return Err("Couldn't find repository".to_owned());
+        }
+    }
 }
 
 pub mod config {
@@ -139,7 +150,7 @@ mod internal {
         fn from(value: super::config::AdminModelConfig) -> Self {
             AdminModel {
                 app_key: value.app_key,
-                model_key: value.name.clone(),
+                model_key: slug::slugify(value.name.clone()),
                 name: value.name,
             }
         }

src/admin/views.rs

@@ -2,11 +2,13 @@ use std::sync::Arc;
 
 use axum::extract::Path;
 use axum::{extract::State, response::IntoResponse, Form};
+use log::info;
 
 use crate::admin::domain::{AdminApp, AdminModel};
 use crate::admin::state;
 use crate::service::templates;
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 #[derive(Deserialize)]
 pub struct Question {
@@ -38,6 +40,8 @@ pub struct AdminContext {
 
     pub request: AdminRequest,
     pub available_apps: Vec<AdminApp>,
+    pub item_list: Option<Value>,
+    pub item: Option<Value>,
 }
 
 impl Default for AdminContext {
@@ -56,6 +60,8 @@ impl Default for AdminContext {
             request: AdminRequest {
                 path: "".to_owned(),
             },
+            item_list: None,
+            item: None,
         }
     }
 }
@@ -88,9 +94,22 @@ pub async fn list_app(
 // List Items renders the entire list item page.
 pub async fn list_item_collection(
     templates: State<templates::Templates>,
+    registry: State<Arc<state::AdminRegistry>>,
     Path((app_key, model_key)): Path<(String, String)>,
 ) -> impl IntoResponse {
-    templates.render_html("admin/items/list_items.html", ())
+    info!("list_item_collection {} for model {}", app_key, model_key);
+    let context = if let Ok(repo) = registry.get_repository(&model_key) {
+        // we should consider using Vec<Value> instead in get_list.
+        AdminContext {
+            item_list: Some(repo.get_list()),
+            ..Default::default()
+        }
+    } else {
+        AdminContext {
+            ..Default::default()
+        }
+    };
+    templates.render_html("admin/items/item_list.html", context)
 }
 
 // Items Action is a POST to an item list. By default these are actions, that work on a list of items as input.
@@ -116,3 +135,8 @@ pub async fn item_action(
 ) -> impl IntoResponse {
     "There is your answer!".to_owned()
 }
+
+pub async fn debug_view(Path(data): Path<String>) -> impl IntoResponse {
+    println!("debug: {}", data);
+    "Debug!".to_owned()
+}

templates/admin/items/item_list.html

@@ -0,0 +1,13 @@
+{% extends "admin/base.html" %}
+
+{% block content %}
+{% if item_list %}
+<ul>
+  {% for item in item_list %}
+    <li>{{ item.name }}</li>
+  {% endfor %}
+</ul>
+{% else %}
+  No Items found.
+{% endif %}
+{% endblock content %}

templates/admin/items/list_items.html

@@ -1,5 +0,0 @@
-{% if item_list %}
-  {% for item in item_list %}
-    poop: {{ item}}
-  {% endfor %}
-{% endif %}