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

Folder: Fix top folder creation (#59422)

Browse Source 
fix top folder creation
This commit is contained in:
Leo 2022-11-30 18:51:14 +01:00 committed by GitHub
parent 93eb8cb51d
commit ce630b2dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/folders/components/NewDashboardsFolder.tsx
View File

@ -35,8 +35,11 @@ const pageNav: NavModelItem = {
function NewDashboardsFolder({ createNewFolder }: Props) { function NewDashboardsFolder({ createNewFolder }: Props) {
const [queryParams] = useQueryParams(); const [queryParams] = useQueryParams();
const onSubmit = (formData: FormModel) => { const onSubmit = (formData: FormModel) => {
createNewFolder(formData.folderName, String(queryParams['folderUid'])); const folderUid = typeof queryParams['folderUid'] === 'string' ? queryParams['folderUid'] : undefined;
createNewFolder(formData.folderName, folderUid);
}; };
const validateFolderName = (folderName: string) => { const validateFolderName = (folderName: string) => {
return validationSrv return validationSrv
.validateNewFolderName(folderName) .validateNewFolderName(folderName)

2
public/app/features/search/components/DashboardActions.tsx
View File

@ -18,7 +18,7 @@ export const DashboardActions: FC<Props> = ({ folderUid, canCreateFolders = fals
url = `dashboards/folder/new/`; url = `dashboards/folder/new/`;
} }
if ((isTypeNewFolder && config.featureToggles.nestedFolders) || folderUid) { if (folderUid) {
url += `?folderUid=${folderUid}`; url += `?folderUid=${folderUid}`;
} }