From 3ba78c45d1d6944c0a9fdfe93ea019332f2503c7 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:59:12 -0500
Subject: [PATCH] Canvas: Promote Button to beta (#76582)

---
 public/app/features/canvas/elements/button.tsx         | 10 ++--------
 .../plugins/panel/canvas/editor/element/APIEditor.tsx  |  5 +----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/public/app/features/canvas/elements/button.tsx b/public/app/features/canvas/elements/button.tsx
index 15224bda7b7..18cf97713a4 100644
--- a/public/app/features/canvas/elements/button.tsx
+++ b/public/app/features/canvas/elements/button.tsx
@@ -56,13 +56,7 @@ const ButtonDisplay = ({ data }: CanvasElementProps<ButtonConfig, ButtonData>) =
   };
 
   return (
-    <Button
-      type="submit"
-      variant={data?.style?.variant}
-      onClick={onClick}
-      className={styles.button}
-      disabled={!data?.api?.endpoint}
-    >
+    <Button type="submit" variant={data?.style?.variant} onClick={onClick} className={styles.button}>
       <span>
         {isLoading && <Spinner inline={true} className={styles.buttonSpinner} />}
         {data?.text}
@@ -94,7 +88,7 @@ export const buttonItem: CanvasElementItem<ButtonConfig, ButtonData> = {
   id: 'button',
   name: 'Button',
   description: 'Button',
-  state: PluginState.alpha,
+  state: PluginState.beta,
 
   standardEditorConfig: {
     background: false,
diff --git a/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx b/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
index 711caffd200..5eb7b606a8e 100644
--- a/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
@@ -6,7 +6,6 @@ import {
   StringFieldConfigSettings,
   SelectableValue,
 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { Button, Field, InlineField, InlineFieldRow, JSONFormatter, RadioButtonGroup, Select } from '@grafana/ui';
 import { StringValueEditor } from 'app/core/components/OptionsUI/string';
 import { defaultApiConfig } from 'app/features/canvas/elements/button';
@@ -141,7 +140,7 @@ export function APIEditor({ value, context, onChange }: Props) {
     return;
   };
 
-  return config.disableSanitizeHtml ? (
+  return (
     <>
       <InlineFieldRow>
         <InlineField label="Endpoint" labelWidth={LABEL_WIDTH} grow={true}>
@@ -195,7 +194,5 @@ export function APIEditor({ value, context, onChange }: Props) {
         value?.contentType === defaultApiConfig.contentType &&
         renderJSON(value?.data ?? '{}')}
     </>
-  ) : (
-    <>Must enable disableSanitizeHtml feature flag to access</>
   );
 }