-
Notifications
You must be signed in to change notification settings - Fork 56
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.
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
feat: add variable and expression support to serve props #895
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
120f338
feat: add variable and expression support to serve props
Caele f52e69b
chore: hide behind flag PP_EXPRESSIONS
Caele b81b10e
fix: don't use variable expansion
Caele 5f32adb
fix: match variable struct exactly
Caele 5b09737
chore: remove flags option from cl
Caele File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -142,7 +142,7 @@ export default function FieldsPopover({ alignTo, show, close, onSelected, type } | |
open={show} | ||
onClose={close} | ||
anchorEl={alignTo.current} | ||
marginThreshold={theme.spacing(1)} | ||
marginThreshold={16} // theme.spacing(1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixes a MUI warning |
||
elevation={3} | ||
anchorOrigin={{ | ||
vertical: 'bottom', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* eslint no-param-reassign:0 */ | ||
import React, { useState, useEffect } from 'react'; | ||
|
||
import { Select, FormControl, MenuItem } from '@mui/material'; | ||
|
||
let variableList = null; | ||
|
||
async function getVariables(app) { | ||
if (!variableList) { | ||
variableList = await app.createSessionObject({ | ||
qInfo: { | ||
qType: 'VariableList', | ||
}, | ||
qVariableListDef: { | ||
qType: 'variable', | ||
qShowReserved: false, | ||
qShowConfig: false, | ||
}, | ||
}); | ||
} | ||
const reply = await variableList.getLayout(); | ||
|
||
const list = reply.qVariableList.qItems.map((item) => ({ | ||
value: item.qName, | ||
label: item.qName.length > 50 ? `${item.qName.slice(0, 50)}...` : item.qName, | ||
})); | ||
|
||
return list; | ||
} | ||
// variable, {name, value}, properties | ||
export default function Variable({ property, value, target, changed, app }) { | ||
const [s, setS] = useState(value.name); | ||
const [l, setL] = useState([]); | ||
|
||
useEffect(() => { | ||
async function fetchData() { | ||
const list = await getVariables(app); | ||
setL(list); | ||
} | ||
fetchData(); | ||
}, []); | ||
|
||
const handleChange = (e) => { | ||
setS(e.target.value); | ||
target[property].name = e.target.value; | ||
target[property].value = { qStringExpression: { qExpr: `$(${e.target.value})` } }; | ||
changed(); | ||
}; | ||
return l.length === 0 ? ( | ||
<em>No variables in app</em> | ||
) : ( | ||
<FormControl size="small" fullWidth> | ||
<Select | ||
onChange={handleChange} | ||
displayEmpty | ||
fullWidth | ||
value={s} | ||
renderValue={(selected) => { | ||
if (selected.length === 0) { | ||
return <em>Select a variable</em>; | ||
} | ||
return selected; | ||
}} | ||
> | ||
{l.map((c) => ( | ||
<MenuItem key={c.value} value={c.value}> | ||
{c.label} | ||
</MenuItem> | ||
))} | ||
</Select> | ||
</FormControl> | ||
); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Source maps wheren't working correctly.