Skip to content
This repository was archived by the owner on Jun 13, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 27 additions & 24 deletions src/components/containers/ParametersContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,33 @@ const ParameterContainer = (props: {
>
Add Parameter
</button>
{props.values.parameters?.map((parameter: any) => (
<div
key={parameter.name}
className="p-4 mb-4 w-full border-circle-gray-300 border-2 rounded text-left"
>
<div className="flex">
<p className="font-bold">{parameter.name}</p>
</div>
{parameter.description && (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
{parameter.description}
</p>
)}
{parameter.defaultValue ? (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
{parameter.description}
</p>
) : (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
Required
</p>
)}
</div>
))}
{props.values.parameters &&
Object.entries(props.values.parameters).map(
([name, parameter]: [string, any]) => (
<div
key={name}
className="p-4 mb-4 w-full border-circle-gray-300 border-2 rounded text-left"
>
<div className="flex">
<p className="font-bold">{name}</p>
</div>
{parameter.description && (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
{parameter.description}
</p>
)}
{parameter.defaultValue ? (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
{parameter.description}
</p>
) : (
<p className="text-sm mt-1 leading-4 whitespace-pre-wrap text-circle-gray-500">
Required
</p>
)}
</div>
),
)}
</div>
)}
/>
Expand Down
26 changes: 15 additions & 11 deletions src/components/menus/definitions/InspectorDefinitionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ const InspectorDefinitionMenu = (props: InspectorDefinitionProps) => {
}}
enableReinitialize
onSubmit={(values) => {
const newDefinition = dataMapping.transform(values, definitions);
const submitData = props.editing
? { old: unpacked, new: newDefinition }
: newDefinition;

if (!props.passBackKey) {
const newDefinition = dataMapping.transform(values, definitions);
const submitData = props.editing
? { old: unpacked, new: newDefinition }
: newDefinition;

submitToStore(submitData);
}

Expand All @@ -100,14 +100,18 @@ const InspectorDefinitionMenu = (props: InspectorDefinitionProps) => {

navigateBack({
distance: 1,
apply: (values) => {
apply: (parentValues) => {
if (props.passBackKey) {
values[props.passBackKey] = [
...(values[props.passBackKey] || []),
newDefinition,
];
const { name, ...args } = values;

if (parentValues[props.passBackKey]) {
parentValues[props.passBackKey][name] = args;
} else {
parentValues[props.passBackKey] = { [name]: args };
}
}
return values;

return parentValues;
},
});
generateConfig();
Expand Down
2 changes: 2 additions & 0 deletions src/mappings/JobMapping.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const JobMapping: ComponentMapping<Job, WorkflowJob> = {
dependsOn: (definitions) => [definitions.commands, definitions.executors],
*/
transform: ({ name, ...values }, definitions) => {
console.log(values)

return parsers.parseJob(
name,
values,
Expand Down
13 changes: 8 additions & 5 deletions src/state/Store.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,16 @@ const Actions: StoreActions = {
}
}

const values =
payload?.apply?.(travelTo.props.values) || travelTo.props.values;
const props = {
...travelTo.props,
values: values,
};

state.navigation = {
...travelTo,
props: {
...travelTo.props,
values:
payload?.apply?.(travelTo.props.values) || travelTo.props.values,
},
props: props,
jumpedFrom: distance > 1 ? state.navigation : undefined,
};
} else {
Expand Down