SupplierList mostly works??? Will test after hanging with dad

Author: RobJellinghaus

.cargo/bin/dsync.rs

@@ -21,7 +21,6 @@ pub fn main() {
             options: GenerationConfigOpts {
                 default_table_options: TableOptions::default()
                     .tsync()
-                    .graphql()
                     .autogenerated_columns(vec![
                         "id",
                         "created_at",
@@ -42,6 +41,10 @@ pub fn main() {
                     ("user_oauth2_links", TableOptions::default().ignore()),
                     // plugin_tasks
                     ("fang_tasks", TableOptions::default().ignore()),
+                    // enable GraphQL only for todo table
+                    ("todo", TableOptions::default().tsync().graphql()),
+                    // suppliers - disable GraphQL generation due to template issues
+                    ("suppliers", TableOptions::default().tsync()),
                 ]),
                 ..Default::default()
             },

backend/graphql/query.rs

@@ -2,7 +2,7 @@ use async_graphql::{Context, Object, Result};
 use create_rust_app::auth::Auth;
 use create_rust_app::Database;
 use crate::models::todo::{Todo, TodoFilter, PaginationResult as TodoPaginationResult, ConnectionType};
-use crate::models::suppliers::{Suppliers, SuppliersFilter, PaginationResult as SupplierPaginationResult};
+use crate::models::suppliers::{Suppliers, SuppliersFilter, SupplierPaginationResult};
 
 fn get_connection(ctx: &Context<'_>) -> Result<ConnectionType> {
     let db = ctx.data::<Database>()?;
@@ -38,13 +38,14 @@ impl QueryRoot {
             .map_err(|e| async_graphql::Error::new(format!("Database error: {}", e)))
     }
 
-    async fn suppliers(&self, ctx: &Context<'_>, page: Option<i64>, page_size: Option<i64>) -> Result<SupplierPaginationResult<Suppliers>> {
+    async fn suppliers(&self, ctx: &Context<'_>, page: Option<i64>, page_size: Option<i64>) -> Result<SupplierPaginationResult> {
         let mut con = get_connection(ctx)?;
 
         let page = page.unwrap_or(0);
         let page_size = page_size.unwrap_or(10);
 
         Suppliers::paginate(&mut con, page, page_size, SuppliersFilter::default())
+            .map(|result| result.into())
             .map_err(|e| async_graphql::Error::new(format!("Database error: {}", e)))
     }
 

backend/models/suppliers/generated.rs

@@ -39,61 +39,6 @@ pub struct Suppliers {
     pub updated_at: chrono::DateTime<chrono::Utc>,
 }
 
-#[async_graphql::Object]
-impl Suppliers {
-    async fn id(&self) -> async_graphql::ID {
-        async_graphql::ID(self.id.to_string())
-    }
-
-    async fn name(&self) -> &String {
-        &self.name
-    }
-
-    async fn address(&self) -> &String {
-        &self.address
-    }
-
-    async fn city(&self) -> &String {
-        &self.city
-    }
-
-    async fn state(&self) -> &String {
-        &self.state
-    }
-
-    async fn zip_code(&self) -> &String {
-        &self.zip_code
-    }
-
-    async fn country(&self) -> &String {
-        &self.country
-    }
-
-    async fn contact_name(&self) -> &String {
-        &self.contact_name
-    }
-
-    async fn contact_email(&self) -> &String {
-        &self.contact_email
-    }
-
-    async fn contact_phone(&self) -> &String {
-        &self.contact_phone
-    }
-
-    async fn website(&self) -> &Option<String> {
-        &self.website
-    }
-
-    async fn created_at(&self) -> &chrono::DateTime<chrono::Utc> {
-        &self.created_at
-    }
-
-    async fn updated_at(&self) -> &chrono::DateTime<chrono::Utc> {
-        &self.updated_at
-    }
-}
-
 /// Create Struct for a row in table `suppliers` for [`Suppliers`]
 #[tsync::tsync]
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::Insertable)]
@@ -154,8 +99,8 @@ pub struct UpdateSuppliers {
 
 /// Result of a `.paginate` function
 #[tsync::tsync]
-#[derive(Debug, serde::Serialize, async_graphql::SimpleObject)]
-pub struct PaginationResult<T: Send + Sync + async_graphql::OutputType> {
+#[derive(Debug, serde::Serialize)]
+pub struct PaginationResult<T> {
     /// Resulting items that are from the current page
     pub items: Vec<T>,
     /// The count of total items there are

backend/models/suppliers/graphql.rs

@@ -0,0 +1,89 @@
+use async_graphql::{SimpleObject, Object};
+use super::generated::{Suppliers, PaginationResult};
+
+// Manual GraphQL Object implementation for Suppliers
+// This is needed because dsync's hardcoded GraphQL template assumes a "text" field
+// which doesn't exist in the suppliers table
+#[Object]
+impl Suppliers {
+    async fn id(&self) -> async_graphql::ID {
+        async_graphql::ID(self.id.to_string())
+    }
+
+    async fn name(&self) -> &String {
+        &self.name
+    }
+
+    async fn address(&self) -> &String {
+        &self.address
+    }
+
+    async fn city(&self) -> &String {
+        &self.city
+    }
+
+    async fn state(&self) -> &String {
+        &self.state
+    }
+
+    async fn zip_code(&self) -> &String {
+        &self.zip_code
+    }
+
+    async fn country(&self) -> &String {
+        &self.country
+    }
+
+    async fn contact_name(&self) -> &String {
+        &self.contact_name
+    }
+
+    async fn contact_email(&self) -> &String {
+        &self.contact_email
+    }
+
+    async fn contact_phone(&self) -> &String {
+        &self.contact_phone
+    }
+
+    async fn website(&self) -> &Option<String> {
+        &self.website
+    }
+
+    async fn created_at(&self) -> &chrono::DateTime<chrono::Utc> {
+        &self.created_at
+    }
+
+    async fn updated_at(&self) -> &chrono::DateTime<chrono::Utc> {
+        &self.updated_at
+    }
+}
+
+// Manual GraphQL SimpleObject implementation for PaginationResult<Suppliers>
+// This is needed because dsync disabled GraphQL generation for suppliers
+#[derive(SimpleObject)]
+#[graphql(name = "SupplierPaginationResult")]
+pub struct SupplierPaginationResult {
+    /// Resulting items that are from the current page
+    pub items: Vec<Suppliers>,
+    /// The count of total items there are
+    pub total_items: i64,
+    /// Current page, 0-based index
+    pub page: i64,
+    /// Size of a page
+    pub page_size: i64,
+    /// Number of total possible pages, given the `page_size` and `total_items`
+    pub num_pages: i64,
+}
+
+impl From<PaginationResult<Suppliers>> for SupplierPaginationResult {
+    fn from(result: PaginationResult<Suppliers>) -> Self {
+        Self {
+            items: result.items,
+            total_items: result.total_items,
+            page: result.page,
+            page_size: result.page_size,
+            num_pages: result.num_pages,
+        }
+    }
+}

backend/models/suppliers/mod.rs

@@ -1,2 +1,5 @@
 pub mod generated;
+pub mod graphql;
+
 pub use generated::*;
+pub use graphql::SupplierPaginationResult;

frontend/src/App.tsx

@@ -14,6 +14,7 @@ import './App.css'
 import { Home } from './containers/Home'
 import { Todos } from './containers/Todo'
 import { TodoGraphQLRelay } from './containers/TodoGraphQLRelay'
+import { SupplierList } from './containers/SupplierList'
 import { Files } from './containers/Files'
 import { Route, useNavigate, Routes } from 'react-router-dom'
 
@@ -35,6 +36,7 @@ const App = () => {
             <a className="NavButton" onClick={() => navigate('/')}>Home</a>
             <a className="NavButton" onClick={() => navigate('/todos')}>Todos (REST)</a>
             <a className="NavButton" onClick={() => navigate('/todos-relay')}>Todos (Relay)</a>
+            <a className="NavButton" onClick={() => navigate('/suppliers')}>Suppliers</a>
           <a className="NavButton" onClick={() => navigate('/files')}>Files</a>
             {/* CRA: left-aligned nav buttons */}
             <a className="NavButton" onClick={() => navigate('/account')}>Account</a>
@@ -70,6 +72,11 @@ const App = () => {
                 <TodoGraphQLRelay />
               </Suspense>
             } />
+            <Route path="/suppliers" element={
+              <Suspense fallback={<div>Loading suppliers...</div>}>
+                <SupplierList />
+              </Suspense>
+            } />
             {/* CRA: routes */}
               <Route path="/files" element={<Files />} />
             <Route path="/login" element={<LoginPage />} />