Merge branch 'main' into chore-update-to-plugin

ui/admin/app/components/form/host/static/index.hbs

@@ -56,16 +56,16 @@
   <form.input
     @name='address'
     @type='text'
-    @value={{@model.attributes.address}}
+    @value={{@model.address}}
     @label={{t 'form.address.label'}}
-    @error={{@model.errors.name}}
+    @error={{@model.errors.address}}
     @helperText={{t 'form.address.help'}}
     readonly={{false}}
     as |field|
   >
-    {{#if @model.errors.name}}
+    {{#if @model.errors.address}}
       <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
+        {{#each @model.errors.address as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>

ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs

@@ -61,7 +61,7 @@
             </Copyable>
           </row.cell>
           <row.cell>
-            <code>{{host.attributes.address}}</code>
+            <code>{{host.address}}</code>
           </row.cell>
         </body.row>
       {{/each}}