diff --git a/pkg/infra/supportbundles/supportbundlesimpl/store.go b/pkg/infra/supportbundles/supportbundlesimpl/store.go index 62cfb6687ed..9c71c3523b3 100644 --- a/pkg/infra/supportbundles/supportbundlesimpl/store.go +++ b/pkg/infra/supportbundles/supportbundlesimpl/store.go @@ -113,7 +113,7 @@ func (s *store) List() ([]supportbundles.Bundle, error) { } sort.Slice(res, func(i, j int) bool { - return res[i].CreatedAt < res[j].CreatedAt + return res[i].CreatedAt > res[j].CreatedAt }) return res, nil diff --git a/public/app/features/support-bundles/SupportBundles.tsx b/public/app/features/support-bundles/SupportBundles.tsx index 7352c940c15..8efb247aa70 100644 --- a/public/app/features/support-bundles/SupportBundles.tsx +++ b/public/app/features/support-bundles/SupportBundles.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { useAsyncFn } from 'react-use'; import { dateTimeFormat } from '@grafana/data'; -import { getBackendSrv } from '@grafana/runtime'; +import { config, getBackendSrv } from '@grafana/runtime'; import { LinkButton } from '@grafana/ui'; import { Page } from 'app/core/components/Page/Page'; @@ -13,6 +13,12 @@ const subTitle = ( ); +const newButton = ( + + New Support Bundle + +); + type SupportBundleState = 'complete' | 'error' | 'timeout' | 'pending'; interface SupportBundle { @@ -34,17 +40,17 @@ function SupportBundles() { fetchBundles(); }, [fetchBundles]); + const actions = config.featureToggles.topnav ? newButton : undefined; + return ( - + - - Create New Support Bundle - + {!config.featureToggles.topnav && newButton} - + diff --git a/public/app/features/support-bundles/SupportBundlesCreate.tsx b/public/app/features/support-bundles/SupportBundlesCreate.tsx index 8a07f28d399..3ecbc3212f6 100644 --- a/public/app/features/support-bundles/SupportBundlesCreate.tsx +++ b/public/app/features/support-bundles/SupportBundlesCreate.tsx @@ -25,6 +25,12 @@ const createSupportBundle = async (data: SupportBundleCreateRequest) => { return result; }; +const subTitle = ( + + Choose the components for the support bundle. The support bundle will be available for 3 days after creation. + +); + export const SupportBundlesCreate = ({}: Props): JSX.Element => { const onSubmit = useCallback(async (data) => { try { @@ -57,7 +63,7 @@ export const SupportBundlesCreate = ({}: Props): JSX.Element => { }, {}); return ( - +

Create support bundle

DateCreated on Requested by Expires @@ -57,7 +63,12 @@ function SupportBundles() { {b.creator} {dateTimeFormat(b.expiresAt * 1000)} - + Download