{node.data.label}
{controller.showTooltip && !node.dragging ? (
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
index 6ba1c55e..1e0cc8d2 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
@@ -24,7 +24,7 @@ import { useConceptOptions } from '@/context/ConceptOptionsContext';
import { useOSS } from '@/context/OssContext';
import useLocalStorage from '@/hooks/useLocalStorage';
import { OssNode } from '@/models/miscellaneous';
-import { OperationID } from '@/models/oss';
+import { OperationID, OperationType } from '@/models/oss';
import { PARAMETER, storage } from '@/utils/constants';
import { errors } from '@/utils/labels';
@@ -127,19 +127,32 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
if (!controller.schema) {
return;
}
+
let target = { x: 0, y: 0 };
const positions = getPositions();
-
- if (inputs.length <= 1) {
+ if (positions.length == 0) {
target = flow.project({ x: window.innerWidth / 2, y: window.innerHeight / 2 });
+ }
+ if (inputs.length <= 1) {
+ let inputsNodes = positions.filter(pos =>
+ controller.schema!.items.find(
+ operation => operation.operation_type === OperationType.INPUT && operation.id === pos.id
+ )
+ );
+ if (inputsNodes.length > 0) {
+ inputsNodes = positions;
+ }
+ const maxX = Math.max(...inputsNodes.map(node => node.position_x));
+ const minY = Math.min(...inputsNodes.map(node => node.position_y));
+ target.x = maxX + 180;
+ target.y = minY;
} else {
const inputsNodes = positions.filter(pos => inputs.includes(pos.id));
const maxY = Math.max(...inputsNodes.map(node => node.position_y));
const minX = Math.min(...inputsNodes.map(node => node.position_x));
const maxX = Math.max(...inputsNodes.map(node => node.position_x));
-
- target.y = maxY + 100;
target.x = Math.ceil((maxX + minX) / 2 / PARAMETER.ossGridSize) * PARAMETER.ossGridSize;
+ target.y = maxY + 100;
}
let flagIntersect = false;
@@ -154,8 +167,13 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
target.y += PARAMETER.ossMinDistance;
}
} while (flagIntersect);
-
- controller.promptCreateOperation(target.x, target.y, inputs, positions);
+ controller.promptCreateOperation({
+ x: target.x,
+ y: target.y,
+ inputs: inputs,
+ positions: positions,
+ callback: () => flow.fitView({ duration: PARAMETER.zoomDuration })
+ });
},
[controller, getPositions, flow]
);
diff --git a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
index f4a20896..dc6ebbea 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
@@ -26,8 +26,17 @@ import {
OperationID
} from '@/models/oss';
import { UserID, UserLevel } from '@/models/user';
+import { PARAMETER } from '@/utils/constants';
import { information } from '@/utils/labels';
+export interface ICreateOperationPrompt {
+ x: number;
+ y: number;
+ inputs: OperationID[];
+ positions: IOperationPosition[];
+ callback: (newID: OperationID) => void;
+}
+
export interface IOssEditContext {
schema?: IOperationSchema;
selected: OperationID[];
@@ -51,7 +60,7 @@ export interface IOssEditContext {
openOperationSchema: (target: OperationID) => void;
savePositions: (positions: IOperationPosition[], callback?: () => void) => void;
- promptCreateOperation: (x: number, y: number, inputs: OperationID[], positions: IOperationPosition[]) => void;
+ promptCreateOperation: (props: ICreateOperationPrompt) => void;
deleteOperation: (target: OperationID, positions: IOperationPosition[]) => void;
createInput: (target: OperationID, positions: IOperationPosition[]) => void;
promptEditInput: (target: OperationID, positions: IOperationPosition[]) => void;
@@ -97,6 +106,8 @@ export const OssEditState = ({ selected, setSelected, children }: OssEditStatePr
const [showCreateOperation, setShowCreateOperation] = useState(false);
const [insertPosition, setInsertPosition] = useState
({ x: 0, y: 0 });
const [initialInputs, setInitialInputs] = useState([]);
+ const [createCallback, setCreateCallback] = useState<((newID: OperationID) => void) | undefined>(undefined);
+
const [positions, setPositions] = useState([]);
const [targetOperationID, setTargetOperationID] = useState(undefined);
const targetOperation = useMemo(
@@ -209,24 +220,27 @@ export const OssEditState = ({ selected, setSelected, children }: OssEditStatePr
[model]
);
- const promptCreateOperation = useCallback(
- (x: number, y: number, inputs: OperationID[], positions: IOperationPosition[]) => {
- setInsertPosition({ x: x, y: y });
- setInitialInputs(inputs);
- setPositions(positions);
- setShowCreateOperation(true);
- },
- []
- );
+ const promptCreateOperation = useCallback(({ x, y, inputs, positions, callback }: ICreateOperationPrompt) => {
+ setInsertPosition({ x: x, y: y });
+ setInitialInputs(inputs);
+ setPositions(positions);
+ setCreateCallback(() => callback);
+ setShowCreateOperation(true);
+ }, []);
const handleCreateOperation = useCallback(
(data: IOperationCreateData) => {
data.positions = positions;
data.item_data.position_x = insertPosition.x;
data.item_data.position_y = insertPosition.y;
- model.createOperation(data, operation => toast.success(information.newOperation(operation.alias)));
+ model.createOperation(data, operation => {
+ toast.success(information.newOperation(operation.alias));
+ if (createCallback) {
+ setTimeout(() => createCallback(operation.id), PARAMETER.refreshTimeout);
+ }
+ });
},
- [model, positions, insertPosition]
+ [model, positions, insertPosition, createCallback]
);
const promptEditOperation = useCallback((target: OperationID, positions: IOperationPosition[]) => {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index ee12a3db..b1d2f2a8 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -145,12 +145,12 @@ function EditorRSExpression({
const controls = useMemo(
() => (
),
- [showControls, disabled, model.processing, handleEdit]
+ [showControls, disabled, model.processing, handleEdit, activeCst]
);
return (
diff --git a/rsconcept/frontend/src/styling/overrides.css b/rsconcept/frontend/src/styling/overrides.css
index 90e5f4cc..db41764b 100644
--- a/rsconcept/frontend/src/styling/overrides.css
+++ b/rsconcept/frontend/src/styling/overrides.css
@@ -66,6 +66,8 @@
border: 1px solid;
padding: 2px;
width: 150px;
+ height: 30px;
+ font-size: 14px;
border-radius: 5px;
background-color: var(--cl-bg-120);
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index cb8efd6f..9ecb11d1 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -17,6 +17,8 @@ export const PARAMETER = {
ossContextMenuWidth: 200, // pixels - width of OSS context menu
ossGridSize: 10, // pixels - size of OSS grid
ossMinDistance: 20, // pixels - minimum distance between node centers
+ ossDistanceX: 180, // pixels - insert x-distance between node centers
+ ossDistanceY: 100, // pixels - insert y-distance between node centers
graphHoverXLimit: 0.4, // ratio to clientWidth used to determine which side of screen popup should be
graphHoverYLimit: 0.6, // ratio to clientHeight used to determine which side of screen popup should be