Skip to content
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

🐛 Fix Argument CamelCap Handling + Remote Run Input #355

Merged
merged 3 commits into from
Sep 6, 2024
Merged

🐛 Fix Argument CamelCap Handling + Remote Run Input #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0383ab6
refactor RunDialog style
MFA-X-AI Aug 22, 2024
949da78
fix run dialog unable to handle camelCase
MFA-X-AI Aug 22, 2024
67dc602
fix arguments form spawning multiple times when toggling run type
MFA-X-AI Aug 22, 2024
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
22 changes: 10 additions & 12 deletions src/components/XircuitsBodyWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,16 +715,18 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
} else {
setRunConfigs("")
}

const setterByType = {
'string': setStringNodes,
'int': setIntNodes,
'float': setFloatNodes,
'boolean': setBoolNodes,
'any': setAnyNodes
}

context.ready.then(() => {
const setterByType = {
'string': setStringNodes,
'int': setIntNodes,
'float': setFloatNodes,
'boolean': setBoolNodes,
'any': setAnyNodes
}
Object.values(setterByType).forEach(set => set([]));

context.ready.then(() => {

if (initialize) {
let allNodes = xircuitsApp.getDiagramEngine().getModel().getNodes();
Expand All @@ -740,9 +742,6 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
}
}
}
else {
Object.values(setterByType).forEach(set => set([]));
}
})
}, [initialize, runType]);

Expand Down Expand Up @@ -797,7 +796,6 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
.reduce((cmd, param) => {
xircuitLogger.info(param + ": " + dialogResult.value[param]);
let filteredParam = param.replace(/\s+/g, "_");
filteredParam = filteredParam.toLowerCase();
return `${cmd} --${filteredParam} ${dialogResult.value[param]}`;
}, s);
}, "");
Expand Down
119 changes: 53 additions & 66 deletions src/dialog/RunDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ export const RunDialog = ({

return (
<form>
{childStringNodes.length > 0 ? <h3 style={{ marginTop: 0, marginBottom: 5 }}>Arguments:</h3> : null}
{childStringNodes.length > 0 ? <h3 style={runDialogStyle.form.subheader}>Arguments:</h3> : null}
<div>{runConfigs.length != 0 ?
<><h4 style={{ marginTop: 2, marginBottom: 0 }}>Remote Execution</h4>
<><h4 style={runDialogStyle.form.header}>Remote Execution</h4>
<div>Available Run Type:
<HTMLSelect
onChange={(e) => handleTypeChange(e)}
Expand Down Expand Up @@ -109,7 +109,7 @@ export const RunDialog = ({
value={command}
minRows={10}
name='command'
style={{ width: 350, fontSize: 12 }}
style={runDialogStyle.form.textarea}
readOnly />
</div></>
: null}
Expand All @@ -127,7 +127,7 @@ export const RunDialog = ({
<div>
{
childBoolNodes.length != 0 ?
<><br /><h4 style={{ marginTop: 2, marginBottom: 0 }}>Boolean</h4></> : null
<><br /><h4 style={runDialogStyle.form.header}>Boolean</h4></> : null
}
</div>
{childBoolNodes.map((boolNode, i) =>
Expand All @@ -146,7 +146,7 @@ export const RunDialog = ({
<div>
{
childIntNodes.length != 0 ?
<><br /><h4 style={{ marginTop: 2, marginBottom: 0 }}>Integer</h4></> : null
<><br /><h4 style={runDialogStyle.form.header}>Integer</h4></> : null
}
</div>
{childIntNodes.map((intNode, i) =>
Expand All @@ -160,43 +160,14 @@ export const RunDialog = ({
step={1}
precision={0}
mobile={true}
style={{
wrap: {
boxShadow: '0 0 1px 1px #fff inset, 1px 1px 5px -1px #000',
padding: '2px 2.26ex 2px 2px',
borderRadius: '6px 3px 3px 6px',
fontSize: 20,
width: '60%'
},
input: {
borderRadius: '6px 3px 3px 6px',
padding: '0.1ex 1ex',
border: '#ccc',
marginRight: 4,
display: 'block',
fontWeight: 100,
width: '100%'
},
plus: {
background: 'rgba(255, 255, 255, 100)'
},
minus: {
background: 'rgba(255, 255, 255, 100)'
},
btnDown: {
background: 'rgba(0, 0, 0)'
},
btnUp: {
background: 'rgba(0, 0, 0)'
}
}}
style={runDialogStyle.form}
/>
</div>
</div>)}
<div>
{
childFloatNodes.length != 0 ?
<><br /><h4 style={{ marginTop: 2, marginBottom: 0 }}>Float</h4></> : null
<><br /><h4 style={runDialogStyle.form.header}>Float</h4></> : null
}
</div>
{childFloatNodes.map((floatNode, i) =>
Expand All @@ -210,39 +181,55 @@ export const RunDialog = ({
step={0.1}
precision={2}
mobile={true}
style={{
wrap: {
boxShadow: '0 0 1px 1px #fff inset, 1px 1px 5px -1px #000',
padding: '2px 2.26ex 2px 2px',
borderRadius: '6px 3px 3px 6px',
fontSize: 20,
width: '60%'
},
input: {
borderRadius: '6px 3px 3px 6px',
padding: '0.1ex 1ex',
border: '#ccc',
marginRight: 4,
display: 'block',
fontWeight: 100,
width: '100%'
},
plus: {
background: 'rgba(255, 255, 255, 100)'
},
minus: {
background: 'rgba(255, 255, 255, 100)'
},
btnDown: {
background: 'rgba(0, 0, 0)'
},
btnUp: {
background: 'rgba(0, 0, 0)'
}
}}
style={runDialogStyle.form}
/>
</div>
</div>)}
</form>
);
}

const runDialogStyle = {
form: {
wrap: {
boxShadow: '0 0 1px 1px #fff inset, 1px 1px 5px -1px #000',
padding: '2px 2.26ex 2px 2px',
borderRadius: '6px 3px 3px 6px',
fontSize: 20,
width: '60%'
},
input: {
borderRadius: '6px 3px 3px 6px',
padding: '0.1ex 1ex',
border: '#ccc',
marginRight: 4,
display: 'block',
fontWeight: 100,
width: '100%'
},
plus: {
background: 'rgba(255, 255, 255, 100)'
},
minus: {
background: 'rgba(255, 255, 255, 100)'
},
btnDown: {
background: 'rgba(0, 0, 0)'
},
btnUp: {
background: 'rgba(0, 0, 0)'
},
textarea: {
width: 350,
fontSize: 12
},
header: {
marginTop: 2,
marginBottom: 0
},
subheader: {
marginTop: 0,
marginBottom: 5
}
}
};
Loading