IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove editor keys and null coalescing (#20115)

Browse Source 
* remove editor keys and null coalescing

* remove commented, update snap
This commit is contained in:
Shavonn Brown
2019-10-31 16:17:59 -04:00
committed by GitHub
parent 64752f38e8
commit c032399ec6
8 changed files with 75 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx
View File

@@ -54,8 +54,8 @@ export class MonitorConfig extends PureComponent<Props, State> {
onTenantIdChange = (tenantId: string) => {
this.props.onDatasourceUpdate({
...this.state.config,
editorJsonData: {
...this.state.config.editorJsonData,
jsonData: {
...this.state.config.jsonData,
tenantId,
},
});
@@ -64,8 +64,8 @@ export class MonitorConfig extends PureComponent<Props, State> {
onClientIdChange = (clientId: string) => {
this.props.onDatasourceUpdate({
...this.state.config,
editorJsonData: {
...this.state.config.editorJsonData,
jsonData: {
...this.state.config.jsonData,
clientId,
},
});
@@ -74,8 +74,8 @@ export class MonitorConfig extends PureComponent<Props, State> {
onClientSecretChange = (clientSecret: string) => {
this.props.onDatasourceUpdate({
...this.state.config,
editorSecureJsonData: {
...this.state.config.editorSecureJsonData,
secureJsonData: {
...this.state.config.secureJsonData,
clientSecret,
},
});
@@ -95,8 +95,8 @@ export class MonitorConfig extends PureComponent<Props, State> {
onSubscriptionSelect = (subscription: SelectableValue<string>) => {
this.props.onDatasourceUpdate({
...this.state.config,
editorJsonData: {
...this.state.config.editorJsonData,
jsonData: {
...this.state.config.jsonData,
subscriptionId: subscription.value,
},
});
@@ -111,10 +111,10 @@ export class MonitorConfig extends PureComponent<Props, State> {
selectedAzureCloud={config.jsonData.cloudName}
azureCloudOptions={azureClouds}
subscriptionOptions={subscriptions}
selectedSubscription={config.editorJsonData.subscriptionId}
tenantId={config.editorJsonData.tenantId}
clientId={config.editorJsonData.clientId}
clientSecret={config.editorSecureJsonData.clientSecret}
selectedSubscription={config.jsonData.subscriptionId}
tenantId={config.jsonData.tenantId}
clientId={config.jsonData.clientId}
clientSecret={config.secureJsonData.clientSecret}
clientSecretConfigured={config.secureJsonFields.clientSecret}
onAzureCloudChange={this.onAzureCloudSelect}
onSubscriptionSelectChange={this.onSubscriptionSelect}