From d349702c7e989276d25d5d750cf2ea7e73f3be49 Mon Sep 17 00:00:00 2001
From: bohandley <brendan.ohandley@gmail.com>
Date: Thu, 3 Aug 2023 16:56:04 -0400
Subject: [PATCH] pass flag as component prop instead of in jsondata

---
 src/ConnectionConfig.tsx      | 9 ++++++---
 src/SIGV4ConnectionConfig.tsx | 9 +++++++--
 src/types.ts                  | 1 -
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/ConnectionConfig.tsx b/src/ConnectionConfig.tsx
index c09edff..5381157 100644
--- a/src/ConnectionConfig.tsx
+++ b/src/ConnectionConfig.tsx
@@ -28,12 +28,17 @@ export interface ConnectionConfigProps<
   skipEndpoint?: boolean;
   children?: React.ReactNode;
   labelWidth?: number;
+  inExperimentalAuthComponent?: boolean;
 }
 
 export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionConfigProps) => {
   const [regions, setRegions] = useState((props.standardRegions || standardRegions).map(toOption));
   const { loadRegions, onOptionsChange, skipHeader = false, skipEndpoint = false } = props;
-  const { labelWidth = DEFAULT_LABEL_WIDTH, options } = props;
+  const { 
+    labelWidth = DEFAULT_LABEL_WIDTH, 
+    options, 
+    inExperimentalAuthComponent 
+  } = props;
   let profile = options.jsonData.profile;
   if (profile === undefined) {
     profile = options.database;
@@ -71,8 +76,6 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
     loadRegions().then((regions) => setRegions(regions.map(toOption)));
   }, [loadRegions]);
 
-  const inExperimentalAuthComponent = options.jsonData.inExperimentalAuthComponent;
-
   const inputWidth = inExperimentalAuthComponent ? "width-20" : "width-30";
 
   return (
diff --git a/src/SIGV4ConnectionConfig.tsx b/src/SIGV4ConnectionConfig.tsx
index 283db0b..2e17088 100644
--- a/src/SIGV4ConnectionConfig.tsx
+++ b/src/SIGV4ConnectionConfig.tsx
@@ -4,8 +4,12 @@ import { ConnectionConfig, ConnectionConfigProps } from './ConnectionConfig';
 
 import { AwsAuthDataSourceSecureJsonData, AwsAuthDataSourceJsonData } from './types';
 
-export const SIGV4ConnectionConfig: React.FC<DataSourcePluginOptionsEditorProps<any, any>> = (
-  props: DataSourcePluginOptionsEditorProps<any, any>
+export interface SIGV4ConnectionConfigProps extends DataSourcePluginOptionsEditorProps<any, any> {
+  inExperimentalAuthComponent?: boolean;
+};
+
+export const SIGV4ConnectionConfig: React.FC<SIGV4ConnectionConfigProps> = (
+  props: SIGV4ConnectionConfigProps
 ) => {
   const { onOptionsChange, options } = props;
 
@@ -54,6 +58,7 @@ export const SIGV4ConnectionConfig: React.FC<DataSourcePluginOptionsEditorProps<
         secretKey: options.secureJsonData?.sigV4SecretKey,
       },
     },
+    inExperimentalAuthComponent: props.inExperimentalAuthComponent,
   };
 
   return (
diff --git a/src/types.ts b/src/types.ts
index 7697aac..5c6d2f0 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -19,7 +19,6 @@ export interface AwsAuthDataSourceJsonData extends DataSourceJsonData {
   profile?: string; // Credentials profile name, as specified in ~/.aws/credentials
   defaultRegion?: string; // region if it is not defined by your credentials file
   endpoint?: string;
-  inExperimentalAuthComponent?: boolean;
 }
 
 export interface AwsAuthDataSourceSecureJsonData {