@acmekit/dashboard 2.13.30 → 2.13.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acmekit/dashboard",
-  "version": "2.13.30",
+  "version": "2.13.31",
   "scripts": {
     "generate:static": "node ./scripts/generate-currencies.js && prettier --write ./src/lib/currencies.ts",
     "dev": "../../../node_modules/.bin/vite",
@@ -39,10 +39,10 @@
     "dist"
   ],
   "dependencies": {
-    "@acmekit/admin-shared": "2.13.30",
-    "@acmekit/icons": "2.13.30",
-    "@acmekit/js-sdk": "2.13.30",
-    "@acmekit/ui": "4.1.26",
+    "@acmekit/admin-shared": "2.13.31",
+    "@acmekit/icons": "2.13.31",
+    "@acmekit/js-sdk": "2.13.31",
+    "@acmekit/ui": "4.1.27",
     "@ariakit/react": "^0.4.15",
     "@babel/runtime": "^7.26.10",
     "@dnd-kit/core": "^6.1.0",
@@ -80,10 +80,10 @@
     "zod": "3.25.76"
   },
   "devDependencies": {
-    "@acmekit/admin-shared": "2.13.30",
-    "@acmekit/admin-vite-plugin": "2.13.30",
-    "@acmekit/types": "2.13.30",
-    "@acmekit/ui-preset": "2.13.30"
+    "@acmekit/admin-shared": "2.13.31",
+    "@acmekit/admin-vite-plugin": "2.13.31",
+    "@acmekit/types": "2.13.31",
+    "@acmekit/ui-preset": "2.13.31"
   },
   "packageManager": "yarn@3.2.1"
 }

package/src/lib/table-display-utils.tsx

@@ -48,14 +48,14 @@ const formatDate = (date: string | Date, format: 'short' | 'long' | 'relative' =
 }
 
 // Payment status display
