@almadar/std 14.7.0 → 14.7.2

package/behaviors/registry/app/organisms/std-ecommerce.orb

@@ -69,20 +69,26 @@
           "ref": "AppShell.traits.AppLayout",
           "name": "ProductAppLayout",
           "config": {
-            "contentTrait": "@trait.ProductCatalog",
-            "searchEvent": "PRODUCT_SEARCH",
             "notifications": [],
-            "appName": "EcommerceApp",
             "notificationClickEvent": "PRODUCT_NOTIFICATIONS_OPEN",
+            "topBarActions": [
+              {
+                "icon": "shopping-cart",
+                "event": "CART_OPEN",
+                "label": "Cart"
+              }
+            ],
+            "contentTrait": "@trait.ProductCatalog",
+            "appName": "EcommerceApp",
             "navItems": [
               {
-                "href": "/products",
+                "label": "Products",
                 "icon": "package",
-                "label": "Products"
+                "href": "/products"
               },
               {
-                "label": "Cart",
                 "href": "/cart",
+                "label": "Cart",
                 "icon": "shopping-cart"
               },
               {
@@ -91,22 +97,16 @@
                 "icon": "credit-card"
               },
               {
-                "href": "/orders",
+                "label": "Orders",
                 "icon": "clipboard-list",
-                "label": "Orders"
+                "href": "/orders"
               }
             ],
-            "topBarActions": [
-              {
-                "icon": "shopping-cart",
-                "event": "CART_OPEN",
-                "label": "Cart"
-              }
-            ]
+            "searchEvent": "PRODUCT_SEARCH"
           },
           "events": {
-            "NOTIFY_CLICK": "PRODUCT_NOTIFICATIONS_OPEN",
-            "SEARCH": "PRODUCT_SEARCH"
+            "SEARCH": "PRODUCT_SEARCH",
+            "NOTIFY_CLICK": "PRODUCT_NOTIFICATIONS_OPEN"
           }
         },
         {
@@ -189,53 +189,53 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "lg",
                       "children": [
                         {
-                          "align": "center",
                           "gap": "md",
                           "type": "stack",
+                          "direction": "horizontal",
+                          "justify": "between",
+                          "align": "center",
                           "children": [
                             {
+                              "direction": "horizontal",
+                              "type": "stack",
                               "children": [
                                 {
                                   "type": "icon",
                                   "name": "package"
                                 },
                                 {
-                                  "content": "Products",
                                   "type": "typography",
+                                  "content": "Products",
                                   "variant": "h2"
                                 }
                               ],
-                              "align": "center",
-                              "direction": "horizontal",
-                              "type": "stack",
-                              "gap": "sm"
+                              "gap": "sm",
+                              "align": "center"
                             },
                             {
+                              "type": "stack",
                               "gap": "sm",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "button",
-                                  "label": "Create Product",
                                   "variant": "primary",
+                                  "label": "Create Product",
+                                  "action": "CREATE",
                                   "icon": "plus",
-                                  "action": "CREATE"
+                                  "type": "button"
                                 }
-                              ],
-                              "type": "stack",
-                              "direction": "horizontal"
+                              ]
                             }
-                          ],
-                          "direction": "horizontal",
-                          "justify": "between"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         "@trait.ProductBrowseList"
                       ],
+                      "gap": "lg",
                       "direction": "vertical",
                       "type": "stack"
                     }
@@ -256,34 +256,34 @@
                     "render-ui",
                     "main",
                     {
+                      "align": "center",
                       "className": "py-8",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "icon",
-                          "name": "bell"
+                          "name": "bell",
+                          "type": "icon"
                         },
                         {
+                          "variant": "h3",
                           "content": "No notifications",
-                          "type": "typography",
-                          "variant": "h3"
+                          "type": "typography"
                         },
                         {
-                          "type": "typography",
                           "content": "You're all caught up.",
                           "variant": "caption",
-                          "color": "muted"
+                          "color": "muted",
+                          "type": "typography"
                         },
                         {
-                          "label": "Back to products",
-                          "action": "INIT",
                           "type": "button",
-                          "variant": "ghost"
+                          "variant": "ghost",
+                          "label": "Back to products",
+                          "action": "INIT"
                         }
                       ],
-                      "gap": "md",
                       "type": "stack",
-                      "direction": "vertical",
-                      "align": "center"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -297,20 +297,19 @@
           "name": "ProductBrowseList",
           "linkedEntity": "Product",
           "config": {
-            "imageField": "imageUrl",
             "fields": [
               {
-                "name": "name",
                 "variant": "h3",
+                "name": "name",
                 "icon": "package"
               },
               {
-                "name": "category",
-                "variant": "badge"
+                "variant": "badge",
+                "name": "category"
               },
               {
-                "variant": "h4",
                 "name": "price",
+                "variant": "h4",
                 "format": "currency"
               },
               {
@@ -318,31 +317,32 @@
                 "variant": "caption"
               },
               {
-                "format": "boolean",
-                "name": "inStock",
+                "label": "In Stock",
                 "variant": "body",
-                "label": "In Stock"
+                "name": "inStock",
+                "format": "boolean"
               }
             ],
-            "cols": 3.0,
+            "imageField": "imageUrl",
             "gap": "md",
             "itemActions": [
               {
-                "label": "View",
                 "event": "VIEW",
-                "variant": "ghost"
+                "variant": "ghost",
+                "label": "View"
               },
               {
-                "variant": "ghost",
                 "event": "EDIT",
+                "variant": "ghost",
                 "label": "Edit"
               },
               {
+                "variant": "danger",
                 "label": "Delete",
-                "event": "DELETE",
-                "variant": "danger"
+                "event": "DELETE"
               }
-            ]
+            ],
+            "cols": 3.0
           },
           "listens": [
             {
@@ -562,8 +562,8 @@
                     "Product",
                     {
                       "emit": {
-                        "success": "ProductLoaded",
-                        "failure": "ProductLoadFailed"
+                        "failure": "ProductLoadFailed",
+                        "success": "ProductLoaded"
                       }
                     }
                   ],
@@ -572,27 +572,30 @@
                     "modal",
                     {
                       "direction": "vertical",
+                      "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
                           "gap": "sm",
                           "direction": "horizontal",
-                          "type": "stack",
                           "children": [
                             {
                               "name": "plus-circle",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
+                              "type": "typography",
                               "content": "Create Product"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
@@ -603,12 +606,9 @@
                             "inStock"
                           ],
                           "mode": "create",
-                          "type": "form-section",
-                          "submitEvent": "SAVE"
+                          "type": "form-section"
                         }
-                      ],
-                      "gap": "md",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -885,21 +885,24 @@
                     "fetch",
                     "Product",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "failure": "ProductLoadFailed",
                         "success": "ProductLoaded"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "gap": "md",
                       "direction": "vertical",
                       "children": [
                         {
+                          "direction": "horizontal",
+                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
                               "name": "edit",
@@ -907,20 +910,17 @@
                             },
                             {
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "Edit Product"
+                              "content": "Edit Product",
+                              "variant": "h3"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
                           "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
                             "description",
@@ -929,12 +929,12 @@
                             "sku",
                             "inStock"
                           ],
+                          "type": "form-section",
                           "entity": "@payload.row",
-                          "cancelEvent": "CLOSE",
                           "mode": "edit"
                         }
                       ],
