Merge branch 'main' into hosts

ui/admin/app/components/form/auth-method/oidc/index.hbs

@@ -6,7 +6,6 @@
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
-
   <form.actions
     @disabled={{if @model.cannotSave @model.cannotSave}}
     @enableEditText={{t 'actions.edit-form'}}
@@ -678,11 +677,12 @@
       @disabled={{true}}
     />
   {{/unless}}
-
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
 </Rose::Form>

ui/admin/app/components/form/auth-method/password/index.hbs

@@ -51,11 +51,12 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
 </Rose::Form>

ui/admin/app/components/form/role/index.hbs

@@ -119,12 +119,12 @@
       </form.radioGroup>
     </fieldset>
   {{/unless}}
-
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
-
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
 </Rose::Form>

ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs

@@ -59,12 +59,14 @@
   >
     {{t 'resources.account.actions.create'}}
   </dropdown.link>
-  <dropdown.separator />
-  <dropdown.button
-    @style='danger'
-    @disabled={{@model.canSave}}
-    {{on 'click' (route-action 'delete' @model)}}
-  >
-    {{t 'resources.auth-method.actions.delete'}}
-  </dropdown.button>
+  {{#if (can 'delete model' @model)}}
+    <dropdown.separator />
+    <dropdown.button
+      @style='danger'
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'delete' @model)}}
+    >
+      {{t 'resources.auth-method.actions.delete'}}
+    </dropdown.button>
+  {{/if}}
 </Rose::Dropdown>

ui/admin/app/templates/scopes/scope/auth-methods/index.hbs

@@ -76,6 +76,19 @@
                 }}
                 {{#if authMethod.isOIDC}}
                   {{#if (feature-flag 'oidc-crud')}}
+                    {{#if (can 'read model' authMethod)}}
+                      <LinkTo
+                        @route='scopes.scope.auth-methods.auth-method'
+                        @model={{authMethod.id}}
+                      >
+                        {{authMethod.displayName}}
+                      </LinkTo>
+                    {{else}}
+                      {{authMethod.displayName}}
+                    {{/if}}
+                  {{/if}}
+                {{else}}
+                  {{#if (can 'read model' authMethod)}}
                     <LinkTo
                       @route='scopes.scope.auth-methods.auth-method'
                       @model={{authMethod.id}}
@@ -85,13 +98,6 @@
                   {{else}}
                     {{authMethod.displayName}}
                   {{/if}}
-                {{else}}
-                  <LinkTo
-                    @route='scopes.scope.auth-methods.auth-method'
-                    @model={{authMethod.id}}
-                  >
-                    {{authMethod.displayName}}
-                  </LinkTo>
                 {{/if}}
                 <p>{{authMethod.description}}</p>
               </row.headerCell>

ui/admin/app/templates/scopes/scope/roles/index.hbs

@@ -37,9 +37,13 @@
           {{#each @model as |role|}}
             <body.row as |row|>
               <row.headerCell>
-                <LinkTo @route='scopes.scope.roles.role' @model={{role.id}}>
+                {{#if (can 'read model' role)}}
+                  <LinkTo @route='scopes.scope.roles.role' @model={{role.id}}>
+                    {{role.displayName}}
+                  </LinkTo>
+                {{else}}
                   {{role.displayName}}
-                </LinkTo>
+                {{/if}}
                 <p>{{role.description}}</p>
               </row.headerCell>
               <row.cell>

ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs

@@ -6,12 +6,14 @@
   <dropdown.link @route='scopes.scope.roles.role.add-principals'>
     {{t 'resources.role.principal.actions.add-principals'}}
   </dropdown.link>
-  <dropdown.separator />
-  <dropdown.button
-    @style='danger'
-    @disabled={{@model.canSave}}
-    {{on 'click' (route-action 'delete' @model)}}
-  >
-    {{t 'resources.role.actions.delete'}}
-  </dropdown.button>
+  {{#if (can 'delete model' @model)}}
+    <dropdown.separator />
+    <dropdown.button
+      @style='danger'
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'delete' @model)}}
+    >
+      {{t 'resources.role.actions.delete'}}
+    </dropdown.button>
+  {{/if}}
 </Rose::Dropdown>