From c41b5590633511651aa7ed1b5878c61f433daeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 26 Feb 2021 08:42:00 +0100
Subject: [PATCH] FolderPicker: Remove useNewForms from FolderPicker (#31485)

* FolderPicker: Remove useNewForms from FolderPicker

* Updated snapshot
---
 .../core/components/Select/FolderPicker.tsx   | 46 +++++--------------
 .../__snapshots__/FolderPicker.test.tsx.snap  | 35 +++++---------
 .../DashboardSettings/GeneralSettings.tsx     |  1 -
 .../forms/SaveDashboardAsForm.tsx             |  1 -
 .../components/ImportDashboardForm.tsx        |  1 -
 .../search/components/MoveToFolderModal.tsx   |  2 +-
 public/app/plugins/panel/dashlist/module.tsx  |  1 -
 7 files changed, 24 insertions(+), 63 deletions(-)

diff --git a/public/app/core/components/Select/FolderPicker.tsx b/public/app/core/components/Select/FolderPicker.tsx
index 0f78f3f94d8..eb849e7d803 100644
--- a/public/app/core/components/Select/FolderPicker.tsx
+++ b/public/app/core/components/Select/FolderPicker.tsx
@@ -18,7 +18,6 @@ export interface Props {
   dashboardId?: any;
   initialTitle?: string;
   initialFolderId?: number;
-  useNewForms?: boolean;
 }
 
 interface State {
@@ -46,7 +45,6 @@ export class FolderPicker extends PureComponent<Props, State> {
     enableReset: false,
     initialTitle: '',
     enableCreateNew: false,
-    useNewForms: false,
   };
 
   componentDidMount = async () => {
@@ -148,41 +146,21 @@ export class FolderPicker extends PureComponent<Props, State> {
 
   render() {
     const { folder } = this.state;
-    const { enableCreateNew, useNewForms } = this.props;
+    const { enableCreateNew } = this.props;
 
     return (
       <div aria-label={selectors.components.FolderPicker.container}>
-        {useNewForms && (
-          <AsyncSelect
-            loadingMessage="Loading folders..."
-            defaultOptions
-            defaultValue={folder}
-            value={folder}
-            allowCustomValue={enableCreateNew}
-            loadOptions={this.debouncedSearch}
-            onChange={this.onFolderChange}
-            onCreateOption={this.createNewFolder}
-            menuPosition="fixed"
-          />
-        )}
-        {!useNewForms && (
-          <div className="gf-form-inline">
-            <div className="gf-form">
-              <label className="gf-form-label width-7">Folder</label>
-              <AsyncSelect
-                loadingMessage="Loading folders..."
-                defaultOptions
-                defaultValue={folder}
-                value={folder}
-                className={'width-20'}
-                allowCustomValue={enableCreateNew}
-                loadOptions={this.debouncedSearch}
-                onChange={this.onFolderChange}
-                onCreateOption={this.createNewFolder}
-              />
-            </div>
-          </div>
-        )}
+        <AsyncSelect
+          loadingMessage="Loading folders..."
+          defaultOptions
+          defaultValue={folder}
+          value={folder}
+          allowCustomValue={enableCreateNew}
+          loadOptions={this.debouncedSearch}
+          onChange={this.onFolderChange}
+          onCreateOption={this.createNewFolder}
+          menuPosition="fixed"
+        />
       </div>
     );
   }
diff --git a/public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap b/public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap
index 3c42ca8d248..98b9a3bfde6 100644
--- a/public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap
+++ b/public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap
@@ -4,29 +4,16 @@ exports[`FolderPicker should render 1`] = `
 <div
   aria-label="Folder picker select container"
 >
-  <div
-    className="gf-form-inline"
-  >
-    <div
-      className="gf-form"
-    >
-      <label
-        className="gf-form-label width-7"
-      >
-        Folder
-      </label>
-      <AsyncSelect
-        allowCustomValue={false}
-        className="width-20"
-        defaultOptions={true}
-        defaultValue={Object {}}
-        loadOptions={[Function]}
-        loadingMessage="Loading folders..."
-        onChange={[Function]}
-        onCreateOption={[Function]}
-        value={Object {}}
-      />
-    </div>
-  </div>
+  <AsyncSelect
+    allowCustomValue={false}
+    defaultOptions={true}
+    defaultValue={Object {}}
+    loadOptions={[Function]}
+    loadingMessage="Loading folders..."
+    menuPosition="fixed"
+    onChange={[Function]}
+    onCreateOption={[Function]}
+    value={Object {}}
+  />
 </div>
 `;
diff --git a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
index edfa4f71bd0..280e49ec8c3 100644
--- a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
@@ -84,7 +84,6 @@ export const GeneralSettings: React.FC<Props> = ({ dashboard }) => {
         </Field>
         <Field label="Folder">
           <FolderPicker
-            useNewForms={true}
             initialTitle={dashboard.meta.folderTitle}
             initialFolderId={dashboard.meta.folderId}
             onChange={onFolderChange}
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
index 7dfe444eda2..5e08032b08b 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
@@ -109,7 +109,6 @@ export const SaveDashboardAsForm: React.FC<SaveDashboardFormProps & { isNew?: bo
               initialFolderId={dashboard.meta.folderId}
               initialTitle={dashboard.meta.folderTitle}
               enableCreateNew
-              useNewForms
             />
           </Field>
           <Field label="Copy tags">
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
index dc93b5effb0..566dcd5bb24 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
@@ -68,7 +68,6 @@ export const ImportDashboardForm: FC<Props> = ({
         <InputControl
           as={FolderPicker}
           name="folder"
-          useNewForms
           enableCreateNew
           initialFolderId={initialFolderId}
           control={control}
diff --git a/public/app/features/search/components/MoveToFolderModal.tsx b/public/app/features/search/components/MoveToFolderModal.tsx
index f51d3d4d4a8..7007b490581 100644
--- a/public/app/features/search/components/MoveToFolderModal.tsx
+++ b/public/app/features/search/components/MoveToFolderModal.tsx
@@ -59,7 +59,7 @@ export const MoveToFolderModal: FC<Props> = ({ results, onMoveItems, isOpen, onD
             Move the {selectedDashboards.length} selected dashboard{selectedDashboards.length === 1 ? '' : 's'} to the
             following folder:
           </p>
-          <FolderPicker onChange={(f) => setFolder(f as FolderInfo)} useNewForms />
+          <FolderPicker onChange={(f) => setFolder(f as FolderInfo)} />
         </div>
 
         <HorizontalGroup justify="center">
diff --git a/public/app/plugins/panel/dashlist/module.tsx b/public/app/plugins/panel/dashlist/module.tsx
index c0b9ba67bc9..16817c5c953 100644
--- a/public/app/plugins/panel/dashlist/module.tsx
+++ b/public/app/plugins/panel/dashlist/module.tsx
@@ -48,7 +48,6 @@ export const plugin = new PanelPlugin<DashListOptions>(DashList)
           return (
             <FolderPicker
               initialFolderId={props.value}
-              useNewForms
               initialTitle="All"
               enableReset={true}
               onChange={({ id }) => props.onChange(id)}