@orchestrator-ui/orchestrator-ui-components 2.14.0 → 2.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@orchestrator-ui/orchestrator-ui-components",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "license": "Apache-2.0",
     "description": "Library of UI Components used to display the workflow orchestrator frontend",
     "author": {

package/src/components/WfoForms/formFields/deprecated/IpNetworkField.tsx

@@ -14,18 +14,29 @@
  */
 import React, { useState } from 'react';
 
-import { useTranslations } from 'next-intl';
 import { connectField, filterDOMProps } from 'uniforms';
 
-import { EuiCallOut, EuiFormRow, EuiText } from '@elastic/eui';
+import { EuiFormRow, EuiText } from '@elastic/eui';
 
 import { getCommonFormFieldStyles } from '@/components/WfoForms/formFields/commonStyles';
 import SplitPrefix from '@/components/WfoForms/formFields/deprecated/SplitPrefix';
 import { useWithOrchestratorTheme } from '@/hooks';
 
 import { FieldProps } from '../types';
-import IpPrefixTableField from './IpPrefixTableField';
-import { IpBlock } from './types';
+
+export function getUsedPrefixMin(
+    netmask: string,
+    prefixMin: number | undefined,
+    name: string,
+) {
+    const netMaskInt = parseInt(netmask, 10);
+    return (
+        prefixMin ??
+        (netMaskInt < 32 && name === 'ip_sub_prefix'
+            ? netMaskInt + 1
+            : netMaskInt)
+    );
+}
 
 export type IPvAnyNetworkFieldProps = FieldProps<
     string,
@@ -48,17 +59,13 @@ function IpNetwork({
 }: IPvAnyNetworkFieldProps) {
     const { formRowStyle } = useWithOrchestratorTheme(getCommonFormFieldStyles);
 
-    const t = useTranslations('pydanticForms');
-    const [selectedPrefix, setSelectedPrefix] = useState<IpBlock | undefined>(
-        undefined,
-    );
-    const [manualOverride, setManualOverride] = useState(false);
+    // The state is needed in order to keep the selected prefix in the SplitPrefix component
+    const [selectedPrefix] = useState<string | undefined>(value);
 
-    const usePrefix = selectedPrefix?.prefix ?? value;
+    const usePrefix = selectedPrefix;
     const [subnet, netmask] = usePrefix?.split('/') ?? ['', ''];
-    const usedPrefixMin =
-        prefixMin ??
-        parseInt(netmask, 10) + (selectedPrefix?.state === 0 ? 0 : 1);
+
+    const usedPrefixMin = getUsedPrefixMin(netmask, prefixMin, name);
 
     return (
         <section {...filterDOMProps(props)}>
@@ -73,32 +80,7 @@ function IpNetwork({
             >
                 <section className="ipblock-selector">
                     <div id={id}>
-                        {!prefixMin && (
-                            <IpPrefixTableField
-                                id={id}
-                                name={name}
-                                onChange={(prefix: IpBlock) => {
-                                    if (!readOnly) {
-                                        if (
-                                            prefix.state === 0 ||
-                                            prefix.state === 1
-                                        ) {
-                                            setSelectedPrefix(prefix);
-                                        }
-                                        setManualOverride(false);
-                                        onChange(prefix.prefix);
-                                    }
-                                }}
-                                onManualOverride={(prefixString: string) => {
-                                    if (!readOnly) {
-                                        setManualOverride(true);
-                                        onChange(prefixString);
-                                    }
-                                }}
-                                selected_prefix_id={selectedPrefix?.id}
-                            />
-                        )}
-                        {usePrefix && !manualOverride && (
+                        {usePrefix && (
                             <SplitPrefix
                                 id={id}
                                 name={name}
@@ -113,17 +95,6 @@ function IpNetwork({
                                 selectedSubnet={usePrefix}
                             />
                         )}
-                        {usePrefix && manualOverride && (
-                            <EuiCallOut
-                                title={t(
-                                    'widgets.ipvAnyNetworkField.manuallySelectedPrefix',
-                                )}
-                                color="primary"
-                                iconType="check"
-                            >
-                                <p>{value}</p>
-                            </EuiCallOut>
-                        )}
                     </div>
                 </section>
             </EuiFormRow>

package/src/configuration/version.ts

@@ -1 +1 @@
-export const ORCHESTRATOR_UI_LIBRARY_VERSION = '2.14.0';
+export const ORCHESTRATOR_UI_LIBRARY_VERSION = '2.14.1';

package/src/utils/uuid.spec.ts

@@ -5,6 +5,11 @@ describe('getFirstUuidPart()', () => {
         const result = getFirstUuidPart('12345678-1234-1234-1234-123456789abc');
         expect(result).toEqual('12345678');
     });
+
+    it('returns empty string for empty uuid', () => {
+        const result = getFirstUuidPart();
+        expect(result).toEqual('');
+    });
 });
 
 describe('isUuid4()', () => {

package/src/utils/uuid.ts

@@ -1,4 +1,5 @@
-export const getFirstUuidPart = (uuid: string): string => uuid.slice(0, 8);
+export const getFirstUuidPart = (uuid?: string): string =>
+    uuid ? uuid.slice(0, 8) : '';
 
 export const isUuid4 = (value: string): boolean =>
     !!value.match(