a2fa60681a
This PR uses the excellent a11y-dialog to implement our modal functionality across the UI. This package covers all our a11y needs - overlay click and ESC to close, controlling aria-* attributes, focus trap and restore. It's also very small (1.6kb) and has good DOM and JS APIs and also seems to be widely used and well tested. There is one downside to using this, and that is: We made use of a very handy characteristic of the relationship between HTML labels and inputs in order to implement our modals previously. Adding a for="id" attribute to a label meant you can control an <input id="id" /> from anywhere else in the page without having to pass javascript objects around. It's just based on using the same string for the for attribute and the id attribute. This allowed us to easily open our login dialog with CSS from anywhere within the UI without having to manage passing around a javascript object/function/method in order to open the dialog. We've PRed #9813 which includes an approach which would make passing around JS modal object easier to do. But in the meantime we've added a little 'hack' here using an additional <input /> element and a change listener which allows us to keep this label/input characteristic of our old modals. I'd originally thought this would be a temporary amend in order to wait on #9813 but the more I think about it, the more I think its quite a nice thing to keep - so longer term we may/may not keep this.
134 lines
4.8 KiB
Handlebars
134 lines
4.8 KiB
Handlebars
<ModalDialog
|
|
class="role-selector"
|
|
data-test-role-form
|
|
@onclose={{action (mut state) "role"}}
|
|
@name="new-role-toggle"
|
|
as |modal|>
|
|
<Ref @target={{this}} @name="modal" @value={{modal}} />
|
|
<BlockSlot @name="header">
|
|
{{#if (eq state 'role')}}
|
|
<h2>New Role</h2>
|
|
{{else}}
|
|
<h2>New Policy</h2>
|
|
{{/if}}
|
|
</BlockSlot>
|
|
<BlockSlot @name="body">
|
|
|
|
<input id="{{name}}_state_role" type="radio" name="{{name}}[state]" value="role" checked={{if (eq state 'role') 'checked'}} onchange={{action 'change'}} />
|
|
<RoleForm @form={{form}} @dc={{dc}} @nspace={{nspace}}>
|
|
<BlockSlot @name="policy">
|
|
|
|
<PolicySelector @source={{source}} @dc={{dc}} @nspace={{nspace}} @items={{item.Policies}}>
|
|
<BlockSlot @name="trigger">
|
|
<label for="{{name}}_state_policy" data-test-create-policy class="type-dialog">
|
|
<span>Create new policy</span>
|
|
</label>
|
|
</BlockSlot>
|
|
</PolicySelector>
|
|
|
|
</BlockSlot>
|
|
</RoleForm>
|
|
|
|
<input id="{{name}}_state_policy" type="radio" name="{{name}}[state]" value="policy" checked={{if (eq state 'policy') 'checked'}} onchange={{action 'change'}} />
|
|
<PolicyForm data-test-policy-form @name="role[policy]" @form={{policyForm}} @dc={{dc}} />
|
|
|
|
</BlockSlot>
|
|
<BlockSlot @name="actions" as |close|>
|
|
|
|
{{#if (eq state 'role')}}
|
|
<button type="submit"
|
|
onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
|
|
disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
|
|
>
|
|
{{#if item.isSaving }}
|
|
<div class="progress indeterminate"></div>
|
|
{{/if}}
|
|
<span>Create and apply</span>
|
|
</button>
|
|
<button type="reset" disabled={{if item.isSaving 'disabled'}} {{action (queue (action close) (action 'reset'))}}>Cancel</button>
|
|
{{else}}
|
|
<button type="submit" {{action 'dispatch' 'save' (array policy item.Policies (action (mut state) 'role'))}} disabled={{if (or policy.isSaving policy.isPristine policy.isInvalid) 'disabled'}}>
|
|
{{#if policy.isSaving }}
|
|
<div class="progress indeterminate"></div>
|
|
{{/if}}
|
|
<span>Create and apply</span>
|
|
</button>
|
|
<button type="reset" disabled={{if policy.isSaving 'disabled'}} {{action (mut state) 'role'}}>Cancel</button>
|
|
{{/if}}
|
|
|
|
</BlockSlot>
|
|
</ModalDialog>
|
|
|
|
<ChildSelector @repo={{repo}} @dc={{dc}} @nspace={{nspace}} @type="role" @placeholder="Search for role" @items={{items}}>
|
|
<BlockSlot @name="label">
|
|
Apply an existing role
|
|
</BlockSlot>
|
|
<BlockSlot @name="create">
|
|
<label class="type-dialog"
|
|
data-test-role-create
|
|
{{on "click" (optional this.modal.open)}}
|
|
>
|
|
<span>Create new role</span>
|
|
</label>
|
|
|
|
</BlockSlot>
|
|
<BlockSlot @name="option" as |option|>
|
|
{{option.Name}}
|
|
</BlockSlot>
|
|
<BlockSlot @name="set">
|
|
<TabularCollection
|
|
data-test-roles
|
|
@rows={{5}}
|
|
@items={{sort-by 'CreateTime:desc' 'Name:asc' items}} as |item index|
|
|
>
|
|
<BlockSlot @name="header">
|
|
<th>Name</th>
|
|
<th>Description</th>
|
|
</BlockSlot>
|
|
<BlockSlot @name="row">
|
|
<td>
|
|
<a href={{href-to 'dc.acls.roles.edit' item.ID}}>{{item.Name}}</a>
|
|
</td>
|
|
<td>
|
|
{{item.Description}}
|
|
</td>
|
|
</BlockSlot>
|
|
<BlockSlot @name="actions" as |index change checked|>
|
|
<PopoverMenu @expanded={{if (eq checked index) true false}} @onchange={{action change index}} @keyboardAccess={{false}}>
|
|
<BlockSlot @name="trigger">
|
|
More
|
|
</BlockSlot>
|
|
<BlockSlot @name="menu" as |confirm send keypressClick|>
|
|
<li role="none">
|
|
<a role="menuitem" tabindex="-1" href={{href-to 'dc.acls.roles.edit' item.ID}}>Edit</a>
|
|
</li>
|
|
<li role="none" class="dangerous">
|
|
<label for={{confirm}} role="menuitem" tabindex="-1" onkeypress={{keypressClick}} data-test-delete>Remove</label>
|
|
<div role="menu">
|
|
<div class="confirmation-alert warning">
|
|
<div>
|
|
<header>
|
|
Confirm Remove
|
|
</header>
|
|
<p>
|
|
Are you sure you want to remove this role?
|
|
</p>
|
|
</div>
|
|
<ul>
|
|
<li class="dangerous">
|
|
<button tabindex="-1" type="button" class="type-delete" onclick={{action send 'remove' item items}}>Remove</button>
|
|
</li>
|
|
<li>
|
|
<label for={{confirm}}>Cancel</label>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</li>
|
|
</BlockSlot>
|
|
</PopoverMenu>
|
|
</BlockSlot>
|
|
</TabularCollection>
|
|
</BlockSlot>
|
|
</ChildSelector>
|