UI: refactor pki role form to reuse PkiKeyParameters component #18069
Conversation
| @@ -287,6 +270,11 @@ export default class PkiRoleModel extends Model { | |||
| docLink: '/api-docs/secret/pki#allowed_domains', | |||
| }, | |||
| }, | |||
| 'Key parameters': { | |||
There was a problem hiding this comment.
Removed <FormFieldLabel> from the component template below, so parent is responsible for rendering toggle group-specific text
| </div> | ||
| </div> | ||
| {{else}} | ||
| <div class="field"> |
There was a problem hiding this comment.
I didn't see the need for this to be anything other than a general <FormField> so it could render any attr type?
| @onClick={{fn (mut (get @model prop))}} | ||
| class="is-block" | ||
| data-test-toggle-group={{@group}} | ||
| <CheckboxGrid |
There was a problem hiding this comment.
Figured I'd apply the same pattern of parent handling the toggle business?
| @@ -35,10 +36,9 @@ export default class PkiKeyParameters extends Component { | |||
|
|
|||
| @action onSignatureBitsOrKeyTypeChange(name, selection) { | |||
There was a problem hiding this comment.
Keeping this function as is for now, but I'd like to convert this file to typescript and will refactor these methods accordingly!
| {{#if groupInfo.footer}} | ||
| {{! FIELDS }} | ||
| {{#if (eq group "Key usage")}} | ||
| <PkiKeyUsage @model={{@model}} /> |
There was a problem hiding this comment.
I didn't see a need to pass anything but @model down? Unless I totally missed something
| {{! Header }} | ||
| {{#if groupInfo.header}} | ||
| <div class="box is-tall is-marginless" data-test-toggle-div={{group}}> | ||
| {{#let (get @model.fieldGroupsInfo group) as |toggleGroup|}} |
There was a problem hiding this comment.
toggleGroup came to mind here as a clearer variable name, but open to suggestions! Also happy to keep as groupInfo
| @@ -13,6 +13,7 @@ module('Integration | Component | pki-key-parameters', function (hooks) { | |||
| this.store = this.owner.lookup('service:store'); | |||
| this.model = this.store.createRecord('pki/role'); | |||
| this.model.backend = 'pki'; | |||
| [this.fields] = Object.values(this.model.fieldGroups.find((g) => g['Key parameters'])); | |||
There was a problem hiding this comment.
rather than hardcoding fields - decided to pull from the model so that if there are openapi changes they will be reflected in the test
though I think I'll move checking for these values/defaults to the pki role-form itself and generalize this component test when writing test for generating a key
| <FormFieldLabel for={{attr.name}} @label={{attr.options.label}} /> | ||
| <div class="control is-expanded"> | ||
| <div class="select is-fullwidth"> | ||
| <select name={{attr.name}} id={{attr.name}} onchange={{this.onKeyBitsChange}} data-test-input={{attr.name}}> |
There was a problem hiding this comment.
All these code scanning warnings seem new?? We have many instances where html attribute values are bound without the wrapping quotes and I have never noticed this before. It also looks like it's complaining for arguments as well.
…corp#18069) * abstract pki-key-parameters from pki-role-form * finish refactor, update tests
This PR removes any
<ToggleGroup>-ing from the new pki form components to the parent so they can be reused elsewhere