Skip to content

merging dev to test #912

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

Merged
ffrose merged 4 commits into from
Feb 5, 2026
Merged

merging dev to test #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f9f5a3
fix(909): Fixed rules drag value
1AhmedYasser Feb 4, 2026
f49c439
fix(895): Fixed beakline
1AhmedYasser Feb 4, 2026
f8febdd
Merge pull request #911 from 1AhmedYasser/fix-multiline-node-break
ffrose Feb 5, 2026
be9a61b
Merge pull request #910 from 1AhmedYasser/fix-rules-drag-value
ffrose Feb 5, 2026
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
8 changes: 4 additions & 4 deletions GUI/src/components/FlowElementsPopup/RuleBuilder/ruleElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ const RuleElement: React.FC<RuleElementProps> = ({ rule, onRemove, onChange }) =

const handleFieldDrop = (e: React.DragEvent<HTMLInputElement>) => {
const data = getDragData(e);
onChange({ ...rule, field: data.value });
onChange({ ...rule, field: data.key });
};

const handleValueDrop = (e: React.DragEvent<HTMLInputElement>) => {
const data = getDragData(e);
onChange({ ...rule, value: data.value });
onChange({ ...rule, value: data.key });
};

const handleSelectionChange = (e: { label: string; value: string } | null) => {
Expand All @@ -50,7 +50,7 @@ const RuleElement: React.FC<RuleElementProps> = ({ rule, onRemove, onChange }) =
onChange({
...rule,
fieldDragElement: dragElement,
field: dragElement.value,
field: dragElement.key,
isFieldManual: false,
});
};
Expand All @@ -59,7 +59,7 @@ const RuleElement: React.FC<RuleElementProps> = ({ rule, onRemove, onChange }) =
onChange({
...rule,
valueDragElement: dragElement,
value: dragElement.value,
value: dragElement.key,
isValueManual: false,
});
};
Expand Down
7 changes: 6 additions & 1 deletion GUI/src/pages/ServiceFlowPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,14 @@
white-space: nowrap;
max-width: 318px;

p {
p,
div {
display: inline;
}

br {
display: none;
}
}

&.selected {
Expand Down