From 92eaa021566b5bf2207f6f3fe867acc8d5f738d5 Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Fri, 17 Jun 2022 19:21:41 +0300
Subject: [PATCH] fix(docker/networks): show correct resource control data
 [EE-3401] (#7060)

---
 app/azure/types.ts                                     | 10 ++--------
 app/docker/networks/edit/NetworkDetailsTable.test.tsx  |  3 +--
 app/docker/networks/edit/NetworkDetailsView.tsx        |  9 ++++++++-
 app/docker/networks/types.ts                           |  4 ++--
 .../access-control/models/ResourceControlViewModel.ts  |  4 ++--
 app/react/docker/types.ts                              |  5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 app/react/docker/types.ts

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 (
     <>
       <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}
diff --git a/app/docker/networks/types.ts b/app/docker/networks/types.ts
index 8f72af713..8531da653 100644
--- a/app/docker/networks/types.ts
+++ b/app/docker/networks/types.ts
@@ -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;
 }
diff --git a/app/portainer/access-control/models/ResourceControlViewModel.ts b/app/portainer/access-control/models/ResourceControlViewModel.ts
index e32bd7017..0d1ff2a36 100644
--- a/app/portainer/access-control/models/ResourceControlViewModel.ts
+++ b/app/portainer/access-control/models/ResourceControlViewModel.ts
@@ -33,11 +33,11 @@ export class ResourceControlViewModel {
     this.TeamAccesses = data.TeamAccesses;
     this.Public = data.Public;
     this.System = data.System;
-    this.Ownership = determineOwnership(this);
+    this.Ownership = determineOwnership(data);
   }
 }
 
-function determineOwnership(resourceControl: ResourceControlViewModel) {
+function determineOwnership(resourceControl: ResourceControlResponse) {
   if (resourceControl.Public) {
     return ResourceControlOwnership.PUBLIC;
   }
diff --git a/app/react/docker/types.ts b/app/react/docker/types.ts
new file mode 100644
index 000000000..2c909ff5b
--- /dev/null
+++ b/app/react/docker/types.ts
@@ -0,0 +1,5 @@
+import { ResourceControlResponse } from '@/portainer/access-control/types';
+
+export interface PortainerMetadata {
+  ResourceControl: ResourceControlResponse;
+}