Switch to secure json fields

grafana · Sep 13, 2023 · 296a0ab · 296a0ab
1 parent 45563af
commit 296a0ab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/examples/app-basic/provisioning/plugins/app.yaml b/examples/app-basic/provisioning/plugins/app.yaml
@@ -7,6 +7,5 @@ apps:
     disabled: false
     jsonData:
       apiUrl: http://default-url.com
-      isApiKeySet: true
     secureJsonData:
-      apiKey: secret-key
+      apiKey: secret-key
diff --git a/examples/app-basic/src/components/AppConfig/AppConfig.tsx b/examples/app-basic/src/components/AppConfig/AppConfig.tsx
@@ -8,7 +8,6 @@ import { testIds } from '../testIds';
 
 export type JsonData = {
   apiUrl?: string;
-  isApiKeySet?: boolean;
 };
 
 type State = {
@@ -26,11 +25,11 @@ interface Props extends PluginConfigPageProps<AppPluginMeta<JsonData>> {}
 
 export const AppConfig = ({ plugin }: Props) => {
   const s = useStyles2(getStyles);
-  const { enabled, pinned, jsonData } = plugin.meta;
+  const { enabled, pinned, jsonData, secureJsonFields } = plugin.meta;
   const [state, setState] = useState<State>({
     apiUrl: jsonData?.apiUrl || '',
     apiKey: '',
-    isApiKeySet: Boolean(jsonData?.isApiKeySet),
+    isApiKeySet: Boolean(secureJsonFields?.apiKey),
   });
 
   const onResetApiKey = () =>
@@ -137,7 +136,6 @@ export const AppConfig = ({ plugin }: Props) => {
                 pinned,
                 jsonData: {
                   apiUrl: state.apiUrl,
-                  isApiKeySet: true,
                 },
                 // This cannot be queried later by the frontend.
                 // We don't want to override it in case it was set previously and left untouched now.

diff --git a/examples/app-with-backend/src/components/AppConfig/AppConfig.tsx b/examples/app-with-backend/src/components/AppConfig/AppConfig.tsx
@@ -8,7 +8,6 @@ import { testIds } from '../testIds';
 
 export type JsonData = {
   apiUrl?: string;
-  isApiKeySet?: boolean;
 };
 
 interface Props extends PluginConfigPageProps<AppPluginMeta<JsonData>> {}

diff --git a/examples/app-with-scenes/provisioning/plugins/app.yaml b/examples/app-with-scenes/provisioning/plugins/app.yaml
@@ -7,6 +7,5 @@ apps:
     disabled: false
     jsonData:
       apiUrl: http://default-url.com
-      isApiKeySet: true
     secureJsonData:
       apiKey: secret-key
diff --git a/examples/app-with-scenes/src/components/AppConfig/AppConfig.tsx b/examples/app-with-scenes/src/components/AppConfig/AppConfig.tsx
@@ -7,7 +7,6 @@ import { testIds } from '../testIds';
 
 export type JsonData = {
   apiUrl?: string;
-  isApiKeySet?: boolean;
 };
 
 type State = {
@@ -25,11 +24,11 @@ interface Props extends PluginConfigPageProps<AppPluginMeta<JsonData>> {}
 
 export const AppConfig = ({ plugin }: Props) => {
   const s = useStyles2(getStyles);
-  const { enabled, pinned, jsonData } = plugin.meta;
+  const { enabled, pinned, jsonData, secureJsonFields } = plugin.meta;
   const [state, setState] = useState<State>({
     apiUrl: jsonData?.apiUrl || '',
     apiKey: '',
-    isApiKeySet: Boolean(jsonData?.isApiKeySet),
+    isApiKeySet: Boolean(secureJsonFields?.apiKey),
   });
 
   const onResetApiKey = () =>
@@ -136,7 +135,6 @@ export const AppConfig = ({ plugin }: Props) => {
                 pinned,
                 jsonData: {
                   apiUrl: state.apiUrl,
-                  isApiKeySet: true,
                 },
                 // This cannot be queried later by the frontend.
                 // We don't want to override it in case it was set previously and left untouched now.