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

Git: Update experimental workflow POC (#60049)

Browse Source
This commit is contained in:
Ryan McKinley
2022-12-08 10:57:33 -08:00
committed by GitHub
parent 29d2f86955
commit b2c4af16d7
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/api.go
View File

@@ -114,8 +114,11 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/admin/orgs", authorizeInOrg(reqGrafanaAdmin, ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
r.Get("/admin/orgs/edit/:id", authorizeInOrg(reqGrafanaAdmin, ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
r.Get("/admin/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), hs.Index)
r.Get("/admin/storage/*", reqGrafanaAdmin, hs.Index)
r.Get("/admin/ldap", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
if hs.Features.IsEnabled(featuremgmt.FlagStorage) {
r.Get("/admin/storage", reqSignedIn, hs.Index)
r.Get("/admin/storage/*", reqSignedIn, hs.Index)
}
r.Get("/styleguide", reqSignedIn, hs.Index)
r.Get("/live", reqGrafanaAdmin, hs.Index)

2
pkg/services/navtree/models.go
View File

@@ -245,6 +245,8 @@ func ApplyAdminIA(root *NavTreeRoot) {
adminNodeLinks = append(adminNodeLinks, accessNode)
}
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("storage"))
if len(adminNodeLinks) > 0 {
orgAdminNode.Children = adminNodeLinks
} else {

3
pkg/services/store/service.go
View File

@@ -592,8 +592,7 @@ func (s *standardStorageService) getWorkflowOptions(ctx context.Context, user *u
Workflows: make([]workflowInfo, 0),
}
scope, _ := splitFirstSegment(path)
root, _ := s.tree.getRoot(user.OrgID, scope)
root, _ := s.tree.getRoot(user.OrgID, path)
if root == nil {
return options, fmt.Errorf("can not read")
}

5
public/app/features/dashboard/components/SaveDashboard/forms/SaveToStorageForm.tsx
View File

@@ -96,7 +96,8 @@ export function SaveToStorageForm(props: Props) {
}
setSaving(true);
let uid = saveModel.clone.uid;
// Save dashboard without the UID
let { uid, ...body } = saveModel.clone;
if (isNew || isCopy) {
uid = path;
if (!uid.endsWith('-dash.json')) {
@@ -104,7 +105,7 @@ export function SaveToStorageForm(props: Props) {
}
}
const rsp = await getGrafanaStorage().write(uid, {
body: saveModel.clone,
body,
kind: 'dashboard',
title: data.title,
message: data.message,

3
public/app/features/storage/RootView.tsx
View File

@@ -133,9 +133,6 @@ function getTags(v: StorageInfo) {
if (v.builtin) {
tags.push('Builtin');
}
if (!v.editable) {
tags.push('Read only');
}
// Error
if (!v.ready) {

4
public/app/features/storage/StoragePage.tsx
View File

@@ -149,7 +149,7 @@ export default function StoragePage(props: Props) {
// Lets only apply permissions to folders (for now)
if (isFolder) {
opts.push({ what: StorageView.Perms, text: 'Permissions' });
// opts.push({ what: StorageView.Perms, text: 'Permissions' });
} else {
// TODO: only if the file exists in a storage engine with
opts.push({ what: StorageView.History, text: 'History' });
@@ -181,7 +181,7 @@ export default function StoragePage(props: Props) {
<Breadcrumb pathName={path} onPathChange={setPath} rootIcon={toIconName(navModel.node.icon ?? '')} />
<HorizontalGroup>
{canViewDashboard && (
<LinkButton icon="dashboard" href={`g/${path}`}>
<LinkButton icon="dashboard" href={`g/${path.substring(path.indexOf('/') + 1)}`}>
Dashboard
</LinkButton>
)}