Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: refactor IPPREFIX table #2143 #1604

Merged
merged 10 commits into from
Dec 10, 2024
Merged

Feat: refactor IPPREFIX table #2143 #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5acbbb8
Feat: refactor IPPREFIX table
Igoranze Nov 28, 2024
b949645
Merge branch 'main' into prefix-workflow
Igoranze Nov 28, 2024
041c880
Merge branch 'main' into prefix-workflow
Igoranze Dec 2, 2024
8d58cf6
Create fast-starfishes-design.md
Igoranze Dec 2, 2024
eaf5e17
remove unused imports
Igoranze Dec 2, 2024
7f7c419
Merge branch 'prefix-workflow' of github.com:workfloworchestrator/orc…
Igoranze Dec 2, 2024
34c6437
return state for state management
Igoranze Dec 3, 2024
894b541
prefix check lir/sub
Igoranze Dec 3, 2024
a64ba23
Merge branch 'main' into prefix-workflow
Igoranze Dec 10, 2024
28d2092
update after review
Igoranze Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fast-starfishes-design.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@orchestrator-ui/orchestrator-ui-components": patch
---

Feat: refactor IPPREFIX table #2143
71 changes: 21 additions & 50 deletions ...chestrator-ui-components/src/components/WfoForms/formFields/deprecated/IpNetworkField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Igoranze marked this conversation as resolved.
Show resolved Hide resolved
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,
Expand All @@ -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);
Igoranze marked this conversation as resolved.
Show resolved Hide resolved
// The state is needed in order to keep the selected prefix in the SplitPrefix component
const [selectedPrefix] = useState<string | undefined>(value);
Igoranze marked this conversation as resolved.
Show resolved Hide resolved

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)}>
Expand All @@ -73,32 +80,7 @@ function IpNetwork({
>
<section className="ipblock-selector">
<div id={id}>
{!prefixMin && (
Igoranze marked this conversation as resolved.
Show resolved Hide resolved
<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}
Expand All @@ -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>
Expand Down
Loading