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

NestedFolders: Backend nested-dashboards route (#66955)

Browse Source 
* NestedFolders: Add backend route for temp browse dashboards page

* tweak 'preview new ui' badge

* tweak 'preview new ui' badge
This commit is contained in:
Josh Hunt 2023-04-20 14:34:35 +01:00 committed by GitHub
parent bec18e390e
commit 78d7b6c0c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/api.go
View File

@ -152,6 +152,12 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/dashboards/*", reqSignedIn, hs.Index) r.Get("/dashboards/*", reqSignedIn, hs.Index)
r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index) r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
// Temporary routes for the work-in-progress new Browse Dashboards views
if hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
r.Get("/nested-dashboards/", reqSignedIn, hs.Index)
r.Get("/nested-dashboards/*", reqSignedIn, hs.Index)
}
if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) { if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
// list public dashboards // list public dashboards
r.Get("/public-dashboards/list", reqSignedIn, hs.Index) r.Get("/public-dashboards/list", reqSignedIn, hs.Index)

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

@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
import { locationUtil, NavModelItem } from '@grafana/data'; import { locationUtil, NavModelItem } from '@grafana/data';
import { config, locationService } from '@grafana/runtime'; import { config, locationService } from '@grafana/runtime';
import { Badge, Link } from '@grafana/ui'; import { Badge, Link, Tooltip } from '@grafana/ui';
import { Page } from 'app/core/components/Page/Page'; import { Page } from 'app/core/components/Page/Page';
import { FolderDTO } from 'app/types'; import { FolderDTO } from 'app/types';
@ -47,7 +47,11 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
actions={ actions={
config.featureToggles.nestedFolders && ( config.featureToggles.nestedFolders && (
<Link href="/nested-dashboards"> <Link href="/nested-dashboards">
<Badge icon="folder" color="blue" text="Try WIP nested folders UI" /> <Tooltip content="New Browse Dashboards for nested folders is still under development and may be missing features">
<span>
<Badge icon="folder" color="blue" text="Preview new Browse Dashboards" />
</span>
</Tooltip>
</Link> </Link>
) )
} }