Skip to content

Added variables to data query #1470

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
merged 8 commits into from
Jan 29, 2025
Merged

Added variables to data query #1470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
338a8fa
Added query variables on Query Dialogue, added parameters on Run a Da…
Imiss-U1025 Jan 22, 2025
2c73080
Added Variables to every queries of Data Queries in your App of left …
Imiss-U1025 Jan 24, 2025
6f9ae41
Added console to query.
Imiss-U1025 Jan 25, 2025
8564f79
overwrite variables before executeQuery
Imiss-U1025 Jan 27, 2025
845f9c1
key to label on event handler popup
Imiss-U1025 Jan 27, 2025
5e1cf9e
use overwritten variable in query request
Imiss-U1025 Jan 28, 2025
63faec2
show query variables in event handlers popup
raheeliftikhar5 Jan 29, 2025
e43aba8
Fix label and remove del button
Imiss-U1025 Jan 29, 2025
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
Prev Previous commit
Next Next commit
show query variables in event handlers popup
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Jan 29, 2025
commit 63faec27f37953ef9934abca5b078dded1f9ac1c
170 changes: 94 additions & 76 deletions client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,98 @@ import { getPromiseAfterDispatch } from "util/promiseUtils";
import { trans } from "i18n";
import {keyValueListControl, keyValueListToSearchStr, withDefault} from "lowcoder-sdk";
import {KeyValue} from "@lowcoder-ee/types/common";
import { useCallback, useContext, useEffect, useMemo } from "react";

const ExecuteQueryPropertyView = ({
comp,
placement,
}: {
comp: any,
placement?: "query" | "table"
}) => {
const getQueryOptions = useCallback((editorState?: EditorState) => {
const options: { label: string; value: string; variable?: Record<string, string> }[] =
editorState
?.queryCompInfoList()
.map((info) => {
return {
label: info.name,
value: info.name,
variable: info.data.variable,
}
})
.filter(
// Filter out the current query under query
(option) => {
if (
placement === "query" &&
editorState.selectedBottomResType === BottomResTypeEnum.Query
) {
return option.value !== editorState.selectedBottomResName;
}
return true;
}
) || [];

// input queries
editorState
?.getModuleLayoutComp()
?.getInputs()
.forEach((i) => {
const { name, type } = i.getView();
if (type === InputTypeEnum.Query) {
options.push({ label: name, value: name });
}
});
return options;
}, [placement]);

const getVariableOptions = useCallback((editorState?: EditorState) => {
return comp.children.queryVariables.propertyView({
label: trans("eventHandler.queryParams"),
layout: "vertical",
isStatic: true,
keyFixed: true,
});
}, [comp.children.queryVariables.getView()])

return (
<>
<BranchDiv $type={"inline"}>
<EditorContext.Consumer>
{(editorState) => (
<>
<Dropdown
showSearch={true}
value={comp.children.queryName.getView()}
options={getQueryOptions(editorState)}
label={trans("eventHandler.selectQuery")}
onChange={(value) => {
const options = getQueryOptions(editorState);
const selectedQuery = options.find(option => option.value === value);
const variables = selectedQuery ? Object.keys(selectedQuery.variable || {}) : [];
comp.dispatchChangeValueAction({
queryName: value,
queryVariables: variables.map((variable) => ({key: variable, value: ''})),
});
}}
/>
</>
)}
</EditorContext.Consumer>
</BranchDiv>
<BranchDiv>
<EditorContext.Consumer>
{(editorState) => getVariableOptions(editorState)}
</EditorContext.Consumer>
</BranchDiv>
</>
);
}
const ExecuteQueryTmpAction = (function () {
const childrenMap = {
queryName: SimpleNameComp,
query: withDefault(keyValueListControl(false, [], "string"), [{ key: "", value: "" }])
queryVariables: withDefault(keyValueListControl(false, [], "string"), [])
};
return new MultiCompBuilder(childrenMap, () => {
return () => Promise.resolve(undefined as unknown);
Expand All @@ -26,7 +113,7 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
override getView() {
const queryName = this.children.queryName.getView();
// const queryParams = keyValueListToSearchStr(Array.isArray(this?.children?.query) ? (this.children.query as unknown as any[]).map((i: any) => i.getView() as KeyValue) : []);
const result = Object.values(this.children.query.children as Record<string, {
const result = Object.values(this.children.queryVariables.children as Record<string, {
children: {
key: { unevaledValue: string },
value: { unevaledValue: string }
Expand Down Expand Up @@ -56,80 +143,11 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
}

propertyView({ placement }: { placement?: "query" | "table" }) {
const getQueryOptions = (editorState?: EditorState) => {
const options: { label: string; value: string }[] =
editorState
?.queryCompInfoList()
.map((info) => ({
label: info.name,
value: info.name,
}))
.filter(
// Filter out the current query under query
(option) => {
if (
placement === "query" &&
editorState.selectedBottomResType === BottomResTypeEnum.Query
) {
return option.value !== editorState.selectedBottomResName;
}
return true;
}
) || [];

// input queries
editorState
?.getModuleLayoutComp()
?.getInputs()
.forEach((i) => {
const { name, type } = i.getView();
if (type === InputTypeEnum.Query) {
options.push({ label: name, value: name });
}
});
return options;
};
const getVariableOptions = (editorState?: EditorState) => {
const options =
editorState
?.getQueriesComp()
.getView()
.filter(
// Filter out the current query under query
(option) => {
return option.children.name.getView() === this.children.queryName.getView();
}
) || [];
return this.children.query.propertyView({
label: trans("eventHandler.queryParams"),
layout: "vertical",
isStatic: true,
keyFixed: true,
});
}
return (
<>
<BranchDiv $type={"inline"}>
<EditorContext.Consumer>
{(editorState) => (
<>
<Dropdown
showSearch={true}
value={this.children.queryName.getView()}
options={getQueryOptions(editorState)}
label={trans("eventHandler.selectQuery")}
onChange={(value) => this.dispatchChangeValueAction({ queryName: value })}
/>
</>
)}
</EditorContext.Consumer>
</BranchDiv>
<BranchDiv>
<EditorContext.Consumer>
{(editorState) => getVariableOptions(editorState)}
</EditorContext.Consumer>
</BranchDiv>
</>
);
<ExecuteQueryPropertyView
comp={this}
placement={placement}
/>
)
}
}
6 changes: 6 additions & 0 deletions client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,18 @@ const EventHandlerControlPropertyView = (props: {
if (eventConfigs.length === 0) {
return;
}

const queryVariables = editorState
?.selectedOrFirstQueryComp()
?.children.variables.children.variables.toJsonValue();

const queryExecHandler = {
compType: "executeQuery",
comp: {
queryName: editorState
?.selectedOrFirstQueryComp()
?.children.name.getView(),
queryVariables: queryVariables?.map((variable) => ({...variable, value: ''})),
},
};
const messageHandler = {
Expand Down