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
Migrate ConfigEditor and QueryEditor to the new form styling #211
Merged
idastambuk
merged 4 commits into
main
from
629-migrate-x-ray-queryeditor-and-configeditor-to-new-form-styling
Oct 31, 2023
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
import { AwsAuthDataSourceJsonData, AwsAuthDataSourceSecureJsonData, ConnectionConfig } from '@grafana/aws-sdk'; | ||
import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; | ||
import React, { PureComponent } from 'react'; | ||
import React from 'react'; | ||
import { standardRegions } from './regions'; | ||
import { config } from '@grafana/runtime'; | ||
|
||
export type Props = DataSourcePluginOptionsEditorProps<AwsAuthDataSourceJsonData, AwsAuthDataSourceSecureJsonData>; | ||
|
||
export class ConfigEditor extends PureComponent<Props> { | ||
render() { | ||
return ( | ||
<div> | ||
<ConnectionConfig {...this.props} standardRegions={standardRegions} /> | ||
{/* can add x-ray specific things here */} | ||
</div> | ||
); | ||
} | ||
export function ConfigEditor(props: Props) { | ||
const newFormStylingEnabled = config.featureToggles.awsDatasourcesNewFormStyling; | ||
|
||
return ( | ||
<div className="width-30"> | ||
<ConnectionConfig {...props} standardRegions={standardRegions} newFormStylingEnabled={newFormStylingEnabled} /> | ||
{/* can add x-ray specific things here */} | ||
idastambuk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</div> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just curious if this div is still necessary with the new components
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is, since the new components adjust to the width of the container which we have to define at the top here. I don't think we have a fixed width requirement for our datasources (as long as it's not more that 578px, but that looks way too wide)