-                      "gap": "md"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1180,19 +1180,21 @@
                     "fetch",
                     "Product",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
-                      },
-                      "id": "@payload.id"
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
@@ -1200,42 +1202,42 @@
                             },
                             {
                               "variant": "h3",
-                              "content": "@entity.name",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.name"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "sm",
                           "align": "center",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Name",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
                               "variant": "body",
                               "content": "@entity.name"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
                           "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
-                              "content": "Description",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Description"
                             },
                             {
                               "content": "@entity.description",
@@ -1243,42 +1245,41 @@
                               "variant": "body"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Price"
+                              "content": "Price",
+                              "type": "typography"
                             },
                             {
+                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.price",
-                              "type": "typography"
+                              "content": "@entity.price"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
                           "type": "stack",
                           "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
-                              "content": "Category",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "Category"
                             },
                             {
                               "variant": "body",
                               "type": "typography",
                               "content": "@entity.category"
                             }
-                          ],
-                          "gap": "md"
+                          ]
                         },
                         {
                           "children": [
@@ -1288,9 +1289,9 @@
                               "type": "typography"
                             },
                             {
+                              "content": "@entity.sku",
                               "variant": "body",
-                              "type": "typography",
-                              "content": "@entity.sku"
+                              "type": "typography"
                             }
                           ],
                           "type": "stack",
@@ -1298,19 +1299,19 @@
                           "direction": "horizontal"
                         },
                         {
-                          "type": "stack",
                           "direction": "horizontal",
+                          "type": "stack",
                           "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "In Stock"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.inStock",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.inStock"
                             }
                           ]
                         },
@@ -1324,22 +1325,21 @@
                           "gap": "sm",
                           "children": [
                             {
-                              "variant": "primary",
+                              "type": "button",
                               "icon": "edit",
                               "action": "EDIT",
-                              "type": "button",
+                              "variant": "primary",
                               "label": "Edit"
                             },
                             {
-                              "variant": "ghost",
-                              "type": "button",
                               "action": "CLOSE",
-                              "label": "Close"
+                              "label": "Close",
+                              "variant": "ghost",
+                              "type": "button"
                             }
                           ]
                         }
                       ],
-                      "gap": "md",
                       "type": "stack",
                       "direction": "vertical"
                     }
@@ -1571,8 +1571,8 @@
                     "Product",
                     {
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
                       }
                     }
                   ]
@@ -1605,21 +1605,21 @@
                     {
                       "children": [
                         {
-                          "direction": "horizontal",
                           "align": "center",
+                          "type": "stack",
+                          "gap": "sm",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "name": "alert-triangle",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "content": "Delete Product",
+                              "type": "typography",
                               "variant": "h3"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -1630,15 +1630,14 @@
                           "type": "alert"
                         },
                         {
+                          "justify": "end",
                           "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "children": [
                             {
                               "label": "Cancel",
                               "type": "button",
-                              "action": "CANCEL",
-                              "variant": "ghost"
+                              "variant": "ghost",
+                              "action": "CANCEL"
                             },
                             {
                               "type": "button",
@@ -1648,12 +1647,13 @@
                               "icon": "check"
                             }
                           ],
-                          "justify": "end"
+                          "direction": "horizontal",
+                          "gap": "sm"
                         }
                       ],
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical",
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1670,8 +1670,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "ProductDeleteFailed",
-                        "success": "ProductDeleted"
+                        "success": "ProductDeleted",
+                        "failure": "ProductDeleteFailed"
                       }
                     }
                   ],
@@ -1692,8 +1692,8 @@
                     "Product",
                     {
                       "emit": {
-                        "success": "ProductLoaded",
-                        "failure": "ProductLoadFailed"
+                        "failure": "ProductLoadFailed",
+                        "success": "ProductLoaded"
                       }
                     }
                   ],
@@ -1754,8 +1754,8 @@
                     "Product",
                     {
                       "emit": {
-                        "success": "ProductLoaded",
-                        "failure": "ProductLoadFailed"
+                        "failure": "ProductLoadFailed",
+                        "success": "ProductLoaded"
                       }
                     }
                   ]
@@ -2002,22 +2002,22 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
-                      "gap": "md",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
+                          "type": "typography",
                           "color": "muted",
-                          "variant": "caption",
                           "content": "Loading…",
-                          "type": "typography"
+                          "variant": "caption"
                         }
                       ],
+                      "direction": "vertical",
+                      "align": "center",
                       "className": "py-12",
-                      "type": "stack",
-                      "direction": "vertical"
+                      "gap": "md",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -2031,11 +2031,13 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "EcommerceApp",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "package",
+                          "href": "/products",
                           "label": "Products",
-                          "href": "/products"
+                          "icon": "package"
                         },
                         {
                           "label": "Cart",
@@ -2053,115 +2055,113 @@
                           "href": "/orders"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "direction": "vertical",
                           "gap": "lg",
+                          "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "justify": "between",
-                              "type": "stack",
                               "children": [
                                 {
+                                  "direction": "horizontal",
                                   "type": "stack",
                                   "gap": "md",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "shopping-cart"
+                                      "name": "shopping-cart",
+                                      "type": "icon"
                                     },
                                     {
-                                      "content": "Shopping Cart",
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "variant": "h2"
+                                      "content": "Shopping Cart"
                                     }
                                   ]
                                 },
                                 {
-                                  "icon": "plus",
                                   "action": "ADD_ITEM",
+                                  "variant": "primary",
                                   "type": "button",
                                   "label": "Add Item",
-                                  "variant": "primary"
+                                  "icon": "plus"
                                 }
                               ],
                               "direction": "horizontal",
