mirror of
https://github.com/portainer/portainer.git
synced 2025-08-02 12:25:22 +02:00
feat(auth): add useIsEdgeAdmin hook [EE-6627] (#11101)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
This commit is contained in:
parent
c08b5af85a
commit
edea9e3481
48 changed files with 389 additions and 198 deletions
|
@ -15,7 +15,7 @@ import {
|
|||
type Environment,
|
||||
type EnvironmentId,
|
||||
} from '@/react/portainer/environments/types';
|
||||
import { Authorized, useUser, isEnvironmentAdmin } from '@/react/hooks/useUser';
|
||||
import { Authorized, useIsEnvironmentAdmin } from '@/react/hooks/useUser';
|
||||
import { useInfo } from '@/react/docker/proxy/queries/useInfo';
|
||||
import { useApiVersion } from '@/react/docker/proxy/queries/useVersion';
|
||||
|
||||
|
@ -30,11 +30,11 @@ interface Props {
|
|||
}
|
||||
|
||||
export function DockerSidebar({ environmentId, environment }: Props) {
|
||||
const { user } = useUser();
|
||||
const isAdmin = isEnvironmentAdmin(user, environmentId);
|
||||
const isEnvironmentAdmin = useIsEnvironmentAdmin({ adminOnlyCE: true });
|
||||
|
||||
const areStacksVisible =
|
||||
isAdmin || environment.SecuritySettings.allowStackManagementForRegularUsers;
|
||||
isEnvironmentAdmin ||
|
||||
environment.SecuritySettings.allowStackManagementForRegularUsers;
|
||||
|
||||
const envInfoQuery = useInfo(
|
||||
environmentId,
|
||||
|
@ -167,7 +167,7 @@ export function DockerSidebar({ environmentId, environment }: Props) {
|
|||
/>
|
||||
)}
|
||||
|
||||
{!isSwarmManager && isAdmin && (
|
||||
{!isSwarmManager && isEnvironmentAdmin && (
|
||||
<SidebarItem
|
||||
to="docker.events"
|
||||
params={{ endpointId: environmentId }}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue