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

Make sure parameters work in query preview #1138

Merged
merged 3 commits into from
Oct 12, 2022
Merged

Make sure parameters work in query preview #1138

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
be3424d
Make sure parameters work in query preview
Janpot Oct 12, 2022
a4bdb8e
adjust comment
Janpot Oct 12, 2022
dd179ed
mutation editor too
Janpot Oct 12, 2022
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
6 changes: 4 additions & 2 deletions packages/toolpad-app/src/toolpad/AppEditor/PageEditor/MutationEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ const EMPTY_OBJECT = {};

function createQueryModel<Q>(node: appDom.MutationNode<Q>): QueryEditorModel<Q> {
const inputParams = node.params || EMPTY_OBJECT;
const params =
const parameters =
(Object.entries(inputParams).filter(([, value]) => Boolean(value)) as BindableAttrEntries) ||
[];

return {
query: node.attributes.query.value,
params,
// TODO: 'params' are passed only for backwards compatability, remove after v1
params: parameters,
parameters,
};
}

Expand Down
6 changes: 4 additions & 2 deletions packages/toolpad-app/src/toolpad/AppEditor/PageEditor/QueryEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ const EMPTY_OBJECT = {};

function createQueryModel<Q>(node: appDom.QueryNode<Q>): QueryEditorModel<Q> {
const inputParams = node.params || EMPTY_OBJECT;
const params =
const parameters =
(Object.entries(inputParams).filter(([, value]) => Boolean(value)) as BindableAttrEntries) ||
[];

return {
query: node.attributes.query.value,
params,
// TODO: 'params' are passed only for backwards compatability, remove after v1
params: parameters,
parameters,
};
}

Expand Down
2 changes: 2 additions & 0 deletions packages/toolpad-app/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ export type ConnectionParamsEditor<P = {}> = React.FC<ConnectionEditorProps<P>>;

export interface QueryEditorModel<Q> {
query: Q;
/** @deprecated Use parameters instead */
params: BindableAttrEntries;
parameters: BindableAttrEntries;
}

export interface QueryEditorProps<C, Q> extends WithControlledProp<QueryEditorModel<Q>> {
Expand Down