-                              "gap": "md"
+                              "type": "stack",
+                              "gap": "md",
+                              "justify": "between"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "simple-grid",
                               "cols": 3.0,
                               "children": [
                                 {
-                                  "label": "Items",
-                                  "icon": "package",
                                   "type": "stat-display",
-                                  "value": "@payload.data.length"
+                                  "label": "Items",
+                                  "value": "@payload.data.length",
+                                  "icon": "package"
                                 },
                                 {
                                   "icon": "dollar-sign",
-                                  "value": "@payload.data.length",
                                   "label": "Subtotal",
-                                  "type": "stat-display"
+                                  "type": "stat-display",
+                                  "value": "@payload.data.length"
                                 },
                                 {
-                                  "type": "stat-display",
                                   "label": "Total",
-                                  "icon": "receipt",
-                                  "value": "@payload.data.length"
+                                  "type": "stat-display",
+                                  "value": "@payload.data.length",
+                                  "icon": "receipt"
                                 }
-                              ],
-                              "type": "simple-grid"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "itemActions": [
+                                {
+                                  "label": "Remove",
+                                  "event": "REQUEST_REMOVE",
+                                  "variant": "danger"
+                                }
+                              ],
+                              "entity": "@payload.data",
                               "type": "data-grid",
                               "fields": [
                                 {
-                                  "variant": "h4",
+                                  "name": "productName",
                                   "label": "Product Name",
                                   "icon": "shopping-cart",
-                                  "name": "productName"
+                                  "variant": "h4"
                                 },
                                 {
-                                  "label": "Quantity",
-                                  "name": "quantity",
                                   "format": "currency",
-                                  "variant": "caption"
+                                  "name": "quantity",
+                                  "variant": "caption",
+                                  "label": "Quantity"
                                 },
                                 {
                                   "name": "unitPrice",
                                   "label": "Unit Price",
                                   "variant": "badge"
                                 }
-                              ],
-                              "entity": "@payload.data",
-                              "itemActions": [
-                                {
-                                  "label": "Remove",
-                                  "variant": "danger",
-                                  "event": "REQUEST_REMOVE"
-                                }
                               ]
                             },
                             {
-                              "icon": "arrow-right",
                               "variant": "primary",
-                              "label": "Proceed to Checkout",
                               "action": "PROCEED_CHECKOUT",
+                              "icon": "arrow-right",
+                              "label": "Proceed to Checkout",
                               "type": "button"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         }
-                      ],
-                      "appName": "EcommerceApp"
+                      ]
                     }
                   ]
                 ]
@@ -2175,36 +2175,36 @@
                     "render-ui",
                     "main",
                     {
+                      "direction": "vertical",
+                      "align": "center",
+                      "className": "py-12",
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
-                          "name": "alert-triangle",
                           "type": "icon",
-                          "color": "destructive"
+                          "color": "destructive",
+                          "name": "alert-triangle"
                         },
                         {
-                          "variant": "h3",
                           "content": "Failed to load cartitem",
-                          "type": "typography"
+                          "type": "typography",
+                          "variant": "h3"
                         },
                         {
-                          "variant": "body",
                           "content": "@payload.error",
+                          "variant": "body",
                           "type": "typography",
                           "color": "muted"
                         },
                         {
                           "type": "button",
-                          "icon": "rotate-ccw",
+                          "label": "Retry",
                           "action": "INIT",
-                          "variant": "primary",
-                          "label": "Retry"
+                          "icon": "rotate-ccw",
+                          "variant": "primary"
                         }
-                      ],
-                      "className": "py-12",
-                      "direction": "vertical",
-                      "gap": "md",
-                      "type": "stack",
-                      "align": "center"
+                      ]
                     }
                   ]
                 ]
@@ -2228,22 +2228,22 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
-                      "gap": "md",
-                      "className": "py-12",
                       "type": "stack",
+                      "gap": "md",
                       "align": "center",
+                      "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
+                          "type": "typography",
                           "variant": "caption",
-                          "color": "muted",
                           "content": "Preparing checkout…",
-                          "type": "typography"
+                          "color": "muted"
                         }
-                      ]
+                      ],
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -2258,14 +2258,36 @@
                     "main",
                     {
                       "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "package",
+                          "label": "Products",
+                          "href": "/products"
+                        },
+                        {
+                          "label": "Cart",
+                          "href": "/cart",
+                          "icon": "shopping-cart"
+                        },
+                        {
+                          "label": "Checkout",
+                          "href": "/checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "icon": "clipboard-list",
+                          "href": "/orders",
+                          "label": "Orders"
+                        }
+                      ],
+                      "appName": "EcommerceApp",
                       "children": [
                         {
-                          "type": "stack",
                           "gap": "lg",
-                          "direction": "vertical",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "stack",
+                              "direction": "horizontal",
                               "children": [
                                 {
                                   "type": "icon",
@@ -2273,94 +2295,72 @@
                                 },
                                 {
                                   "variant": "h2",
-                                  "type": "typography",
-                                  "content": "Checkout"
+                                  "content": "Checkout",
+                                  "type": "typography"
                                 }
                               ],
-                              "gap": "sm",
-                              "direction": "horizontal"
+                              "type": "stack",
+                              "gap": "sm"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "data-grid",
+                              "entity": "@payload.data",
                               "itemActions": [
                                 {
                                   "event": "REQUEST_REMOVE",
-                                  "variant": "danger",
-                                  "label": "Remove"
+                                  "label": "Remove",
+                                  "variant": "danger"
                                 }
                               ],
+                              "type": "data-grid",
                               "fields": [
                                 {
-                                  "variant": "h4",
-                                  "icon": "shopping-cart",
                                   "label": "Product Name",
-                                  "name": "productName"
+                                  "name": "productName",
+                                  "icon": "shopping-cart",
+                                  "variant": "h4"
                                 },
                                 {
-                                  "format": "currency",
                                   "variant": "caption",
                                   "name": "quantity",
+                                  "format": "currency",
                                   "label": "Quantity"
                                 },
                                 {
-                                  "label": "Unit Price",
                                   "name": "unitPrice",
+                                  "label": "Unit Price",
                                   "variant": "badge"
                                 }
-                              ],
-                              "entity": "@payload.data"
+                              ]
                             },
                             {
-                              "direction": "horizontal",
-                              "justify": "end",
                               "type": "stack",
                               "gap": "sm",
                               "children": [
                                 {
-                                  "label": "Back to Cart",
-                                  "variant": "ghost",
                                   "icon": "arrow-left",
                                   "action": "BACK_TO_CART",
-                                  "type": "button"
+                                  "label": "Back to Cart",
+                                  "type": "button",
+                                  "variant": "ghost"
                                 },
                                 {
-                                  "action": "CONFIRM_ORDER",
                                   "type": "button",
+                                  "action": "CONFIRM_ORDER",
+                                  "label": "Confirm Order",
                                   "variant": "primary",
-                                  "icon": "check",
-                                  "label": "Confirm Order"
+                                  "icon": "check"
                                 }
-                              ]
+                              ],
+                              "justify": "end",
+                              "direction": "horizontal"
                             }
-                          ]
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
-                        },
-                        {
-                          "icon": "shopping-cart",
-                          "href": "/cart",
-                          "label": "Cart"
-                        },
-                        {
-                          "icon": "credit-card",
-                          "href": "/checkout",
-                          "label": "Checkout"
-                        },
-                        {
-                          "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
+                          ],
+                          "direction": "vertical"
                         }
