Skip to content

fix: recalculate regex lengths after field edits #306

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

Open
tamerwen84-bot wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

fix: recalculate regex lengths after field edits #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 15 additions & 34 deletions src/app/create/[id]/createBlueprintSteps/ExtractFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ const calculateMaxMatchLength = (parts: any[]): number => {
return totalPublicMaxLength + totalPrivateLength + 16;
};

const withCalculatedLengths = (regex: DecomposedRegex, parts: DecomposedRegexPart[]) => ({
...regex,
parts,
maxLength: calculateMaxLength(parts),
maxMatchLength: calculateMaxMatchLength(parts),
});

const Status = memo(({
emlContent,
isGeneratingFields,
Expand Down Expand Up @@ -1066,15 +1073,10 @@ const ExtractFields = ({
!part.isPublic ? 'text-white' : 'text-gray-700'
}`}
onClick={() => {
const parts = parseRegexParts(regex.parts);
const parts = [...parseRegexParts(regex.parts)];
parts[partIndex].isPublic = false;
const updatedRegexes = [...store.decomposedRegexes];
updatedRegexes[index] = {
...regex,
parts,
maxLength: calculateMaxLength(parts),
maxMatchLength: calculateMaxMatchLength(parts)
};
updatedRegexes[index] = withCalculatedLengths(regex, parts);
setField('decomposedRegexes', updatedRegexes);
}}
aria-pressed={!part.isPublic}
Expand All @@ -1095,23 +1097,10 @@ const ExtractFields = ({
part.isPublic ? 'text-white' : 'text-gray-700'
}`}
onClick={() => {
const parts = parseRegexParts(regex.parts);
const parts = [...parseRegexParts(regex.parts)];
parts[partIndex].isPublic = true;
// Recalculate total max length for all public parts
// Use 64 as default when maxLength is undefined
const totalPublicMaxLength = parts.reduce((acc: number, p: any) => {
if (p && p.isPublic) {
return acc + (p.maxLength ?? 64);
}
return acc;
}, 0);
const updatedRegexes = [...store.decomposedRegexes];
updatedRegexes[index] = {
...regex,
parts,
maxLength: totalPublicMaxLength || 64,
maxMatchLength: calculateMaxMatchLength(parts)
};
updatedRegexes[index] = withCalculatedLengths(regex, parts);
setField('decomposedRegexes', updatedRegexes);
}}
aria-pressed={part.isPublic}
Expand All @@ -1132,14 +1121,10 @@ const ExtractFields = ({
variant="destructive"
size="smIcon"
onClick={() => {
const parts = parseRegexParts(regex.parts);
const parts = [...parseRegexParts(regex.parts)];
parts.splice(partIndex, 1);
const updatedRegexes = [...store.decomposedRegexes];
updatedRegexes[index] = {
...regex,
parts: parts,
maxMatchLength: calculateMaxMatchLength(parts),
};
updatedRegexes[index] = withCalculatedLengths(regex, parts);
setField('decomposedRegexes', updatedRegexes);
}}
>
Expand Down Expand Up @@ -1277,17 +1262,13 @@ const ExtractFields = ({
/>
}
onClick={() => {
const parts = parseRegexParts(regex.parts);
const parts = [...parseRegexParts(regex.parts)];
parts.push({
isPublic: false,
regexDef: '',
});
const updatedRegexes = [...store.decomposedRegexes];
updatedRegexes[index] = {
...regex,
parts: parts,
maxMatchLength: calculateMaxMatchLength(parts),
};
updatedRegexes[index] = withCalculatedLengths(regex, parts);
setField('decomposedRegexes', updatedRegexes);
}}
>
Expand Down