Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: remodel shamir flow #21871

Merged
merged 26 commits into from
Jul 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a8a339c
clickable label on raft join
hashishaw Jul 12, 2023
76265e4
Small adjustments on current shamir components
hashishaw Jul 13, 2023
c512826
Add shamir/form with stub test
hashishaw Jul 13, 2023
c3ca3bb
Add WIP shamir/flow component which works for unseal action
hashishaw Jul 13, 2023
d6b4eb5
Use new components on unseal flow
hashishaw Jul 13, 2023
42818d3
WIP
hashishaw Jul 14, 2023
5a01308
Add ChoosePgpKeyForm component for selecting PGP key
hashishaw Jul 14, 2023
f16bf04
Add Shamir/DrTokenFlow component and updates to Shamir/Flow which it …
hashishaw Jul 14, 2023
4c749ea
Small updates to Shamir/Form
hashishaw Jul 14, 2023
79c4c7e
Use updated Shamir components for unseal and replication generate token
hashishaw Jul 14, 2023
ce6b34c
remove old shamir components
hashishaw Jul 14, 2023
d8c963e
Merge branch 'main' into ui/revisit-shamir-flow
hashishaw Jul 18, 2023
8568325
Shamir/Form test
hashishaw Jul 14, 2023
74f56f9
Move selectors to shared, Shamir::Flow tests, cleanup
hashishaw Jul 14, 2023
fda9b8d
Test coverage for cluster adapter generateDrOperationToken
hashishaw Jul 17, 2023
fd16390
Choose-pgp-key-form tests
hashishaw Jul 18, 2023
31cae97
dr-token-flow-test
hashishaw Jul 18, 2023
5ce7248
Shamir/form test cleanup
hashishaw Jul 18, 2023
43003a9
Update generateDrOperationToken to match latest docs
hashishaw Jul 18, 2023
467efcf
cleanup, address comments
hashishaw Jul 18, 2023
b0df709
fix tests
hashishaw Jul 19, 2023
646337e
Add changelog
hashishaw Jul 19, 2023
54c010a
Merge branch 'main' into ui/revisit-shamir-flow
hashishaw Jul 19, 2023
5b4aa03
Address comments
hashishaw Jul 19, 2023
c98e74d
Fix lint
hashishaw Jul 19, 2023
01c0bfc
Merge branch 'main' into ui/revisit-shamir-flow
hashishaw Jul 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address comments
  • Loading branch information
hashishaw committed Jul 19, 2023
commit 5b4aa03a324f8997464991d2c45ccdfd9b39383e
3 changes: 1 addition & 2 deletions ui/lib/core/addon/components/choose-pgp-key-form.hbs
Original file line number Diff line number Diff line change
@@ -15,8 +15,7 @@
}}
</p>
<h4 class="field-title has-bottom-padding-m is-fullwidth">
PGP Key
{{this.pgpKeyFile.filename}}
{{concat "PGP Key " this.pgpKeyFile.filename}}
</h4>
<div class="message is-list has-copy-button" tabindex="-1">
<HoverCopyButton @copyValue={{this.pgpKey}} />
5 changes: 2 additions & 3 deletions ui/lib/core/addon/components/shamir/dr-token-flow.hbs
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@
data-test-dr-token-flow-step="choose-pgp"
/>
{{else}}
{{! Not started }}
{{! Generate token flow not started }}
<form
{{on "submit" this.startGenerate}}
id="shamir"
@@ -132,5 +132,4 @@
<button type="button" class="button is-secondary" {{on "click" this.onCancelClose}} data-test-shamir-modal-cancel-button>
{{if this.encodedToken "Close" "Cancel"}}
</button>
</footer>
{{! </Modal> }}
</footer>