Skip to content

Commit

Permalink
ui: Don't show the CRD menu for read-only intentions (#11149)
Browse files Browse the repository at this point in the history
* ui: Don't show the CRD menu for read-only intentions

The UI bug here manifests itself only when a user/token is configured to have read-only access to intentions. Instead of only letting folks click to see a read only page of the intention, we would show an additional message saying that the intention was read-only due to it being 'Managed by [a kubernetes] CRD'. Whilst the intention was still read only, this extra message was still confusing for users.

This PR fixes up the conditional logic and further moves the logic to use ember-can - looking at the history of the files in question, this bug snuck itself in partly due to it being 'permission-y type stuff' previous to using ember-can and when something being editable or not was nothing to do with ACLs. Then we moved to start using ember-can without completely realising what IsEditable previously meant. So overall the code here is a tiny bit clearer/cleaner by adding a proper can view CRD intention instead of overloading the idea of 'editability'.
  • Loading branch information
johncowen authored and hc-github-team-consul-core committed Sep 27, 2021
1 parent 8ef239f commit cc06fb4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .changelog/11149.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Don't show a CRD warning for read-only intentions
```
5 changes: 4 additions & 1 deletion ui/packages/consul-ui/app/abilities/intention.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ export default class IntentionAbility extends BaseAbility {
resource = 'intention';

get canWrite() {
return super.canWrite && (typeof this.item === 'undefined' || this.item.IsEditable);
return super.canWrite && (typeof this.item === 'undefined' || !this.canViewCRD);
}
get canViewCRD() {
return (typeof this.item !== 'undefined' && this.item.IsManagedByCRD);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ as |item index|>
{{/if}}
</td>
</BlockSlot>
{{#if (or (can "write intention" item=item) (can "view CRD intention" item=item))}}
<BlockSlot @name="actions" as |index change checked|>
<PopoverMenu
@expanded={{if (eq checked index) true false}}
Expand Down Expand Up @@ -101,7 +102,7 @@ as |item index|>
</InformedAction>
</div>
</li>
{{else}}
{{else if (can "view CRD intention" item=item)}}
<li role="none">
<div role="menu">
<InformedAction
Expand Down Expand Up @@ -140,4 +141,5 @@ as |item index|>
</BlockSlot>
</PopoverMenu>
</BlockSlot>
{{/if}}
</TabularCollection>
5 changes: 0 additions & 5 deletions ui/packages/consul-ui/app/models/intention.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,4 @@ export default class Intention extends Model {
);
return typeof meta !== 'undefined';
}

@computed('IsManagedByCRD')
get IsEditable() {
return !this.IsManagedByCRD;
}
}
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ as |route|>
</BlockSlot>
<BlockSlot @name="header">
<h1>
{{#if item.IsEditable}}
{{#if (can "write intention" item=item)}}
{{#if item.ID}}
Edit Intention
{{else}}
Expand Down

0 comments on commit cc06fb4

Please sign in to comment.