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.

Sign up for GitHub

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

WIP: KV v2, Revert disable json toggle when complex secret. #25202

Closed
wants to merge 3 commits into from
Closed

WIP: KV v2, Revert disable json toggle when complex secret. #25202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61670ff
revert disable json toggle when complex secret. wip, confirming 1.13.…
Monkeychip Feb 2, 2024
8993be8
missed a file
Monkeychip Feb 2, 2024
f4ba589
removing model concept
Monkeychip Feb 2, 2024
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
6 changes: 3 additions & 3 deletions ui/lib/kv/addon/components/page/secret/details.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
{{#unless this.emptyState}}
<Toggle
@name="json"
@checked={{or this.showJsonView this.secretDataIsAdvanced}}
@checked={{this.showJsonView}}
@onChange={{fn (mut this.showJsonView)}}
@disabled={{this.secretDataIsAdvanced}}
{{! do not disable the ability for users to toggle from json to non-json view regardless of secrets shape }}
>
<span class="has-text-grey">JSON</span>
</Toggle>
Expand Down Expand Up @@ -138,7 +138,7 @@
</EmptyState>
{{else}}
<KvDataFields
@showJson={{or this.showJsonView this.secretDataIsAdvanced}}
@showJson={{this.showJsonView}}
@obscureJson={{this.secretDataIsAdvanced}}
@secret={{@secret}}
@modelValidations={{this.modelValidations}}
Expand Down
7 changes: 1 addition & 6 deletions ui/lib/kv/addon/components/page/secret/edit.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@

<KvPageHeader @breadcrumbs={{@breadcrumbs}} @pageTitle="Create New Version">
<:toolbarFilters>
<Toggle
@name="json"
@checked={{or this.showJsonView this.secretDataIsAdvanced}}
@onChange={{fn (mut this.showJsonView)}}
@disabled={{this.secretDataIsAdvanced}}
>
<Toggle @name="json" @checked={{this.showJsonView}} @onChange={{fn (mut this.showJsonView)}}>
<span class="has-text-grey">JSON</span>
</Toggle>
</:toolbarFilters>
Expand Down
Loading