@openshift-assisted/ui-lib 2.46.3 → 2.47.0

package/lib/ocm/components/clusterDetail/ClusterProperties.test.ts

@@ -0,0 +1,215 @@
+import { test, describe, expect } from 'vitest';
+import { getStackTypeLabel } from './ClusterProperties';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+
+const createCluster = (overrides: Partial<Cluster> = {}): Cluster =>
+  ({
+    id: 'test-cluster',
+    name: 'test-cluster',
+    kind: 'Cluster',
+    href: '/api/assisted-install/v2/clusters/test-cluster',
+    openshiftVersion: '4.11',
+    status: 'ready',
+    statusInfo: 'Cluster is ready',
+    machineNetworks: [],
+    clusterNetworks: [],
+    serviceNetworks: [],
+    ...overrides,
+  } as Cluster);
+
+const createMachineNetwork = (cidr: string) => ({ cidr, clusterId: 'test' });
+const createClusterNetwork = (cidr: string, hostPrefix: number) => ({
+  cidr,
+  hostPrefix,
+  clusterId: 'test',
+});
+const createServiceNetwork = (cidr: string) => ({ cidr, clusterId: 'test' });
+
+describe('getStackTypeLabel', () => {
+  describe('OCP < 4.12 (legacy behavior)', () => {
+    test('returns "Dual-stack" for valid dual stack with IPv4 primary', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.11',
+        machineNetworks: [
+          createMachineNetwork('192.168.1.0/24'),
+          createMachineNetwork('2001:db8::/64'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('10.128.0.0/14', 23),
+          createClusterNetwork('fd01::/48', 64),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('172.30.0.0/16'),
+          createServiceNetwork('fd02::/112'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('Dual-stack');
+    });
+
+    test('returns "IPv4" for single stack', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.11',
+        machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+        clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+        serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+
+    test('returns "IPv4" for IPv6 primary (invalid for OCP < 4.12)', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.11',
+        machineNetworks: [
+          createMachineNetwork('2001:db8::/64'),
+          createMachineNetwork('192.168.1.0/24'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('fd01::/48', 64),
+          createClusterNetwork('10.128.0.0/14', 23),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('fd02::/112'),
+          createServiceNetwork('172.30.0.0/16'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+  });
+
+  describe('OCP >= 4.12 (new behavior)', () => {
+    test('returns "Dual-stack" for IPv4 primary and IPv6 secondary', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [
+          createMachineNetwork('192.168.1.0/24'),
+          createMachineNetwork('2001:db8::/64'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('10.128.0.0/14', 23),
+          createClusterNetwork('fd01::/48', 64),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('172.30.0.0/16'),
+          createServiceNetwork('fd02::/112'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('Dual-stack');
+    });
+
+    test('returns "Dual-stack" for IPv6 primary and IPv4 secondary', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [
+          createMachineNetwork('2001:db8::/64'),
+          createMachineNetwork('192.168.1.0/24'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('fd01::/48', 64),
+          createClusterNetwork('10.128.0.0/14', 23),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('fd02::/112'),
+          createServiceNetwork('172.30.0.0/16'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('Dual-stack');
+    });
+
+    test('returns "IPv4" for IPv6 primary and IPv6 secondary (not dual-stack)', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [
+          createMachineNetwork('2001:db8::/64'),
+          createMachineNetwork('2001:db9::/64'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('fd01::/48', 64),
+          createClusterNetwork('fd02::/48', 64),
+        ],
+        serviceNetworks: [createServiceNetwork('fd03::/112'), createServiceNetwork('fd04::/112')],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+
+    test('returns "IPv4" for IPv4 primary and IPv4 secondary (not dual-stack)', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [
+          createMachineNetwork('192.168.1.0/24'),
+          createMachineNetwork('10.0.0.0/24'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('10.128.0.0/14', 23),
+          createClusterNetwork('172.16.0.0/14', 23),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('172.30.0.0/16'),
+          createServiceNetwork('172.31.0.0/16'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+
+    test('returns "IPv4" for single stack', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+        clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+        serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+  });
+
+  describe('edge cases', () => {
+    test('handles undefined openshiftVersion', () => {
+      const cluster = createCluster({
+        openshiftVersion: undefined,
+        machineNetworks: [
+          createMachineNetwork('192.168.1.0/24'),
+          createMachineNetwork('2001:db8::/64'),
+        ],
+        clusterNetworks: [
+          createClusterNetwork('10.128.0.0/14', 23),
+          createClusterNetwork('fd01::/48', 64),
+        ],
+        serviceNetworks: [
+          createServiceNetwork('172.30.0.0/16'),
+          createServiceNetwork('fd02::/112'),
+        ],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('Dual-stack');
+    });
+
+    test('handles empty networks', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: [],
+        clusterNetworks: [],
+        serviceNetworks: [],
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+
+    test('handles undefined networks', () => {
+      const cluster = createCluster({
+        openshiftVersion: '4.12',
+        machineNetworks: undefined,
+        clusterNetworks: undefined,
+        serviceNetworks: undefined,
+      });
+
+      expect(getStackTypeLabel(cluster)).toBe('IPv4');
+    });
+  });
+});

package/lib/ocm/components/clusterDetail/ClusterProperties.tsx

@@ -41,7 +41,7 @@ export const getManagementType = ({ userManagedNetworking }: Cluster): string =>
 };
 
 export const getStackTypeLabel = (cluster: Cluster): string =>
-  isDualStack(cluster) ? 'Dual-stack' : 'IPv4';
+  isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion }) ? 'Dual-stack' : 'IPv4';
 
 export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption['enableOn']) => {
   let diskEncryptionType = null;
@@ -67,7 +67,7 @@ export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption[
 
 const ClusterProperties = ({ cluster, externalMode = false }: ClusterPropertiesProps) => {
   const { t } = useTranslation();
-  const isDualStackType = isDualStack(cluster);
+  const isDualStackType = isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion });
   const featureSupportLevelContext = useNewFeatureSupportLevel();
 
   const activeFeatureConfiguration = featureSupportLevelContext.activeFeatureConfiguration;

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.46.3",
-    "@openshift-assisted/types": "2.46.3",
+    "@openshift-assisted/locales": "2.47.0",
+    "@openshift-assisted/types": "2.47.0",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "6.2.3",
     "@patternfly/react-code-editor": "6.2.2",
@@ -140,5 +140,5 @@
       ]
     }
   },
-  "version": "2.46.3"
+  "version": "2.47.0"
 }

package/build/@types/ocm/components/clusterConfiguration/OcmTNADisclaimer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OcmTNADisclaimer.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmTNADisclaimer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,QAAA,MAAM,gBAAgB,yBAgBrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-export interface UserManagedNetworkingTextContentProps {
-    shouldDisplayLoadBalancersBullet?: boolean;
-}
-export declare const UserManagedNetworkingTextContent: ({ shouldDisplayLoadBalancersBullet, }: UserManagedNetworkingTextContentProps) => React.JSX.Element;
-//# sourceMappingURL=UserManagedNetworkingTextContent.d.ts.map

package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserManagedNetworkingTextContent.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,qCAAqC;IACpD,gCAAgC,CAAC,EAAE,OAAO,CAAC;CAC5C;AAED,eAAO,MAAM,gCAAgC,0CAE1C,qCAAqC,sBAkBvC,CAAC"}

package/build/cjs/ocm/components/clusterConfiguration/OcmTNADisclaimer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OcmTNADisclaimer.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmTNADisclaimer.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAA6E;AAC7E,2FAA+E;AAE/E,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,OAAO,CACL,8BAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,IAAI,EAC1B,KAAK,EAAE,CAAC,CAAC,sDAAsD,CAAC,EAChE,QAAQ;QAER,8BAAC,iBAAI;YACH,8BAAC,qBAAQ,QACN,CAAC,CAAC,+EAA+E,CAAC,CAC1E,CACN,CACD,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserManagedNetworkingTextContent = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
-const react_core_1 = require("@patternfly/react-core");
-const ui_1 = require("../../../../common/components/ui");
-const docs_links_1 = require("../../../../common/config/docs_links");
-const UserManagedNetworkingTextContent = ({ shouldDisplayLoadBalancersBullet = false, }) => {
-    return (react_1.default.createElement(react_core_1.Content, null,
-        react_1.default.createElement(react_core_1.Content, { component: 'p' },
-            "Please refer to the",
-            ' ',
-            react_1.default.createElement(ui_1.ExternalLink, { href: (0, docs_links_1.getOpenShiftNetworkingDocsLink)() }, "OpenShift networking documentation"),
-            ' ',
-            "to configure your cluster's networking, including:",
-            ' '),
-        react_1.default.createElement(react_core_1.List, null,
-            react_1.default.createElement(react_core_1.ListItem, null, "DHCP or static IP Addresses"),
-            shouldDisplayLoadBalancersBullet && react_1.default.createElement(react_core_1.ListItem, null, "Load balancers"),
-            react_1.default.createElement(react_core_1.ListItem, null, "Network ports"),
-            react_1.default.createElement(react_core_1.ListItem, null, "DNS"))));
-};
-exports.UserManagedNetworkingTextContent = UserManagedNetworkingTextContent;
-//# sourceMappingURL=UserManagedNetworkingTextContent.js.map

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserManagedNetworkingTextContent.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAiE;AACjE,yDAAgE;AAChE,qEAAsF;AAM/E,MAAM,gCAAgC,GAAG,CAAC,EAC/C,gCAAgC,GAAG,KAAK,GACF,EAAE,EAAE;IAC1C,OAAO,CACL,8BAAC,oBAAO;QACN,8BAAC,oBAAO,IAAC,SAAS,EAAE,GAAG;;YACD,GAAG;YACvB,8BAAC,iBAAY,IAAC,IAAI,EAAE,IAAA,2CAA8B,GAAE,yCAErC;YAAC,GAAG;;YACgC,GAAG,CAC9C;QACV,8BAAC,iBAAI;YACH,8BAAC,qBAAQ,sCAAuC;YAC/C,gCAAgC,IAAI,8BAAC,qBAAQ,yBAA0B;YACxE,8BAAC,qBAAQ,wBAAyB;YAClC,8BAAC,qBAAQ,cAAe,CACnB,CACC,CACX,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,gCAAgC,oCAoB3C"}

package/lib/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.tsx

@@ -1,30 +0,0 @@
-import React from 'react';
-import { List, ListItem, Content } from '@patternfly/react-core';
-import { ExternalLink } from '../../../../common/components/ui';
-import { getOpenShiftNetworkingDocsLink } from '../../../../common/config/docs_links';
-
-export interface UserManagedNetworkingTextContentProps {
-  shouldDisplayLoadBalancersBullet?: boolean;
-}
-
-export const UserManagedNetworkingTextContent = ({
-  shouldDisplayLoadBalancersBullet = false,
-}: UserManagedNetworkingTextContentProps) => {
-  return (
-    <Content>
-      <Content component={'p'}>
-        Please refer to the{' '}
-        <ExternalLink href={getOpenShiftNetworkingDocsLink()}>
-          OpenShift networking documentation
-        </ExternalLink>{' '}
-        to configure your cluster's networking, including:{' '}
-      </Content>
-      <List>
-        <ListItem>DHCP or static IP Addresses</ListItem>
-        {shouldDisplayLoadBalancersBullet && <ListItem>Load balancers</ListItem>}
-        <ListItem>Network ports</ListItem>
-        <ListItem>DNS</ListItem>
-      </List>
-    </Content>
-  );
-};