diff --git a/grafana-plugin/src/components/Policy/EscalationPolicy.tsx b/grafana-plugin/src/components/Policy/EscalationPolicy.tsx index 1c3047f4f9..098f040f8c 100644 --- a/grafana-plugin/src/components/Policy/EscalationPolicy.tsx +++ b/grafana-plugin/src/components/Policy/EscalationPolicy.tsx @@ -186,7 +186,6 @@ class _EscalationPolicy extends React.Component { isMulti - showSearch allowClear disabled={isDisabled} displayField="username" @@ -348,7 +347,6 @@ class _EscalationPolicy extends React.Component { return ( - showSearch allowClear disabled={isDisabled} items={scheduleStore.items} @@ -386,6 +384,7 @@ class _EscalationPolicy extends React.Component { return ( + allowClear disabled={isDisabled} items={userGroupStore.items} fetchItemsFn={userGroupStore.updateItems} @@ -415,7 +414,6 @@ class _EscalationPolicy extends React.Component { return ( - showSearch disabled={isDisabled} items={outgoingWebhookStore.items} fetchItemsFn={outgoingWebhookStore.updateItems} @@ -457,7 +455,6 @@ class _EscalationPolicy extends React.Component { return ( - showSearch disabled={isDisabled} items={grafanaTeamStore.items} fetchItemsFn={grafanaTeamStore.updateItems} diff --git a/grafana-plugin/src/containers/AlertRules/parts/connectors/MSTeamsConnector.tsx b/grafana-plugin/src/containers/AlertRules/parts/connectors/MSTeamsConnector.tsx index a4fcc5c5d0..58ba0805dd 100644 --- a/grafana-plugin/src/containers/AlertRules/parts/connectors/MSTeamsConnector.tsx +++ b/grafana-plugin/src/containers/AlertRules/parts/connectors/MSTeamsConnector.tsx @@ -55,7 +55,6 @@ export const MSTeamsConnector = (props: MSTeamsConnectorProps) => { Post to Microsoft Teams channel - showSearch allowClear className={cx('select', 'control')} items={msteamsChannelStore.items} diff --git a/grafana-plugin/src/containers/AlertRules/parts/connectors/SlackConnector.tsx b/grafana-plugin/src/containers/AlertRules/parts/connectors/SlackConnector.tsx index 692487f71b..3c2713dddd 100644 --- a/grafana-plugin/src/containers/AlertRules/parts/connectors/SlackConnector.tsx +++ b/grafana-plugin/src/containers/AlertRules/parts/connectors/SlackConnector.tsx @@ -55,7 +55,6 @@ export const SlackConnector = (props: SlackConnectorProps) => { Slack Channel - showSearch allowClear className={cx('select', 'control')} items={slackChannelStore.items} diff --git a/grafana-plugin/src/containers/AlertRules/parts/connectors/TelegramConnector.tsx b/grafana-plugin/src/containers/AlertRules/parts/connectors/TelegramConnector.tsx index 8f6bd6f322..73d15e8fd4 100644 --- a/grafana-plugin/src/containers/AlertRules/parts/connectors/TelegramConnector.tsx +++ b/grafana-plugin/src/containers/AlertRules/parts/connectors/TelegramConnector.tsx @@ -47,7 +47,6 @@ export const TelegramConnector = ({ channelFilterId }: TelegramConnectorProps) = Post to telegram channel - showSearch allowClear className={cx('select', 'control')} items={telegramChannelStore.items} diff --git a/grafana-plugin/src/containers/AttachIncidentForm/AttachIncidentForm.tsx b/grafana-plugin/src/containers/AttachIncidentForm/AttachIncidentForm.tsx index 73cef9845c..a894a8bf54 100644 --- a/grafana-plugin/src/containers/AttachIncidentForm/AttachIncidentForm.tsx +++ b/grafana-plugin/src/containers/AttachIncidentForm/AttachIncidentForm.tsx @@ -75,7 +75,6 @@ export const AttachIncidentForm = observer(({ id, onUpdate, onHide }: AttachInci > - showSearch items={Object.fromEntries(alertGroupStore.alerts)} fetchItemsFn={async (query: string) => { await alertGroupStore.fetchAlertGroups(false, query); diff --git a/grafana-plugin/src/containers/EscalationChainForm/EscalationChainForm.tsx b/grafana-plugin/src/containers/EscalationChainForm/EscalationChainForm.tsx index e840e00a75..dc248f8159 100644 --- a/grafana-plugin/src/containers/EscalationChainForm/EscalationChainForm.tsx +++ b/grafana-plugin/src/containers/EscalationChainForm/EscalationChainForm.tsx @@ -99,7 +99,6 @@ export const EscalationChainForm: FC = (props) => { getSearchResult={grafanaTeamStore.getSearchResult} displayField="name" valueField="id" - showSearch allowClear placeholder="Select a team" className={cx('team-select')} diff --git a/grafana-plugin/src/containers/GSelect/GSelect.tsx b/grafana-plugin/src/containers/GSelect/GSelect.tsx index c49da20e4f..ba0bcea8fc 100644 --- a/grafana-plugin/src/containers/GSelect/GSelect.tsx +++ b/grafana-plugin/src/containers/GSelect/GSelect.tsx @@ -30,7 +30,6 @@ interface GSelectProps { className?: string; displayField?: string; valueField?: string; - showSearch?: boolean; allowClear?: boolean; isMulti?: boolean; showWarningIfEmptyValue?: boolean; @@ -49,7 +48,6 @@ interface GSelectProps { export const GSelect = observer((props: GSelectProps) => { const { autoFocus, - showSearch = false, allowClear = false, isLoading, defaultOpen, @@ -156,7 +154,7 @@ export const GSelect = observer((props: GSelectProps) => {
- showSearch items={grafanaTeamStore.items} fetchItemsFn={grafanaTeamStore.updateItems} fetchItemFn={grafanaTeamStore.fetchItemById} diff --git a/grafana-plugin/src/containers/IntegrationForm/IntegrationForm.tsx b/grafana-plugin/src/containers/IntegrationForm/IntegrationForm.tsx index 4ee3729f62..709281fc09 100644 --- a/grafana-plugin/src/containers/IntegrationForm/IntegrationForm.tsx +++ b/grafana-plugin/src/containers/IntegrationForm/IntegrationForm.tsx @@ -240,7 +240,6 @@ export const IntegrationForm = observer( getSearchResult: grafanaTeamStore.getSearchResult, displayField: 'name', valueField: 'id', - showSearch: true, allowClear: true, }} onChange={(value) => { diff --git a/grafana-plugin/src/containers/MaintenanceForm/MaintenanceForm.tsx b/grafana-plugin/src/containers/MaintenanceForm/MaintenanceForm.tsx index cb0c1e2f17..54ec54eee0 100644 --- a/grafana-plugin/src/containers/MaintenanceForm/MaintenanceForm.tsx +++ b/grafana-plugin/src/containers/MaintenanceForm/MaintenanceForm.tsx @@ -87,7 +87,6 @@ export const MaintenanceForm = observer((props: MaintenanceFormProps) => { > disabled - showSearch items={alertReceiveChannelStore.items} fetchItemsFn={alertReceiveChannelStore.fetchItems} fetchItemFn={alertReceiveChannelStore.fetchItemById} diff --git a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx index 9b42ff6d3a..4e3d7a4c03 100644 --- a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx +++ b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx @@ -83,7 +83,6 @@ export const OutgoingWebhookFormFields = ({ error={errors.team?.message} > - showSearch allowClear items={grafanaTeamStore.items} fetchItemsFn={grafanaTeamStore.updateItems} @@ -147,7 +146,6 @@ export const OutgoingWebhookFormFields = ({ > isMulti - showSearch placeholder="Choose (Optional)" items={alertReceiveChannelStore.items} fetchItemsFn={alertReceiveChannelStore.fetchItems} diff --git a/grafana-plugin/src/containers/ScheduleForm/ScheduleForm.tsx b/grafana-plugin/src/containers/ScheduleForm/ScheduleForm.tsx index 6c651ed47d..420b4776a4 100644 --- a/grafana-plugin/src/containers/ScheduleForm/ScheduleForm.tsx +++ b/grafana-plugin/src/containers/ScheduleForm/ScheduleForm.tsx @@ -222,7 +222,6 @@ const ScheduleCommonFields = () => { render={({ field }) => ( - showSearch items={grafanaTeamStore.items} fetchItemsFn={grafanaTeamStore.updateItems} fetchItemFn={grafanaTeamStore.fetchItemById} @@ -265,7 +264,6 @@ const ScheduleNotificationSettingsFields = () => { error={errors.slack_channel_id?.message} > - showSearch allowClear items={slackChannelStore.items} fetchItemsFn={slackChannelStore.updateItems} @@ -292,7 +290,6 @@ const ScheduleNotificationSettingsFields = () => { error={errors.user_group?.message} > - showSearch allowClear items={userGroupStore.items} fetchItemsFn={userGroupStore.updateItems} diff --git a/grafana-plugin/src/containers/UserSettings/parts/tabs/GoogleCalendar/GoogleCalendar.tsx b/grafana-plugin/src/containers/UserSettings/parts/tabs/GoogleCalendar/GoogleCalendar.tsx index 2ea4a76e9f..84c06db2cf 100644 --- a/grafana-plugin/src/containers/UserSettings/parts/tabs/GoogleCalendar/GoogleCalendar.tsx +++ b/grafana-plugin/src/containers/UserSettings/parts/tabs/GoogleCalendar/GoogleCalendar.tsx @@ -90,7 +90,6 @@ const GoogleCalendar: React.FC<{ id: ApiSchemas['User']['pk'] }> = observer(({ i isMulti - showSearch allowClear disabled={false} items={scheduleStore.items} diff --git a/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx b/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx index 8c591b7714..ca86e98f12 100644 --- a/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx +++ b/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx @@ -126,7 +126,6 @@ class _SlackSettings extends Component { > - showSearch items={slackChannelStore.items} fetchItemsFn={slackChannelStore.updateItems} fetchItemFn={slackChannelStore.updateItem} @@ -216,7 +215,6 @@ class _SlackSettings extends Component { return ( - showSearch className={cx('select', 'control')} items={slackChannelStore.items} fetchItemsFn={slackChannelStore.updateItems}