Merge branch 'main' into feature-disable-credential-rotation

addons/core/translations/resources/en-us.yaml

@@ -84,19 +84,15 @@ host-catalog:
       title: Welcome to Host Catalogs
   actions:
     delete: Delete Host Catalog
+  help: 
+    static: Provide a list of hosts and host sets with static addresses
+    dynamic: Automate discovery of target hosts and services on Azure or AWS
   types:
-    static:
-      label: Static
-      help: Provide a list of hosts and host sets with static addresses
-    unknown:
-      label: Unknown
-    aws:
-      label: AWS
-    azure:
-      label: Azure
-    dynamic: 
-      label: Dynamic
-      help: Automate discovery of target hosts and services on Azure or AWS
+    static: Static
+    unknown: Plugin
+    aws: AWS
+    azure: Azure
+    dynamic: Dynamic
 host-set:
   title: Host Set
   title_plural: Host Sets
@@ -121,16 +117,6 @@ host-set:
       add-none:
         title: No Hosts Available
         description: No hosts available for selection.
-  types:
-    static:
-      label: Static
-      help: Provide a list of hosts and host sets with static addresses
-    unknown:
-      label: Unknown
-    aws:
-      label: AWS
-    azure:
-      label: Azure
 host:
   title: Host
   title_plural: Hosts
@@ -148,16 +134,6 @@ host:
     add: Add Host
     create: New Host
     delete: Delete Host
-  types:
-    static:
-      label: Static
-      help: Provide a list of hosts and host sets with static addresses
-    unknown:
-      label: Unknown
-    aws:
-      label: AWS
-    azure:
-      label: Azure
 session:
   title: Session
   title_plural: Sessions

ui/admin/app/components/form/host-catalog/aws/index.hbs

@@ -55,15 +55,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static.label'}}
+            @label={{t 'resources.host-catalog.types.static'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.help.static'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic.label'}}
+            @label={{t 'resources.host-catalog.types.dynamic'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.help.dynamic'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -89,13 +89,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws.label'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure.label'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -115,7 +115,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws.label'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'

ui/admin/app/components/form/host-catalog/azure/index.hbs

@@ -55,15 +55,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static.label'}}
+            @label={{t 'resources.host-catalog.types.static'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.help.static'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic.label'}}
+            @label={{t 'resources.host-catalog.types.dynamic'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.help.dynamic'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -88,13 +88,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws.label'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure.label'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -116,7 +116,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure.label'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'

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

@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static.label'}}
+            @label={{t 'resources.host-catalog.types.static'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.help.static'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic.label'}}
+            @label={{t 'resources.host-catalog.types.dynamic'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.help.dynamic'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -92,12 +92,12 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.aws.label'}}
+              @label={{t 'resources.host-catalog.types.aws'}}
               @value='aws'
               @layout='tile'
             />
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.azure.label'}}
+              @label={{t 'resources.host-catalog.types.azure'}}
               @value='azure'
               @layout='tile'
             />

ui/admin/app/components/form/host-set/aws/index.hbs

@@ -65,7 +65,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host-set.types.aws.label'}}
+          @label={{t 'resources.host-catalog.types.aws'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon='flight-icons/svg/aws-color-16'

ui/admin/app/components/form/host-set/azure/index.hbs

@@ -65,7 +65,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host-set.types.azure.label'}}
+          @label={{t 'resources.host-catalog.types.azure'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon='flight-icons/svg/azure-color-16'

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

@@ -63,7 +63,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host.types.aws.label'}}
+          @label={{t 'resources.host-catalog.types.aws'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon={{concat 'flight-icons/svg/' @model.compositeType '-color-16'}}

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

@@ -63,7 +63,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host.types.azure.label'}}
+          @label={{t 'resources.host-catalog.types.azure'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon={{concat 'flight-icons/svg/' @model.compositeType '-color-16'}}

ui/admin/app/components/host-catalog-type-badge/index.hbs

@@ -1,15 +1,15 @@
 {{#if @model.isStatic}}
   <Rose::Badge>
-    {{t (concat 'resources.host-catalog.types.' @model.compositeType '.label')}}
+    {{t (concat 'resources.host-catalog.types.' @model.compositeType)}}
   </Rose::Badge>
 {{else if @model.isUnknown}}
   <Rose::Badge>
-    {{t (concat 'resources.host-catalog.types.' @model.compositeType '.label')}}
+    {{t (concat 'resources.host-catalog.types.' @model.compositeType)}}
   </Rose::Badge>
 {{else}}
   <Rose::Badge
     @icon={{concat 'flight-icons/svg/' @model.compositeType '-color-16'}}
   >
-    {{t (concat 'resources.host-catalog.types.' @model.compositeType '.label')}}
+    {{t (concat 'resources.host-catalog.types.' @model.compositeType)}}
   </Rose::Badge>
 {{/if}}

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

@@ -27,25 +27,7 @@
             <p>{{host.description}}</p>
           </row.headerCell>
           <row.cell>
-            {{#if host.isStatic}}
-              <Rose::Badge>
-                {{t
-                  (concat 'resources.host.types.' host.compositeType '.label')
-                }}
-              </Rose::Badge>
-            {{else}}
-              <Rose::Badge
-                @icon={{concat
-                  'flight-icons/svg/'
-                  host.compositeType
-                  '-color-16'
-                }}
-              >
-                {{t
-                  (concat 'resources.host.types.' host.compositeType '.label')
-                }}
-              </Rose::Badge>
-            {{/if}}
+            <HostCatalogTypeBadge @model={{host}} />
           </row.cell>
           <row.cell>
             <Copyable