Skip to content

3817 - fix ObjectProperty subproperties reordering #3822

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
kresimir-coko merged 1 commit into from
Dec 29, 2025
Merged

3817 - fix ObjectProperty subproperties reordering #3822

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
171 changes: 119 additions & 52 deletions client/src/pages/platform/workflow-editor/components/properties/ObjectProperty.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ import Property from './Property';
import DeletePropertyButton from './components/DeletePropertyButton';
import SubPropertyPopover from './components/SubPropertyPopover';

interface BuildOrderedPropertyKeysProps {
dynamicPropertyTypes: Record<string, string> | undefined;
parameterObject: {[key: string]: object[] | undefined};
path: string;
properties: Array<PropertyAllType> | undefined;
}

interface BuildPropertyFromParameterKeyProps {
baseProperty: PropertyAllType;
dynamicPropertyTypes: Record<string, string> | undefined;
parameterKey: string;
parameterObject: {[key: string]: unknown};
path: string;
properties: Array<PropertyAllType>;
}

interface ObjectPropertyProps {
operationName?: string;
arrayIndex?: number;
Expand Down Expand Up @@ -130,64 +146,69 @@ const ObjectProperty = ({arrayIndex, arrayName, onDeleteClick, operationName, pa
[onDeleteClick, path]
);

// render individual object items with data gathered from parameters
useEffect(() => {
if (
!name ||
!path ||
!currentComponent?.parameters ||
!properties ||
!parameterObject ||
!isObject(parameterObject)
) {
return;
}

const subPropertyKeySet = new Set<string>();
const dynamicPropertyTypes = currentComponent?.metadata?.ui?.dynamicPropertyTypes;

if (path && dynamicPropertyTypes) {
const pathPrefix = `${path}.`;
const buildOrderedPropertyKeys = useCallback(
({dynamicPropertyTypes, parameterObject, path, properties}: BuildOrderedPropertyKeysProps): string[] => {
const subPropertyKeySet = new Set<string>();
const orderedKeys: string[] = [];

Object.keys(dynamicPropertyTypes).forEach((dynamicKey) => {
if (dynamicKey.startsWith(pathPrefix)) {
const subPropertyName = dynamicKey.substring(pathPrefix.length);
if (properties?.length) {
properties.forEach((property) => {
if (property.name) {
orderedKeys.push(property.name);

if (subPropertyName && !subPropertyName.includes('.')) {
subPropertyKeySet.add(subPropertyName);
subPropertyKeySet.add(property.name);
}
}
});
}
});
}

if (properties?.length) {
properties.forEach((property) => {
if (property.name) {
subPropertyKeySet.add(property.name);
}
});
}
if (path && dynamicPropertyTypes) {
const pathPrefix = `${path}.`;

if (parameterObject) {
Object.keys(parameterObject).forEach((key) => {
subPropertyKeySet.add(key);
});
}
Object.keys(dynamicPropertyTypes).forEach((dynamicKey) => {
if (dynamicKey.startsWith(pathPrefix)) {
const subPropertyName = dynamicKey.substring(pathPrefix.length);

const objectParameterKeys = Array.from(subPropertyKeySet);
if (subPropertyName && !subPropertyName.includes('.')) {
if (!subPropertyKeySet.has(subPropertyName)) {
orderedKeys.push(subPropertyName);

if (!objectParameterKeys.length) {
return;
}
subPropertyKeySet.add(subPropertyName);
}
}
}
});
}

const preexistingProperties = objectParameterKeys.map((parameterKey) => {
const matchingProperty = (properties as Array<PropertyAllType>).find(
(property) => property.name === parameterKey
) as PropertyAllType | undefined;
if (parameterObject) {
Object.keys(parameterObject).forEach((key) => {
if (!subPropertyKeySet.has(key)) {
orderedKeys.push(key);

let parameterItemType = currentComponent.metadata?.ui?.dynamicPropertyTypes?.[`${path}.${parameterKey}`];
subPropertyKeySet.add(key);
}
});
}

const parameterKeyValue = parameterObject[parameterKey!];
return orderedKeys;
},
[]
);

const buildPropertyFromParameterKey = useCallback(
({
baseProperty,
dynamicPropertyTypes,
parameterKey,
parameterObject,
path,
properties,
}: BuildPropertyFromParameterKeyProps): PropertyAllType => {
const matchingProperty = properties.find((property) => property.name === parameterKey) as
| PropertyAllType
| undefined;

let parameterItemType = dynamicPropertyTypes?.[`${path}.${parameterKey}`];
const parameterKeyValue = parameterObject[parameterKey];

if (Array.isArray(parameterKeyValue) && !parameterItemType) {
parameterItemType = 'ARRAY';
Expand Down Expand Up @@ -215,10 +236,10 @@ const ObjectProperty = ({arrayIndex, arrayName, onDeleteClick, operationName, pa
controlType: matchingPropertyControlType,
defaultValue: parameterKeyValue,
type: matchingPropertyType,
};
} as PropertyAllType;
} else {
return {
...property,
...baseProperty,
controlType: VALUE_PROPERTY_CONTROL_TYPES[
parameterItemType as keyof typeof VALUE_PROPERTY_CONTROL_TYPES
] as ControlType,
Expand All @@ -228,15 +249,61 @@ const ObjectProperty = ({arrayIndex, arrayName, onDeleteClick, operationName, pa
label: parameterKey,
name: parameterKey,
type: parameterItemType as PropertyType,
};
} as PropertyAllType;
}
},
[]
);

// render individual object items with data gathered from parameters
useEffect(() => {
if (
!name ||
!path ||
!currentComponent?.parameters ||
!properties ||
!parameterObject ||
!isObject(parameterObject)
) {
return;
}

const dynamicPropertyTypes = currentComponent?.metadata?.ui?.dynamicPropertyTypes;

const objectParameterKeys = buildOrderedPropertyKeys({
dynamicPropertyTypes,
parameterObject,
path,
properties: properties as Array<PropertyAllType>,
});

if (!objectParameterKeys.length) {
return;
}

const preexistingProperties = objectParameterKeys.map((parameterKey) =>
buildPropertyFromParameterKey({
baseProperty: property,
dynamicPropertyTypes,
parameterKey,
parameterObject,
path,
properties: properties as Array<PropertyAllType>,
})
);

if (preexistingProperties.length) {
setSubProperties(preexistingProperties as Array<PropertyAllType>);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [parameterObject, properties, path, currentComponent?.metadata?.ui?.dynamicPropertyTypes]);
}, [
parameterObject,
properties,
path,
currentComponent?.metadata?.ui?.dynamicPropertyTypes,
buildOrderedPropertyKeys,
buildPropertyFromParameterKey,
]);

// set default values for subProperties when they are created
useEffect(() => {
Expand Down
Loading