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

Navigation: Use new page layout in Server Admin > Orgs pages (#54018)

Browse Source
This commit is contained in:
eledobleefe 2022-08-23 18:38:46 +02:00 committed by GitHub
parent 2eec035c13
commit 1766ea9fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/admin/AdminEditOrgPage.tsx
View File

@ -1,17 +1,15 @@
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { useSelector } from 'react-redux';
import { useAsyncFn } from 'react-use'; import { useAsyncFn } from 'react-use';
import { UrlQueryValue } from '@grafana/data'; import { NavModelItem, UrlQueryValue } from '@grafana/data';
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { Form, Field, Input, Button, Legend, Alert } from '@grafana/ui'; import { Form, Field, Input, Button, Legend, Alert } from '@grafana/ui';
import { Page } from 'app/core/components/Page/Page'; import { Page } from 'app/core/components/Page/Page';
import { contextSrv } from 'app/core/core'; import { contextSrv } from 'app/core/core';
import { GrafanaRouteComponentProps } from 'app/core/navigation/types'; import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
import { getNavModel } from 'app/core/selectors/navModel';
import { accessControlQueryParam } from 'app/core/utils/accessControl'; import { accessControlQueryParam } from 'app/core/utils/accessControl';
import { StoreState, OrgUser, AccessControlAction } from 'app/types'; import { OrgUser, AccessControlAction } from 'app/types';
import UsersTable from '../users/UsersTable'; import UsersTable from '../users/UsersTable';
@ -41,8 +39,6 @@ const removeOrgUser = async (orgUser: OrgUser, orgId: UrlQueryValue) => {
interface Props extends GrafanaRouteComponentProps<{ id: string }> {} interface Props extends GrafanaRouteComponentProps<{ id: string }> {}
export default function AdminEditOrgPage({ match }: Props) { export default function AdminEditOrgPage({ match }: Props) {
const navIndex = useSelector((state: StoreState) => state.navIndex);
const navModel = getNavModel(navIndex, 'global-orgs');
const orgId = parseInt(match.params.id, 10); const orgId = parseInt(match.params.id, 10);
const canWriteOrg = contextSrv.hasPermission(AccessControlAction.OrgsWrite); const canWriteOrg = contextSrv.hasPermission(AccessControlAction.OrgsWrite);
const canReadUsers = contextSrv.hasPermission(AccessControlAction.OrgUsersRead); const canReadUsers = contextSrv.hasPermission(AccessControlAction.OrgUsersRead);
@ -70,8 +66,12 @@ export default function AdminEditOrgPage({ match }: Props) {
); );
}; };
const pageNav: NavModelItem = {
text: orgState?.value?.name ?? '',
};
return ( return (
<Page navModel={navModel}> <Page navId="global-orgs" pageNav={pageNav} subTitle="Manage settings for this specific org.">
<Page.Contents> <Page.Contents>
<> <>
<Legend>Edit organization</Legend> <Legend>Edit organization</Legend>

7
public/app/features/admin/AdminListOrgsPage.tsx
View File

@ -1,14 +1,11 @@
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { useSelector } from 'react-redux';
import useAsyncFn from 'react-use/lib/useAsyncFn'; import useAsyncFn from 'react-use/lib/useAsyncFn';
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { LinkButton } from '@grafana/ui'; import { LinkButton } from '@grafana/ui';
import { Page } from 'app/core/components/Page/Page'; import { Page } from 'app/core/components/Page/Page';
import { getNavModel } from 'app/core/selectors/navModel';
import { contextSrv } from 'app/core/services/context_srv'; import { contextSrv } from 'app/core/services/context_srv';
import { AccessControlAction } from 'app/types'; import { AccessControlAction } from 'app/types';
import { StoreState } from 'app/types/store';
import { AdminOrgsTable } from './AdminOrgsTable'; import { AdminOrgsTable } from './AdminOrgsTable';
@ -25,8 +22,6 @@ const getErrorMessage = (error: any) => {
}; };
export default function AdminListOrgsPages() { export default function AdminListOrgsPages() {
const navIndex = useSelector((state: StoreState) => state.navIndex);
const navModel = getNavModel(navIndex, 'global-orgs');
const [state, fetchOrgs] = useAsyncFn(async () => await getOrgs(), []); const [state, fetchOrgs] = useAsyncFn(async () => await getOrgs(), []);
const canCreateOrg = contextSrv.hasPermission(AccessControlAction.OrgsCreate); const canCreateOrg = contextSrv.hasPermission(AccessControlAction.OrgsCreate);
@ -35,7 +30,7 @@ export default function AdminListOrgsPages() {
}, [fetchOrgs]); }, [fetchOrgs]);
return ( return (
<Page navModel={navModel}> <Page navId="global-orgs" subTitle="Manage and create orgs across the whole Grafana server.">
<Page.Contents> <Page.Contents>
<> <>
<div className="page-action-bar"> <div className="page-action-bar">