IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

FolderPicker: Remove useNewForms from FolderPicker (#31485)

Browse Source 
* FolderPicker: Remove useNewForms from FolderPicker

* Updated snapshot
This commit is contained in:
Torkel Ödegaard
2021-02-26 08:42:00 +01:00
committed by GitHub
parent 119963ada2
commit c41b559063
7 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
public/app/core/components/Select/FolderPicker.tsx
View File

@@ -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>
);
}

35
public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap
View File

@@ -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>
`;