public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.0.x] Alerting: Add subpath to the folder edit and permission url (#52638)

Browse Source 
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-07-22 05:40:05 -04:00
committed by GitHub
co-authored by Konrad Lalik
parent cc7c8d4cef
commit 84b88a4dae
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+2 -1
View File
@@ -4,6 +4,7 @@ import React, { FC, useEffect, useState } from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { GrafanaTheme2 } from '@grafana/data'; import { GrafanaTheme2 } from '@grafana/data';
import { config } from '@grafana/runtime';
import { Badge, ConfirmModal, HorizontalGroup, Icon, Spinner, Tooltip, useStyles2 } from '@grafana/ui'; import { Badge, ConfirmModal, HorizontalGroup, Icon, Spinner, Tooltip, useStyles2 } from '@grafana/ui';
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting'; import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting';
@@ -70,7 +71,7 @@ export const RulesGroup: FC<Props> = React.memo(({ group, namespace, expandAll }
); );
} else if (rulesSource === GRAFANA_RULES_SOURCE_NAME) { } else if (rulesSource === GRAFANA_RULES_SOURCE_NAME) {
if (folderUID) { if (folderUID) {
const baseUrl = `/dashboards/f/${folderUID}/${kbn.slugifyForUrl(namespace.name)}`; const baseUrl = `${config.appSubUrl}/dashboards/f/${folderUID}/${kbn.slugifyForUrl(namespace.name)}`;
if (folder?.canSave) { if (folder?.canSave) {
actionIcons.push( actionIcons.push(
<ActionIcon <ActionIcon