From 9d857f4d61803f6156de5c7d89b04cd2593d0632 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Mon, 24 Oct 2022 13:40:28 -0700
Subject: [PATCH] Canvas: Improve resource picker initialization (#57319)

---
 .betterer.results                                         | 3 +--
 .../dimensions/editors/ResourceDimensionEditor.tsx        | 8 ++++----
 .../features/dimensions/editors/ResourcePickerPopover.tsx | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 830de48315a..b50283447cd 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3955,8 +3955,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/dimensions/editors/ResourceDimensionEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/dimensions/editors/ResourcePicker.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
index 6b9081399a2..9bfb7c54df2 100644
--- a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback } from 'react';
+import React, { useCallback } from 'react';
 
 import { FieldNamePickerConfigSettings, StandardEditorProps, StandardEditorsRegistryItem } from '@grafana/data';
 import { InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui';
@@ -25,9 +25,9 @@ const dummyFieldSettings: StandardEditorsRegistryItem<string, FieldNamePickerCon
   settings: {},
 } as any;
 
-export const ResourceDimensionEditor: FC<
-  StandardEditorProps<ResourceDimensionConfig, ResourceDimensionOptions, any>
-> = (props) => {
+export const ResourceDimensionEditor = (
+  props: StandardEditorProps<ResourceDimensionConfig, ResourceDimensionOptions, unknown>
+) => {
   const { value, context, onChange, item } = props;
   const labelWidth = 9;
 
diff --git a/public/app/features/dimensions/editors/ResourcePickerPopover.tsx b/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
index aa1d2f3b93b..2e14e91731e 100644
--- a/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
+++ b/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
@@ -37,8 +37,9 @@ export const ResourcePickerPopover = (props: Props) => {
   const { dialogProps } = useDialog({}, ref);
   const { overlayProps } = useOverlay({ onClose, isDismissable: true, isOpen: true }, ref);
 
+  const isURL = value && value.includes('://');
   const [newValue, setNewValue] = useState<string>(value ?? '');
-  const [activePicker, setActivePicker] = useState<PickerTabType>(PickerTabType.Folder);
+  const [activePicker, setActivePicker] = useState<PickerTabType>(isURL ? PickerTabType.URL : PickerTabType.Folder);
   const [formData, setFormData] = useState<FormData>(new FormData());
   const [upload, setUpload] = useState<boolean>(false);
   const [error, setError] = useState<ErrorResponse>({ message: '' });