Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 21:35:23 +02:00
Code Issues Releases Activity

fix(docker/networks): show correct resource control data [EE-3401] (#7060)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-06-17 19:21:41 +03:00 • committed by GitHub
parent 18252ab854
commit 92eaa02156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/docker/networks/edit/NetworkDetailsTable.test.tsx
View file

@ -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',

9
app/docker/networks/edit/NetworkDetailsView.tsx
View file

@ -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 (
<>
<PageHeader
@ -78,7 +85,7 @@ export function NetworkDetailsView() {
networkId,
])
}
resourceControl={networkQuery.data.Portainer?.ResourceControl}
resourceControl={resourceControl}
resourceType={ResourceControlType.Network}
disableOwnershipChange={isSystemNetwork(networkQuery.data.Name)}
resourceId={networkId}

4
app/docker/networks/types.ts
View file

@ -1,4 +1,4 @@
import { ResourceControlViewModel } from '@/portainer/access-control/models/ResourceControlViewModel';
import { PortainerMetadata } from '@/react/docker/types';
import { ContainerId } from '../containers/types';
@ -44,7 +44,7 @@ export interface DockerNetwork {
Driver: string;
Options: IpamOptions;
};
Portainer: { ResourceControl?: ResourceControlViewModel };
Portainer?: PortainerMetadata;
Options: NetworkOptions;
Containers: NetworkResponseContainers;
}