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

[Alerting] - make rule groups the default view (#58271)

Browse Source
This commit is contained in:
Virginia Cepeda 2022-11-07 09:44:20 -03:00 committed by GitHub
parent 40ba2ba18d
commit 97df6e682e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
View File

@ -34,8 +34,8 @@ export const GrafanaRules: FC<Props> = ({ namespaces, expandAll }) => {
const loading = prom.loading || ruler.loading;
const hasResult = !!prom.result || !!ruler.result;
const wantsGroupedView = queryParams['view'] === 'grouped';
const namespacesFormat = wantsGroupedView ? namespaces : flattenGrafanaManagedRules(namespaces);
const wantsListView = queryParams['view'] === 'list';
const namespacesFormat = wantsListView ? flattenGrafanaManagedRules(namespaces) : namespaces;
const groupsWithNamespaces = useCombinedGroupNamespace(namespacesFormat);
@ -58,7 +58,7 @@ export const GrafanaRules: FC<Props> = ({ namespaces, expandAll }) => {
key={`${namespace.name}-${group.name}`}
namespace={namespace}
expandAll={expandAll}
viewMode={wantsGroupedView ? 'grouped' : 'list'}
viewMode={wantsListView ? 'list' : 'grouped'}
/>
))}
{hasResult && namespacesFormat?.length === 0 && <p>No rules found.</p>}

10
public/app/features/alerting/unified/components/rules/RulesFilter.tsx
View File

@ -14,16 +14,16 @@ import { getFiltersFromUrlParams } from '../../utils/misc';
import { alertStateToReadable } from '../../utils/rules';
const ViewOptions: SelectableValue[] = [
{
icon: 'list-ul',
label: 'List',
value: 'list',
},
{
icon: 'folder',
label: 'Grouped',
value: 'grouped',
},
{
icon: 'list-ul',
label: 'List',
value: 'list',
},
{
icon: 'heart-rate',
label: 'State',