-                      ],
-                      "appName": "EcommerceApp"
+                      ]
                     }
                   ]
                 ]
@@ -2392,8 +2392,8 @@
                     "CartItem",
                     {
                       "emit": {
-                        "failure": "CartItemLoadFailed",
-                        "success": "CartItemLoaded"
+                        "success": "CartItemLoaded",
+                        "failure": "CartItemLoadFailed"
                       }
                     }
                   ],
@@ -2401,60 +2401,60 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "package",
-                          "label": "Products",
-                          "href": "/products"
-                        },
-                        {
-                          "icon": "shopping-cart",
-                          "href": "/cart",
-                          "label": "Cart"
-                        },
-                        {
-                          "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
-                        },
-                        {
-                          "icon": "clipboard-list",
-                          "href": "/orders",
-                          "label": "Orders"
-                        }
-                      ],
-                      "appName": "EcommerceApp",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "stack",
-                          "direction": "vertical",
-                          "gap": "lg",
+                          "align": "center",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
                               "type": "typography",
-                              "content": "Order Confirmed",
-                              "variant": "h2"
+                              "variant": "h2",
+                              "content": "Order Confirmed"
                             },
                             {
-                              "content": "Your order has been placed successfully.",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Your order has been placed successfully."
                             },
                             {
-                              "label": "Continue Shopping",
                               "action": "INIT",
+                              "label": "Continue Shopping",
                               "type": "button",
                               "variant": "primary"
                             }
                           ],
-                          "align": "center"
+                          "gap": "lg",
+                          "direction": "vertical"
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Products",
+                          "href": "/products",
+                          "icon": "package"
+                        },
+                        {
+                          "label": "Cart",
+                          "href": "/cart",
+                          "icon": "shopping-cart"
+                        },
+                        {
+                          "icon": "credit-card",
+                          "href": "/checkout",
+                          "label": "Checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "label": "Orders",
+                          "icon": "clipboard-list"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "appName": "EcommerceApp"
                     }
                   ]
                 ]
@@ -2622,8 +2622,8 @@
                     "CartItem",
                     {
                       "emit": {
-                        "failure": "CartItemLoadFailed",
-                        "success": "CartItemLoaded"
+                        "success": "CartItemLoaded",
+                        "failure": "CartItemLoadFailed"
                       }
                     }
                   ]
@@ -2639,8 +2639,8 @@
                     "CartItem",
                     {
                       "emit": {
-                        "failure": "CartItemLoadFailed",
-                        "success": "CartItemLoaded"
+                        "success": "CartItemLoaded",
+                        "failure": "CartItemLoadFailed"
                       }
                     }
                   ],
@@ -2648,25 +2648,25 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
                       "direction": "vertical",
+                      "gap": "md",
                       "type": "stack",
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
                               "name": "plus-circle"
                             },
                             {
-                              "type": "typography",
+                              "variant": "h3",
                               "content": "Add Item",
-                              "variant": "h3"
+                              "type": "typography"
                             }
-                          ],
-                          "gap": "sm",
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -2680,8 +2680,8 @@
                             "totalPrice"
                           ],
                           "type": "form-section",
-                          "mode": "create",
-                          "submitEvent": "SAVE"
+                          "submitEvent": "SAVE",
+                          "mode": "create"
                         }
                       ]
                     }
@@ -2724,8 +2724,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "CartItemSaved",
-                        "failure": "CartItemSaveFailed"
+                        "failure": "CartItemSaveFailed",
+                        "success": "CartItemSaved"
                       }
                     }
                   ],
@@ -2942,56 +2942,56 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "align": "center",
-                          "gap": "sm",
                           "type": "stack",
+                          "gap": "sm",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
                               "variant": "h3",
-                              "type": "typography",
-                              "content": "Remove Item"
+                              "content": "Remove Item",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "message": "Are you sure you want to remove this item from your cart?",
                           "type": "alert",
-                          "variant": "error"
+                          "variant": "error",
+                          "message": "Are you sure you want to remove this item from your cart?"
                         },
                         {
                           "direction": "horizontal",
-                          "justify": "end",
+                          "type": "stack",
                           "children": [
                             {
                               "label": "Cancel",
+                              "action": "CANCEL",
                               "variant": "ghost",
-                              "type": "button",
-                              "action": "CANCEL"
+                              "type": "button"
                             },
                             {
-                              "label": "Remove",
                               "action": "CONFIRM_REMOVE",
+                              "label": "Remove",
+                              "variant": "danger",
                               "type": "button",
-                              "icon": "check",
-                              "variant": "danger"
+                              "icon": "check"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "sm"
+                          "gap": "sm",
+                          "justify": "end"
                         }
                       ],
-                      "gap": "md",
+                      "direction": "vertical",
                       "type": "stack"
                     }
                   ]
@@ -3031,8 +3031,8 @@
                     "CartItem",
                     {
                       "emit": {
-                        "failure": "CartItemLoadFailed",
-                        "success": "CartItemLoaded"
+                        "success": "CartItemLoaded",
+                        "failure": "CartItemLoadFailed"
                       }
                     }
                   ]
@@ -3089,8 +3089,8 @@
                     "CartItem",
                     {
                       "emit": {
-                        "success": "CartItemLoaded",
-                        "failure": "CartItemLoadFailed"
+                        "failure": "CartItemLoadFailed",
+                        "success": "CartItemLoaded"
                       }
                     }
                   ]
