Fix bug that was breaking aws-sdk ConnectionConfig (#41215)

Fix bug that was breaking aws-sdk ConnectionConfig
4 years ago · 863f8aea2f
parent 5f27959a5e
commit 863f8aea2f
1 changed files with 2 additions and 9 deletions
--- a/packages/grafana-data/src/utils/datasource.ts
+++ b/packages/grafana-data/src/utils/datasource.ts
@ -118,14 +118,11 @@ export const updateDatasourcePluginSecureJsonDataOption = <J, S extends {} = Key
  val: any
 ) => {
  const config = props.options;
-  if (!config.secureJsonData) {
-    return;
-  }

  props.onOptionsChange({
    ...config,
    secureJsonData: {
-      ...config.secureJsonData,
+      ...(config.secureJsonData ? config.secureJsonData : ({} as S)),
      [key]: val,
    },
  });
@ -136,14 +133,10 @@ export const updateDatasourcePluginResetOption = <J, S extends {} = KeyValue>(
  key: string
 ) => {
  const config = props.options;
-  if (!config.secureJsonData) {
-    return;
-  }
-
  props.onOptionsChange({
    ...config,
    secureJsonData: {
-      ...config.secureJsonData,
+      ...(config.secureJsonData ? config.secureJsonData : ({} as S)),
      [key]: '',
    },
    secureJsonFields: {