diff --git a/app/azure/types.ts b/app/azure/types.ts index 9fc078acd..64e551bf0 100644 --- a/app/azure/types.ts +++ b/app/azure/types.ts @@ -1,7 +1,5 @@ -import { - AccessControlFormData, - ResourceControlResponse, -} from '@/portainer/access-control/types'; +import { AccessControlFormData } from '@/portainer/access-control/types'; +import { PortainerMetadata } from '@/react/docker/types'; import { PortMapping } from './ContainerInstances/CreateContainerInstanceForm/PortsMappingField'; @@ -21,10 +19,6 @@ export interface ContainerInstanceFormValues { accessControl: AccessControlFormData; } -interface PortainerMetadata { - ResourceControl: ResourceControlResponse; -} - interface Container { name: string; properties: { diff --git a/app/docker/networks/edit/NetworkDetailsTable.test.tsx b/app/docker/networks/edit/NetworkDetailsTable.test.tsx index fdac56a2e..8d5004103 100644 --- a/app/docker/networks/edit/NetworkDetailsTable.test.tsx +++ b/app/docker/networks/edit/NetworkDetailsTable.test.tsx @@ -1,7 +1,6 @@ import { render } from '@/react-tools/test-utils'; import { UserContext } from '@/portainer/hooks/useUser'; import { UserViewModel } from '@/portainer/models/user'; -import { ResourceControlOwnership } from '@/portainer/access-control/types'; import { DockerNetwork } from '../types'; @@ -113,9 +112,9 @@ function getNetwork(networkName: string): DockerNetwork { }, ], TeamAccesses: [], - Ownership: ResourceControlOwnership.PUBLIC, Public: true, System: false, + AdministratorsOnly: true, }, }, Scope: 'local', diff --git a/app/docker/networks/edit/NetworkDetailsView.tsx b/app/docker/networks/edit/NetworkDetailsView.tsx index f8c18196f..f0e93f12f 100644 --- a/app/docker/networks/edit/NetworkDetailsView.tsx +++ b/app/docker/networks/edit/NetworkDetailsView.tsx @@ -8,6 +8,7 @@ import { confirmDeletionAsync } from '@/portainer/services/modal.service/confirm import { AccessControlPanel } from '@/portainer/access-control/AccessControlPanel/AccessControlPanel'; import { ResourceControlType } from '@/portainer/access-control/types'; import { DockerContainer } from '@/docker/containers/types'; +import { ResourceControlViewModel } from '@/portainer/access-control/models/ResourceControlViewModel'; import { PageHeader } from '@@/PageHeader'; @@ -51,6 +52,12 @@ export function NetworkDetailsView() { return null; } + const network = networkQuery.data; + + const resourceControl = network.Portainer?.ResourceControl + ? new ResourceControlViewModel(network.Portainer.ResourceControl) + : undefined; + return ( <>