@@ -3166,9 +3166,9 @@
           "name": "CheckoutPayment",
           "config": {
             "currency": "usd",
-            "amount": 0.0,
             "metadata": {},
-            "uiTrait": "@trait.CheckoutPaymentForm"
+            "uiTrait": "@trait.CheckoutPaymentForm",
+            "amount": 0.0
           },
           "listens": [
             {
@@ -3223,45 +3223,45 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "alert",
                           "variant": "info",
-                          "message": "Enter card details to complete your order."
+                          "message": "Enter card details to complete your order.",
+                          "type": "alert"
                         },
                         {
+                          "placeholder": "Card number",
                           "inputType": "text",
-                          "type": "input",
-                          "placeholder": "Card number"
+                          "type": "input"
                         },
                         {
                           "type": "stack",
                           "children": [
                             {
-                              "inputType": "text",
                               "placeholder": "MM/YY",
-                              "type": "input"
+                              "type": "input",
+                              "inputType": "text"
                             },
                             {
+                              "placeholder": "CVC",
                               "type": "input",
-                              "inputType": "text",
-                              "placeholder": "CVC"
+                              "inputType": "text"
                             }
                           ],
-                          "gap": "sm",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
-                          "icon": "credit-card",
-                          "variant": "primary",
-                          "label": "Pay now",
                           "action": "CREATE_PAYMENT",
-                          "type": "button"
+                          "label": "Pay now",
+                          "type": "button",
+                          "variant": "primary",
+                          "icon": "credit-card"
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -3502,11 +3502,15 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "max-w-xl mx-auto w-full",
+                      "gap": "lg",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "typography",
                           "variant": "h2",
-                          "content": "Checkout"
+                          "content": "Checkout",
+                          "type": "typography"
                         },
                         {
                           "steps": [
@@ -3523,33 +3527,29 @@
                         },
                         {
                           "type": "typography",
-                          "variant": "h3",
-                          "content": "Customer Info"
+                          "content": "Customer Info",
+                          "variant": "h3"
                         },
                         {
                           "showCancel": false,
-                          "submitLabel": "Continue",
-                          "mode": "create",
                           "fields": [
                             {
-                              "name": "customerName",
                               "required": true,
-                              "min": 2.0
+                              "min": 2.0,
+                              "name": "customerName"
                             },
                             {
-                              "name": "email",
                               "type": "email",
-                              "required": true
+                              "required": true,
+                              "name": "email"
                             }
                           ],
-                          "type": "form-section",
-                          "submitEvent": "NEXT"
+                          "submitLabel": "Continue",
+                          "mode": "create",
+                          "submitEvent": "NEXT",
+                          "type": "form-section"
                         }
-                      ],
-                      "gap": "lg",
-                      "className": "max-w-xl mx-auto w-full",
-                      "direction": "vertical",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -3558,6 +3558,11 @@
                 "from": "step1",
                 "to": "step2",
                 "event": "NEXT",
+                "guard": [
+                  "and",
+                  "@payload.data.customerName",
+                  "@payload.data.email"
+                ],
                 "effects": [
                   [
                     "set",
@@ -3573,9 +3578,10 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
                       "className": "max-w-xl mx-auto w-full",
                       "gap": "lg",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
                           "variant": "h2",
@@ -3601,23 +3607,22 @@
                           "content": "Shipping Address"
                         },
                         {
-                          "entity": "@entity",
-                          "submitEvent": "NEXT",
+                          "type": "form-section",
                           "submitLabel": "Continue",
                           "cancelLabel": "Back",
                           "cancelEvent": "PREV",
-                          "mode": "edit",
+                          "submitEvent": "NEXT",
                           "fields": [
                             {
-                              "required": true,
                               "min": 5.0,
+                              "required": true,
                               "name": "shippingAddress"
                             }
                           ],
-                          "type": "form-section"
+                          "entity": "@entity",
+                          "mode": "edit"
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -3626,6 +3631,12 @@
                 "from": "step2",
                 "to": "step3",
                 "event": "NEXT",
+                "guard": [
+                  "and",
+                  "@entity.customerName",
+                  "@entity.email",
+                  "@payload.data.shippingAddress"
+                ],
                 "effects": [
                   [
                     "set",
@@ -3636,51 +3647,51 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
-                          "content": "Checkout",
                           "type": "typography",
+                          "content": "Checkout",
                           "variant": "h2"
                         },
                         {
+                          "currentStep": 2.0,
+                          "type": "wizard-progress",
                           "steps": [
                             "Customer Info",
                             "Shipping",
                             "Payment",
                             "Review"
-                          ],
-                          "currentStep": 2.0,
-                          "type": "wizard-progress"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "h3",
                           "content": "Payment",
-                          "type": "typography"
+                          "type": "typography",
+                          "variant": "h3"
                         },
                         "@trait.CheckoutPayment",
                         {
+                          "direction": "horizontal",
                           "gap": "sm",
                           "type": "stack",
-                          "justify": "start",
                           "children": [
                             {
-                              "action": "PREV",
+                              "variant": "ghost",
                               "type": "button",
+                              "icon": "arrow-left",
                               "label": "Back",
-                              "variant": "ghost",
-                              "icon": "arrow-left"
+                              "action": "PREV"
                             }
                           ],
-                          "direction": "horizontal"
+                          "justify": "start"
                         }
                       ],
-                      "direction": "vertical",
-                      "gap": "lg",
                       "type": "stack",
-                      "className": "max-w-xl mx-auto w-full"
+                      "direction": "vertical",
+                      "gap": "lg"
                     }
                   ]
                 ]
@@ -3694,8 +3705,9 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "lg",
                       "type": "stack",
+                      "gap": "lg",
+                      "direction": "vertical",
                       "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
@@ -3717,32 +3729,31 @@
                           "type": "divider"
                         },
                         {
-                          "variant": "h3",
                           "type": "typography",
-                          "content": "Customer Info"
+                          "content": "Customer Info",
+                          "variant": "h3"
                         },
                         {
-                          "type": "form-section",
-                          "entity": "@entity",
+                          "mode": "edit",
+                          "submitLabel": "Continue",
+                          "showCancel": false,
                           "fields": [
                             {
+                              "name": "customerName",
                               "required": true,
-                              "min": 2.0,
-                              "name": "customerName"
+                              "min": 2.0
                             },
                             {
                               "name": "email",
-                              "type": "email",
-                              "required": true
+                              "required": true,
+                              "type": "email"
                             }
                           ],
-                          "mode": "edit",
-                          "showCancel": false,
-                          "submitLabel": "Continue",
+                          "type": "form-section",
+                          "entity": "@entity",
                           "submitEvent": "NEXT"
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -3751,6 +3762,12 @@
                 "from": "step3",
                 "to": "review",
                 "event": "PAYMENT_DONE",
+                "guard": [
+                  "and",
+                  "@entity.customerName",
+                  "@entity.email",
+                  "@entity.shippingAddress"
+                ],
                 "effects": [
                   [
                     "render-ui",
@@ -3758,7 +3775,6 @@
                     {
                       "type": "stack",
                       "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
                           "variant": "h2",
@@ -3779,14 +3795,13 @@
                           "type": "divider"
                         },
                         {
-                          "direction": "vertical",
                           "gap": "sm",
                           "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
+                              "gap": "md",
                               "type": "stack",
-                              "direction": "horizontal",
-                              "justify": "between",
                               "children": [
                                 {
                                   "type": "typography",
@@ -3794,17 +3809,18 @@
                                   "content": "Customer"
                                 },
                                 {
+                                  "content": "@entity.customerName",
                                   "variant": "body",
-                                  "type": "typography",
-                                  "content": "@entity.customerName"
+                                  "type": "typography"
                                 }
                               ],
-                              "gap": "md"
+                              "justify": "between",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "stack",
                               "gap": "md",
-                              "direction": "horizontal",
+                              "justify": "between",
                               "children": [
                                 {
                                   "type": "typography",
@@ -3812,48 +3828,48 @@
                                   "variant": "caption"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "body",
-                                  "content": "@entity.email"
+                                  "content": "@entity.email",
+                                  "type": "typography"
                                 }
                               ],
-                              "justify": "between"
+                              "direction": "horizontal"
                             },
                             {
-                              "type": "stack",
                               "direction": "horizontal",
-                              "justify": "between",
-                              "gap": "md",
                               "children": [
                                 {
+                                  "content": "Shipping",
                                   "variant": "caption",
-                                  "type": "typography",
-                                  "content": "Shipping"
+                                  "type": "typography"
                                 },
                                 {
-                                  "variant": "body",
+                                  "type": "typography",
                                   "content": "@entity.shippingAddress",
-                                  "type": "typography"
+                                  "variant": "body"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "justify": "between",
+                              "gap": "md"
                             },
                             {
+                              "justify": "between",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "content": "Order total",
                                   "variant": "caption",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Order total"
                                 },
                                 {
+                                  "type": "typography",
                                   "variant": "body",
-                                  "content": "@entity.orderTotal",
-                                  "type": "typography"
+                                  "content": "@entity.orderTotal"
                                 }
                               ],
-                              "type": "stack",
-                              "direction": "horizontal",
                               "gap": "md",
-                              "justify": "between"
+                              "type": "stack"
                             }
                           ]
                         },
@@ -3861,29 +3877,30 @@
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "gap": "sm",
+                          "direction": "horizontal",
+                          "justify": "between",
                           "children": [
                             {
-                              "action": "PREV",
                               "label": "Back",
                               "type": "button",
+                              "icon": "arrow-left",
                               "variant": "ghost",
-                              "icon": "arrow-left"
+                              "action": "PREV"
                             },
                             {
-                              "icon": "check",
-                              "type": "button",
                               "action": "COMPLETE",
+                              "type": "button",
                               "label": "Place order",
+                              "icon": "check",
                               "variant": "primary"
                             }
                           ],
-                          "justify": "between",
-                          "direction": "horizontal"
+                          "type": "stack",
+                          "gap": "sm"
                         }
                       ],
