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

Folders: Editors should be able to edit name and delete folders (#31242)

Browse Source 
* Folders: Editors should be able to edit name and delete folders

* Fixed so that we only build nav model in one place
This commit is contained in:
Torkel Ödegaard 2021-02-17 12:40:28 +01:00 committed by GitHub
parent 0253685304
commit c0015034a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
public/app/features/folders/services/FolderPageLoader.ts
View File

@ -1,61 +0,0 @@
import { backendSrv } from 'app/core/services/backend_srv';
export class FolderPageLoader {
load(ctrl: any, uid: any, activeChildId: any) {
ctrl.navModel = {
main: {
icon: 'folder',
id: 'manage-folder',
subTitle: 'Manage folder dashboards & permissions',
url: '',
text: '',
breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
children: [
{
active: activeChildId === 'manage-folder-dashboards',
icon: 'apps',
id: 'manage-folder-dashboards',
text: 'Dashboards',
url: 'dashboards',
},
{
active: activeChildId === 'manage-folder-permissions',
icon: 'lock',
id: 'manage-folder-permissions',
text: 'Permissions',
url: 'dashboards/permissions',
},
{
active: activeChildId === 'manage-folder-settings',
icon: 'cog',
id: 'manage-folder-settings',
text: 'Settings',
url: 'dashboards/settings',
},
],
},
};
return backendSrv.getFolderByUid(uid).then((folder: any) => {
ctrl.folderId = folder.id;
const folderTitle = folder.title;
const folderUrl = folder.url;
ctrl.navModel.main.text = folderTitle;
const dashTab = ctrl.navModel.main.children.find((child: any) => child.id === 'manage-folder-dashboards');
dashTab.url = folderUrl;
if (folder.canAdmin) {
const permTab = ctrl.navModel.main.children.find((child: any) => child.id === 'manage-folder-permissions');
permTab.url = folderUrl + '/permissions';
const settingsTab = ctrl.navModel.main.children.find((child: any) => child.id === 'manage-folder-settings');
settingsTab.url = folderUrl + '/settings';
} else {
ctrl.navModel.main.children = [dashTab];
}
return folder;
});
}
}

44
public/app/features/folders/state/navModel.ts
View File

@ -2,7 +2,7 @@ import { FolderDTO } from 'app/types';
import { NavModelItem, NavModel } from '@grafana/data';
export function buildNavModel(folder: FolderDTO): NavModelItem {
return {
const model = {
icon: 'folder',
id: 'manage-folder',
subTitle: 'Manage folder dashboards & permissions',
@ -17,22 +17,30 @@ export function buildNavModel(folder: FolderDTO): NavModelItem {
text: 'Dashboards',
url: folder.url,
},
{
active: false,
icon: 'lock',
id: `folder-permissions-${folder.uid}`,
text: 'Permissions',
url: `${folder.url}/permissions`,
},
{
active: false,
icon: 'cog',
id: `folder-settings-${folder.uid}`,
text: 'Settings',
url: `${folder.url}/settings`,
},
],
};
if (folder.canAdmin) {
model.children.push({
active: false,
icon: 'lock',
id: `folder-permissions-${folder.uid}`,
text: 'Permissions',
url: `${folder.url}/permissions`,
});
}
if (folder.canSave) {
model.children.push({
active: false,
icon: 'cog',
id: `folder-settings-${folder.uid}`,
text: 'Settings',
url: `${folder.url}/settings`,
});
}
return model;
}
export function getLoadingNav(tabIndex: number): NavModel {
@ -41,9 +49,9 @@ export function getLoadingNav(tabIndex: number): NavModel {
uid: 'loading',
title: 'Loading',
url: 'url',
canSave: false,
canEdit: false,
canAdmin: false,
canSave: true,
canEdit: true,
canAdmin: true,
version: 0,
});

5
public/app/features/search/components/DashboardListPage.tsx
View File

@ -22,14 +22,14 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, uid, url }) => {
return Promise.resolve({ pageNavModel: navModel });
}
return loadFolderPage(uid!, 'manage-folder-dashboards').then(({ folder, model }) => {
return loadFolderPage(uid!).then(({ folder, folderNav }) => {
const path = locationUtil.stripBaseFromUrl(folder.url);
if (path !== location.pathname) {
getLocationSrv().update({ path });
}
return { folder, pageNavModel: { ...navModel, ...model } };
return { folder, pageNavModel: { ...navModel, main: folderNav } };
});
}, [uid]);
@ -41,6 +41,7 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, uid, url }) => {
</Page>
);
});
DashboardListPage.displayName = 'DashboardListPage';
const mapStateToProps: MapStateToProps<Props, {}, StoreState> = (state) => {

58
public/app/features/search/loaders.ts
View File

@ -1,59 +1,11 @@
import { backendSrv } from 'app/core/services/backend_srv';
import { NavModel } from '@grafana/data';
export const loadFolderPage = (uid: string, activeChildId: string) => {
const navModel: Pick<NavModel, 'main'> = {
main: {
icon: 'folder-open',
id: 'manage-folder',
subTitle: 'Manage folder dashboards & permissions',
url: '',
text: '',
breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
children: [
{
active: activeChildId === 'manage-folder-dashboards',
icon: 'th-large',
id: 'manage-folder-dashboards',
text: 'Dashboards',
url: 'dashboards',
},
{
active: activeChildId === 'manage-folder-permissions',
icon: 'lock',
id: 'manage-folder-permissions',
text: 'Permissions',
url: 'dashboards/permissions',
},
{
active: activeChildId === 'manage-folder-settings',
icon: 'cog',
id: 'manage-folder-settings',
text: 'Settings',
url: 'dashboards/settings',
},
],
},
};
import { buildNavModel } from '../folders/state/navModel';
export const loadFolderPage = (uid: string) => {
return backendSrv.getFolderByUid(uid).then((folder) => {
const folderTitle = folder.title;
const folderUrl = folder.url;
navModel.main.text = folderTitle;
const navModel = buildNavModel(folder);
navModel.children![0].active = true;
const dashTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-dashboards');
dashTab!.url = folderUrl;
if (folder.canAdmin) {
const permTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-permissions');
permTab!.url = folderUrl + '/permissions';
const settingsTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-settings');
settingsTab!.url = folderUrl + '/settings';
} else {
navModel.main.children = [dashTab!];
}
return { folder, model: navModel };
return { folder, folderNav: navModel };
});
};