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

Do not hide not secret settings in the web plugin UI #1964

Merged
merged 6 commits into from
Jun 5, 2023
Merged

Do not hide not secret settings in the web plugin UI #1964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad45333
Do not hide not secret settings in the web plugin UI
alexintech May 18, 2023
3bb3ae8
Update CHANGELOG.md
alexintech May 31, 2023
b8bd91a
Merge branch 'dev' into hide-only-secret
alexintech May 31, 2023
aa1a14f
Merge branch 'dev' into hide-only-secret
joeyorlando Jun 1, 2023
301eb58
Merge branch 'dev' into hide-only-secret
vstpme Jun 5, 2023
ecc4209
Changelog
vstpme Jun 5, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Changed

- Do not hide not secret settings in the web plugin UI by @alexintech ([#1964](https://github.com/grafana/oncall/pull/1964))

## v1.2.36 (2023-06-02)

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions grafana-plugin/src/pages/settings/tabs/LiveSettings/LiveSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class LiveSettings extends React.Component<LiveSettingsProps, LiveSettingsState>
onTextChange={this.getEditValueChangeHandler(item)}
editable={isUserActionAllowed(UserActions.OtherSettingsWrite)}
clearBeforeEdit={item.is_secret}
hidden={hideValues}
hidden={hideValues && item.is_secret}
>
{normalizeValue(item.value)}
</Text>
Expand Down Expand Up @@ -208,7 +208,7 @@ class LiveSettings extends React.Component<LiveSettingsProps, LiveSettingsState>

return (
<div style={{ wordWrap: 'break-word', wordBreak: 'break-word' }}>
<Text>{hideValues ? PLACEHOLDER : normalizeValue(item.default_value)}</Text>
<Text>{hideValues && item.is_secret ? PLACEHOLDER : normalizeValue(item.default_value)}</Text>
</div>
);
};
Expand Down