wip refactor

web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts

@@ -257,9 +257,9 @@ export class InterfaceService {
     if (!binding) return []
     const addr = binding.addresses
     const enabled = addr.possible.filter(h =>
-      h.public
-        ? addr.publicEnabled.some(e => utils.deepEqual(e, h))
-        : !addr.privateDisabled.some(d => utils.deepEqual(d, h)),
+      addr.enabled.some(e => utils.deepEqual(e, h)) ||
+      (!addr.disabled.some(d => utils.deepEqual(d, h)) &&
+        !(h.public && (h.hostname.kind === 'ipv4' || h.hostname.kind === 'ipv6'))),
     )
     return enabled.filter(
       h =>

web/projects/ui/src/app/routes/portal/routes/services/routes/interface.component.ts

@@ -134,9 +134,12 @@ export default class ServiceInterfaceRoute {
       gateways:
         gateways.map(g => ({
           enabled:
-            (g.public
-              ? binding?.addresses.publicEnabled.some(a => a.gateway.id === g.id)
-              : !binding?.addresses.privateDisabled.some(a => a.gateway.id === g.id)) ?? false,
+            (binding?.addresses.enabled.some(a => a.gateway.id === g.id) ||
+              (!binding?.addresses.disabled.some(a => a.gateway.id === g.id) &&
+                binding?.addresses.possible.some(a =>
+                  a.gateway.id === g.id &&
+                  !(a.public && (a.hostname.kind === 'ipv4' || a.hostname.kind === 'ipv6'))
+                ))) ?? false,
           ...g,
         })) || [],
       publicDomains: getPublicDomains(host.publicDomains, gateways),

web/projects/ui/src/app/routes/portal/routes/system/routes/startos-ui/startos-ui.component.ts

@@ -95,9 +95,12 @@ export default class StartOsUiComponent {
       ),
       gateways: gateways.map(g => ({
         enabled:
-          (g.public
-            ? binding?.addresses.publicEnabled.some(a => a.gateway.id === g.id)
-            : !binding?.addresses.privateDisabled.some(a => a.gateway.id === g.id)) ?? false,
+          (binding?.addresses.enabled.some(a => a.gateway.id === g.id) ||
+            (!binding?.addresses.disabled.some(a => a.gateway.id === g.id) &&
+              binding?.addresses.possible.some(a =>
+                a.gateway.id === g.id &&
+                !(a.public && (a.hostname.kind === 'ipv4' || a.hostname.kind === 'ipv6'))
+              ))) ?? false,
         ...g,
       })),
       publicDomains: getPublicDomains(network.host.publicDomains, gateways),

web/projects/ui/src/app/services/api/api.fixures.ts

@@ -2128,8 +2128,8 @@ export namespace Mock {
               assignedSslPort: 443,
             },
             addresses: {
-              privateDisabled: [],
-              publicEnabled: [],
+              enabled: [],
+              disabled: [],
               possible: [
                 {
                   gateway: { id: 'eth0', name: 'Ethernet', public: false },
@@ -2214,8 +2214,8 @@ export namespace Mock {
               assignedSslPort: null,
             },
             addresses: {
-              privateDisabled: [],
-              publicEnabled: [],
+              enabled: [],
+              disabled: [],
               possible: [],
             },
             options: {
@@ -2237,8 +2237,8 @@ export namespace Mock {
               assignedSslPort: null,
             },
             addresses: {
-              privateDisabled: [],
-              publicEnabled: [],
+              enabled: [],
+              disabled: [],
               possible: [],
             },
             options: {

web/projects/ui/src/app/services/api/mock-patch.ts

@@ -40,8 +40,8 @@ export const mockPatchData: DataModel = {
               assignedSslPort: 443,
             },
             addresses: {
-              privateDisabled: [],
-              publicEnabled: [],
+              enabled: [],
+              disabled: [],
               possible: [
                 {
                   gateway: { id: 'eth0', name: 'Ethernet', public: false },
@@ -516,8 +516,8 @@ export const mockPatchData: DataModel = {
                 assignedSslPort: 443,
               },
               addresses: {
-                privateDisabled: [],
-                publicEnabled: [],
+                enabled: [],
+                disabled: [],
                 possible: [
                   {
                     gateway: { id: 'eth0', name: 'Ethernet', public: false },
@@ -602,8 +602,8 @@ export const mockPatchData: DataModel = {
                 assignedSslPort: null,
               },
               addresses: {
-                privateDisabled: [],
-                publicEnabled: [],
+                enabled: [],
+                disabled: [],
                 possible: [],
               },
               options: {
@@ -625,8 +625,8 @@ export const mockPatchData: DataModel = {
                 assignedSslPort: null,
               },
               addresses: {
-                privateDisabled: [],
-                publicEnabled: [],
+                enabled: [],
+                disabled: [],
                 possible: [],
               },
               options: {