-                      "gap": "lg"
+                      "gap": "lg",
+                      "className": "max-w-xl mx-auto w-full"
                     }
                   ]
                 ]
@@ -3897,23 +3914,20 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
-                      "type": "stack",
                       "children": [
                         {
                           "content": "Checkout",
-                          "type": "typography",
-                          "variant": "h2"
+                          "variant": "h2",
+                          "type": "typography"
                         },
                         {
+                          "currentStep": 1.0,
                           "steps": [
                             "Customer Info",
                             "Shipping",
                             "Payment",
                             "Review"
                           ],
-                          "currentStep": 1.0,
                           "type": "wizard-progress"
                         },
                         {
@@ -3925,22 +3939,25 @@
                           "type": "typography"
                         },
                         {
-                          "type": "form-section",
+                          "cancelLabel": "Back",
+                          "cancelEvent": "PREV",
                           "submitLabel": "Continue",
+                          "type": "form-section",
+                          "entity": "@entity",
+                          "mode": "edit",
                           "fields": [
                             {
                               "min": 5.0,
-                              "name": "shippingAddress",
-                              "required": true
+                              "required": true,
+                              "name": "shippingAddress"
                             }
                           ],
-                          "mode": "edit",
-                          "entity": "@entity",
-                          "cancelLabel": "Back",
-                          "submitEvent": "NEXT",
-                          "cancelEvent": "PREV"
+                          "submitEvent": "NEXT"
                         }
                       ],
+                      "className": "max-w-xl mx-auto w-full",
+                      "type": "stack",
+                      "direction": "vertical",
                       "gap": "lg"
                     }
                   ]
@@ -3950,6 +3967,12 @@
                 "from": "review",
                 "to": "complete",
                 "event": "COMPLETE",
+                "guard": [
+                  "and",
+                  "@entity.customerName",
+                  "@entity.email",
+                  "@entity.shippingAddress"
+                ],
                 "effects": [
                   [
                     "set",
@@ -3963,8 +3986,8 @@
                     "@entity",
                     {
                       "emit": {
-                        "failure": "CheckoutSaveFailed",
-                        "success": "CheckoutSaved"
+                        "success": "CheckoutSaved",
+                        "failure": "CheckoutSaveFailed"
                       }
                     }
                   ],
@@ -3984,35 +4007,35 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "max-w-xl mx-auto w-full py-12",
                       "gap": "lg",
+                      "direction": "vertical",
+                      "align": "center",
                       "children": [
                         {
                           "type": "icon",
                           "name": "check-circle"
                         },
                         {
-                          "variant": "h2",
                           "content": "Order placed",
+                          "variant": "h2",
                           "type": "typography"
                         },
                         {
-                          "type": "typography",
                           "color": "muted",
-                          "variant": "body",
-                          "content": "Your order is confirmed and on its way."
+                          "content": "Your order is confirmed and on its way.",
+                          "type": "typography",
+                          "variant": "body"
                         },
                         {
                           "action": "RESTART",
-                          "icon": "rotate-ccw",
-                          "type": "button",
+                          "label": "Start new order",
                           "variant": "ghost",
-                          "label": "Start new order"
+                          "type": "button",
+                          "icon": "rotate-ccw"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "align": "center",
-                      "className": "max-w-xl mx-auto w-full py-12"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -4026,24 +4049,21 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
-                      "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
-                          "type": "typography",
+                          "content": "Checkout",
                           "variant": "h2",
-                          "content": "Checkout"
+                          "type": "typography"
                         },
                         {
+                          "currentStep": 2.0,
+                          "type": "wizard-progress",
                           "steps": [
                             "Customer Info",
                             "Shipping",
                             "Payment",
                             "Review"
-                          ],
-                          "type": "wizard-progress",
-                          "currentStep": 2.0
+                          ]
                         },
                         {
                           "type": "divider"
@@ -4055,22 +4075,25 @@
                         },
                         "@trait.CheckoutPayment",
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
                           "gap": "sm",
+                          "direction": "horizontal",
                           "justify": "start",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "button",
-                              "label": "Back",
                               "variant": "ghost",
+                              "label": "Back",
                               "action": "PREV",
                               "icon": "arrow-left"
                             }
                           ]
                         }
                       ],
-                      "gap": "lg"
+                      "gap": "lg",
+                      "direction": "vertical",
+                      "className": "max-w-xl mx-auto w-full",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -4109,54 +4132,54 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
-                      "type": "stack",
                       "gap": "lg",
+                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
-                          "variant": "h2",
                           "type": "typography",