-const PaymentStatusBadge = ({ status }: { status: string }) => {
+const TransactionStatusBadge = ({ status }: { status: string }) => {
   const getStatusColor = (status: string) => {
     switch (status?.toLowerCase()) {
-      case 'paid':
-      case 'captured':
+      case 'completed':
+      case 'success':
         return 'green'
       case 'pending':
-      case 'awaiting':
+      case 'processing':
         return 'orange'
       case 'failed':
       case 'canceled':
@@ -72,21 +72,21 @@ const PaymentStatusBadge = ({ status }: { status: string }) => {
   )
 }
 
-// Fulfillment status display
-const FulfillmentStatusBadge = ({ status }: { status: string }) => {
+// Processing status display
+const ProcessingStatusBadge = ({ status }: { status: string }) => {
   const getStatusColor = (status: string) => {
     switch (status?.toLowerCase()) {
-      case 'fulfilled':
-      case 'shipped':
+      case 'completed':
+      case 'done':
         return 'green'
-      case 'partially_fulfilled':
+      case 'partially_completed':
       case 'preparing':
         return 'orange'
       case 'canceled':
       case 'returned':
         return 'red'
       case 'pending':
-      case 'not_fulfilled':
+      case 'not_started':
         return 'grey'
       default:
         return 'grey'
@@ -113,8 +113,8 @@ const GenericStatusBadge = ({ status }: { status: string }) => {
 export const DISPLAY_STRATEGIES = {
   // Known semantic types with pixel-perfect display
   status: {
-    payment: (value: any) => <PaymentStatusBadge status={value} />,
-    fulfillment: (value: any) => <FulfillmentStatusBadge status={value} />,
+    transaction: (value: any) => <TransactionStatusBadge status={value} />,
+    processing: (value: any) => <ProcessingStatusBadge status={value} />,
     default: (value: any) => <GenericStatusBadge status={value} />
   },
   
@@ -139,7 +139,6 @@ export const DISPLAY_STRATEGIES = {
   },
   
   identifier: {
-    order: (value: any) => `#${value}`,
     default: (value: any) => value
   },
   
@@ -235,76 +234,76 @@ export const getDisplayStrategy = (column: any) => {
 
 // Computed column computation functions
 export const COMPUTED_COLUMN_FUNCTIONS = {
-  customer_name: (row: any) => {
-    // Try customer object first
-    if (row.customer?.first_name || row.customer?.last_name) {
-      const fullName = `${row.customer.first_name || ''} ${row.customer.last_name || ''}`.trim()
+  user_name: (row: any) => {
+    // Try user object first
+    if (row.user?.first_name || row.user?.last_name) {
+      const fullName = `${row.user.first_name || ''} ${row.user.last_name || ''}`.trim()
       if (fullName) return fullName
     }
-    
+
     // Fall back to email
-    if (row.customer?.email) {
-      return row.customer.email
+    if (row.user?.email) {
+      return row.user.email
     }
-    
+
     // Fall back to phone
-    if (row.customer?.phone) {
-      return row.customer.phone
+    if (row.user?.phone) {
+      return row.user.phone
     }
-    
+
     return 'Guest'
   },
-  
+
   address_summary: (row: any, column?: any) => {
     // Determine which address to use based on the column field
     let address = null
-    if (column?.field === 'shipping_address_display') {
-      address = row.shipping_address
-    } else if (column?.field === 'billing_address_display') {
-      address = row.billing_address
+    if (column?.field === 'primary_address_display') {
+      address = row.primary_address
+    } else if (column?.field === 'secondary_address_display') {
+      address = row.secondary_address
     } else {
-      // Fallback to shipping address if no specific field
-      address = row.shipping_address || row.billing_address
+      // Fallback to primary address if no specific field
+      address = row.primary_address || row.secondary_address
     }
-    
+
     if (!address) return '-'
-    
+
     // Build address parts in a meaningful order
     const parts = []
-    
+
     // Include street address if available
     if (address.address_1) {
       parts.push(address.address_1)
     }
-    
+
     // City, Province/State, Postal Code
     const locationParts = []
     if (address.city) locationParts.push(address.city)
     if (address.province) locationParts.push(address.province)
     if (address.postal_code) locationParts.push(address.postal_code)
-    
+
     if (locationParts.length > 0) {
       parts.push(locationParts.join(', '))
     }
-    
+
     // Country
     if (address.country_code) {
       parts.push(address.country_code.toUpperCase())
     }
-    
+
     return parts.join(' • ') || '-'
   },
-  
+
   country_code: (row: any) => {
-    // Get country code from shipping address
-    const countryCode = row.shipping_address?.country_code
-    
+    // Get country code from primary address
+    const countryCode = row.primary_address?.country_code
+
     if (!countryCode) return <div className="flex w-full justify-center">-</div>
-    
+
     // Get country information
     const country = getCountryByIso2(countryCode)
     const displayName = country?.display_name || countryCode.toUpperCase()
-    
+
     // Display country flag with tooltip - centered in the cell
     return (
       <div className="flex w-full items-center justify-center">
@@ -326,28 +325,6 @@ export const COMPUTED_COLUMN_FUNCTIONS = {
   }
 }
 
-// Entity-specific column overrides
-export const ENTITY_COLUMN_OVERRIDES = {
-  orders: {
-    // Override for customer column that combines multiple fields
-    customer: {
-      accessor: (row: any) => {
-        // Complex logic for combining fields
-        const shipping = row.shipping_address
-        const customer = row.customer
-        
-        if (shipping?.first_name || shipping?.last_name) {
-          return `${shipping.first_name || ''} ${shipping.last_name || ''}`.trim()
-        }
-        if (customer?.first_name || customer?.last_name) {
-          return `${customer.first_name || ''} ${customer.last_name || ''}`.trim()
-        }
-        return customer?.email || 'Guest'
-      }
-    }
-  }
-}
-
 // Helper function to get entity-specific accessor
 export const getEntityAccessor = (entity: string, fieldName: string, column?: any) => {
   // Check if this is a computed column
@@ -358,15 +335,7 @@ export const getEntityAccessor = (entity: string, fieldName: string, column?: an
       return (row: any) => computationFn(row, column)
     }
   }
-  
-  const entityOverrides = ENTITY_COLUMN_OVERRIDES[entity as keyof typeof ENTITY_COLUMN_OVERRIDES]
-  if (entityOverrides) {
-    const fieldOverride = entityOverrides[fieldName as keyof typeof entityOverrides]
-    if (fieldOverride?.accessor) {
-      return fieldOverride.accessor
-    }
-  }
-  
+
   // Default accessor using dot notation
   return (row: any) => getNestedValue(row, fieldName)
 }