-                          "content": "Checkout"
+                          "content": "Checkout",
+                          "variant": "h2"
                         },
                         {
                           "type": "wizard-progress",
+                          "currentStep": 0.0,
                           "steps": [
                             "Customer Info",
                             "Shipping",
                             "Payment",
                             "Review"
-                          ],
-                          "currentStep": 0.0
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "content": "Customer Info",
+                          "variant": "h3",
                           "type": "typography",
-                          "variant": "h3"
+                          "content": "Customer Info"
                         },
                         {
                           "type": "form-section",
-                          "submitLabel": "Continue",
+                          "showCancel": false,
+                          "mode": "create",
                           "fields": [
                             {
-                              "min": 2.0,
+                              "name": "customerName",
                               "required": true,
-                              "name": "customerName"
+                              "min": 2.0
                             },
                             {
-                              "required": true,
                               "type": "email",
-                              "name": "email"
+                              "name": "email",
+                              "required": true
                             }
                           ],
-                          "mode": "create",
-                          "showCancel": false,
-                          "submitEvent": "NEXT"
+                          "submitEvent": "NEXT",
+                          "submitLabel": "Continue"
                         }
-                      ]
+                      ],
+                      "direction": "vertical",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -4507,8 +4530,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "success": "OrderRecordLoaded",
-                        "failure": "OrderRecordLoadFailed"
+                        "failure": "OrderRecordLoadFailed",
+                        "success": "OrderRecordLoaded"
                       }
                     }
                   ],
@@ -4521,17 +4544,17 @@
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
                           "variant": "caption",
                           "content": "Loading…",
-                          "color": "muted"
+                          "color": "muted",
+                          "type": "typography"
                         }
                       ],
-                      "className": "py-12",
-                      "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
-                      "align": "center"
+                      "align": "center",
+                      "direction": "vertical",
+                      "className": "py-12",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -4545,76 +4568,75 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "EcommerceApp",
-                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "package",
+                          "label": "Products",
+                          "href": "/products"
+                        },
+                        {
+                          "label": "Cart",
+                          "icon": "shopping-cart",
+                          "href": "/cart"
+                        },
+                        {
+                          "href": "/checkout",
+                          "icon": "credit-card",
+                          "label": "Checkout"
+                        },
+                        {
+                          "icon": "clipboard-list",
+                          "label": "Orders",
+                          "href": "/orders"
+                        }
+                      ],
                       "children": [
                         {
-                          "gap": "lg",
                           "children": [
                             {
+                              "align": "center",
                               "gap": "md",
-                              "direction": "horizontal",
+                              "justify": "between",
                               "children": [
                                 {
-                                  "align": "center",
                                   "type": "stack",
+                                  "gap": "sm",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "name": "clipboard-list",
                                       "type": "icon"
                                     },
                                     {
-                                      "type": "typography",
+                                      "content": "Order History",
                                       "variant": "h2",
-                                      "content": "Order History"
+                                      "type": "typography"
                                     }
-                                  ],
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  ]
                                 },
                                 {
                                   "gap": "sm",
-                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "button",
-                                      "variant": "primary",
-                                      "label": "Create OrderRecord",
                                       "action": "CREATE",
+                                      "label": "Create OrderRecord",
+                                      "variant": "primary",
                                       "icon": "plus"
                                     }
                                   ]
                                 }
                               ],
-                              "align": "center",
                               "type": "stack",
-                              "justify": "between"
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "label": "View",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "label": "Edit",
-                                  "event": "EDIT",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "variant": "danger",
-                                  "event": "DELETE",
-                                  "label": "Delete"
-                                }
-                              ],
-                              "gap": "sm",
-                              "entity": "@payload.data",
-                              "variant": "card",
                               "fields": [
                                 {
                                   "icon": "clipboard-list",
@@ -4623,55 +4645,56 @@
                                   "name": "customerName"
                                 },
                                 {
-                                  "name": "status",
-                                  "variant": "badge"
+                                  "variant": "badge",
+                                  "name": "status"
                                 },
                                 {
-                                  "format": "currency",
-                                  "name": "orderTotal",
                                   "label": "Total",
-                                  "variant": "h4"
+                                  "variant": "h4",
+                                  "format": "currency",
+                                  "name": "orderTotal"
+                                },
+                                {
+                                  "variant": "caption",
+                                  "name": "email"
+                                },
+                                {
+                                  "name": "shippingAddress",
+                                  "label": "Address",
+                                  "variant": "caption"
+                                }
+                              ],
+                              "gap": "sm",
+                              "type": "data-list",
+                              "variant": "card",
+                              "entity": "@payload.data",
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "label": "View",
+                                  "event": "VIEW"
                                 },
                                 {
-                                  "name": "email",
-                                  "variant": "caption"
+                                  "variant": "ghost",
+                                  "label": "Edit",
+                                  "event": "EDIT"
                                 },
                                 {
-                                  "variant": "caption",
-                                  "label": "Address",
-                                  "name": "shippingAddress"
+                                  "label": "Delete",
+                                  "event": "DELETE",
+                                  "variant": "danger"
                                 }
-                              ],
-                              "type": "data-list"
+                              ]
                             }
                           ],
+                          "gap": "lg",
                           "direction": "vertical",
-                          "type": "stack",
-                          "className": "max-w-5xl mx-auto w-full"
+                          "className": "max-w-5xl mx-auto w-full",
+                          "type": "stack"
                         }
                       ],
-                      "navItems": [
-                        {
-                          "icon": "package",
-                          "label": "Products",
-                          "href": "/products"
-                        },
-                        {
-                          "href": "/cart",
-                          "label": "Cart",
-                          "icon": "shopping-cart"
-                        },
-                        {
-                          "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
-                        },
-                        {
-                          "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
-                        }
-                      ]
+                      "type": "dashboard-layout",
+                      "appName": "EcommerceApp"
                     }
                   ]
                 ]
@@ -4686,35 +4709,35 @@
                     "main",
                     {
                       "gap": "md",
-                      "className": "py-12",
-                      "direction": "vertical",
+                      "type": "stack",
                       "align": "center",
+                      "direction": "vertical",
+                      "className": "py-12",
                       "children": [
                         {
                           "color": "destructive",
-                          "name": "alert-triangle",
-                          "type": "icon"
+                          "type": "icon",
+                          "name": "alert-triangle"
                         },
                         {
-                          "content": "Failed to load orderrecord",
                           "type": "typography",
-                          "variant": "h3"
+                          "variant": "h3",
+                          "content": "Failed to load orderrecord"
                         },
                         {
+                          "content": "@payload.error",
                           "color": "muted",
                           "variant": "body",
-                          "type": "typography",
-                          "content": "@payload.error"
+                          "type": "typography"
                         },
                         {
-                          "icon": "rotate-ccw",
+                          "action": "INIT",
                           "type": "button",
-                          "variant": "primary",
                           "label": "Retry",
-                          "action": "INIT"
+                          "variant": "primary",
+                          "icon": "rotate-ccw"
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -4889,8 +4912,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "success": "OrderRecordLoaded",
-                        "failure": "OrderRecordLoadFailed"
+                        "failure": "OrderRecordLoadFailed",
+                        "success": "OrderRecordLoaded"
                       }
                     }
                   ]
@@ -4906,8 +4929,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "success": "OrderRecordLoaded",
-                        "failure": "OrderRecordLoadFailed"
+                        "failure": "OrderRecordLoadFailed",
+                        "success": "OrderRecordLoaded"
                       }
                     }
                   ],
@@ -4915,31 +4938,30 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
                           "gap": "sm",
                           "direction": "horizontal",
-                          "type": "stack",
                           "children": [
                             {
-                              "name": "plus-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "plus-circle"
                             },
                             {
-                              "content": "Create OrderRecord",
                               "type": "typography",
+                              "content": "Create OrderRecord",
                               "variant": "h3"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
                           "submitEvent": "SAVE",
                           "fields": [
                             "customerName",
@@ -4949,10 +4971,11 @@
                             "orderTotal",
                             "status"
                           ],
-                          "mode": "create"
+                          "type": "form-section",
+                          "mode": "create",
+                          "cancelEvent": "CLOSE"
                         }
-                      ],
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -4993,8 +5016,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "OrderRecordSaved",
-                        "failure": "OrderRecordSaveFailed"
+                        "failure": "OrderRecordSaveFailed",
+                        "success": "OrderRecordSaved"
                       }
                     }
                   ],
@@ -5204,8 +5227,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "failure": "OrderRecordLoadFailed",
-                        "success": "OrderRecordLoaded"
+                        "success": "OrderRecordLoaded",
+                        "failure": "OrderRecordLoadFailed"
                       }
                     }
                   ]
@@ -5231,23 +5254,21 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "sm",
                           "direction": "horizontal",
+                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
-                              "type": "typography",
+                              "variant": "h3",
                               "content": "Edit OrderRecord",
-                              "variant": "h3"
+                              "type": "typography"
                             }
                           ]
                         },
@@ -5255,6 +5276,9 @@
                           "type": "divider"
                         },
                         {
+                          "submitEvent": "SAVE",
+                          "mode": "edit",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "customerName",
                             "email",
@@ -5263,13 +5287,12 @@
                             "orderTotal",
                             "status"
                           ],
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
-                          "mode": "edit",
                           "entity": "@payload.row",
-                          "submitEvent": "SAVE"
+                          "type": "form-section"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5518,24 +5541,21 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
-                      "direction": "vertical",
-                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
-                          "direction": "horizontal",
-                          "align": "center",
                           "gap": "sm",
+                          "align": "center",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "icon",
                               "name": "eye"
                             },
                             {
-                              "type": "typography",
+                              "content": "@entity.customerName",
                               "variant": "h3",
-                              "content": "@entity.customerName"
+                              "type": "typography"
                             }
                           ]
                         },
@@ -5543,13 +5563,11 @@
                           "type": "divider"
                         },
                         {
-                          "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
                               "content": "Customer Name",
-                              "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
@@ -5557,9 +5575,14 @@
                               "content": "@entity.customerName"
                             }
                           ],
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "typography",
@@ -5568,78 +5591,75 @@
                             },
                             {
                               "variant": "body",
-                              "content": "@entity.email",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.email"
                             }
-                          ],
-                          "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
-                          "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
+                              "variant": "caption",
                               "content": "Shipping Address",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
+                              "type": "typography",
                               "content": "@entity.shippingAddress",
-                              "variant": "body",
-                              "type": "typography"
+                              "variant": "body"
                             }
-                          ]
-                        },
-                        {
+                          ],
                           "type": "stack",
                           "direction": "horizontal",
+                          "gap": "md"
+                        },
+                        {
+                          "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Payment Method",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
-                              "variant": "body",
+                              "type": "typography",
                               "content": "@entity.paymentMethod",
-                              "type": "typography"
+                              "variant": "body"
                             }
                           ],
-                          "gap": "md"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Order Total",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.orderTotal",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.orderTotal"
                             }
                           ],
-                          "direction": "horizontal",
                           "type": "stack",
+                          "direction": "horizontal",
                           "gap": "md"
                         },
                         {
-                          "gap": "md",
                           "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
-                              "content": "Status",
                               "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Status"
                             },
                             {
-                              "content": "@entity.status",
+                              "type": "typography",
                               "variant": "body",
-                              "type": "typography"
+                              "content": "@entity.status"
                             }
                           ],
                           "type": "stack"
@@ -5648,27 +5668,30 @@
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "button",
-                              "label": "Edit",
-                              "action": "EDIT",
                               "variant": "primary",
-                              "icon": "edit"
+                              "action": "EDIT",
+                              "label": "Edit",
+                              "icon": "edit",
+                              "type": "button"
                             },
                             {
                               "label": "Close",
+                              "action": "CLOSE",
                               "variant": "ghost",
-                              "type": "button",
-                              "action": "CLOSE"
+                              "type": "button"
                             }
                           ],
+                          "direction": "horizontal",
+                          "type": "stack",
                           "gap": "sm",
                           "justify": "end"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -5890,8 +5913,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "failure": "OrderRecordLoadFailed",
-                        "success": "OrderRecordLoaded"
+                        "success": "OrderRecordLoaded",
+                        "failure": "OrderRecordLoadFailed"
                       }
                     }
                   ]
@@ -5922,23 +5945,26 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
+                      "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
                           "direction": "horizontal",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
-                              "content": "Delete OrderRecord",
+                              "type": "typography",
                               "variant": "h3",
-                              "type": "typography"
+                              "content": "Delete OrderRecord"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "gap": "sm",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
@@ -5949,30 +5975,27 @@
                           "message": "This action cannot be undone."
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm",
                           "justify": "end",
                           "children": [
                             {
-                              "variant": "ghost",
                               "action": "CANCEL",
+                              "label": "Cancel",
                               "type": "button",
-                              "label": "Cancel"
+                              "variant": "ghost"
                             },
                             {
-                              "type": "button",
-                              "label": "Delete",
+                              "icon": "check",
                               "action": "CONFIRM_DELETE",
+                              "label": "Delete",
                               "variant": "danger",
-                              "icon": "check"
+                              "type": "button"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "type": "stack",
+                          "direction": "horizontal"
                         }
-                      ],
-                      "direction": "vertical",
-                      "type": "stack",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -5989,8 +6012,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "success": "OrderRecordDeleted",
-                        "failure": "OrderRecordDeleteFailed"
+                        "failure": "OrderRecordDeleteFailed",
+                        "success": "OrderRecordDeleted"
                       }
                     }
                   ],
@@ -6011,8 +6034,8 @@
                     "OrderRecord",
                     {
                       "emit": {
-                        "failure": "OrderRecordLoadFailed",
-                        "success": "OrderRecordLoaded"
+                        "success": "OrderRecordLoaded",
+                        "failure": "OrderRecordLoadFailed"
                       }
                     }
                   ],