Skip to content

[FEAT]: #1488 Add JS Query in the Query Library #1648

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

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

[FEAT]: #1488 Add JS Query in the Query Library #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e192087
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Mar 21, 2025
3c2256e
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Mar 25, 2025
d2f618f
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Mar 25, 2025
233c56a
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Apr 21, 2025
df23d09
[FEAT]: #1488 Add JS Query in Query Library
iamfaran Apr 22, 2025
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
13 changes: 13 additions & 0 deletions client/packages/lowcoder/src/components/ResCreatePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { getUser } from "../redux/selectors/usersSelectors";
import DataSourceIcon from "./DataSourceIcon";
import { genRandomKey } from "comps/utils/idGenerator";
import { isPublicApplication } from "@lowcoder-ee/redux/selectors/applicationSelector";
import { JS_CODE_ID } from "constants/datasourceConstants";

const Wrapper = styled.div<{ $placement: PageType }>`
width: 100%;
Expand Down Expand Up @@ -145,6 +146,7 @@ const ResButton = (props: {
type: BottomResTypeEnum.Query,
extra: {
compType: "js",
dataSourceId: JS_CODE_ID,
},
},
libraryQuery: {
Expand Down Expand Up @@ -320,6 +322,17 @@ export function ResCreatePanel(props: ResCreateModalProps) {
</div>
</>
)}

{placement === "queryLibrary" && (
<>
<div className="section-title">{trans("code")}</div>
<div className="section">
<DataSourceListWrapper $placement={placement}>
<ResButton size={buttonSize} identifier={"js"} onSelect={onSelect} />
</DataSourceListWrapper>
</div>
</>
)}

<div className="section-title">{trans("query.datasource")}</div>
<div className="section">
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { isCompWithPropertyView } from "comps/utils/propertyUtils";
import {
QUICK_GRAPHQL_ID,
QUICK_REST_API_ID,
JS_CODE_ID
} from "constants/datasourceConstants";
import { PageType } from "constants/pageConstants";
import { trans } from "i18n";
Expand Down Expand Up @@ -795,7 +796,8 @@ function useDatasourceStatus(datasourceId: string, datasourceType: ResourceType)
datasourceType === "libraryQuery" ||
datasourceType === "alasql" ||
datasourceId === QUICK_REST_API_ID ||
datasourceId === QUICK_GRAPHQL_ID
datasourceId === QUICK_GRAPHQL_ID ||
datasourceId === JS_CODE_ID
) {
return "";
}
Expand Down
32 changes: 17 additions & 15 deletions client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { DatasourceType, ResourceType } from "@lowcoder-ee/constants/queryConsta
import {
QUICK_GRAPHQL_ID,
QUICK_REST_API_ID,
JS_CODE_ID
} from "constants/datasourceConstants";
import {
apiPluginsForQueryLibrary,
Expand Down Expand Up @@ -78,7 +79,7 @@ interface ResourceOptionValue {
}

const JSOptionValue: ResourceOptionValue = {
id: "",
id: JS_CODE_ID,
type: "js",
};

Expand Down Expand Up @@ -156,6 +157,7 @@ export const ResourceDropdown = (props: ResourceDropdownProps) => {
const optionValue: ResourceOptionValue = JSON.parse(value);
const datasourceId = optionValue.id;
const datasourceType = optionValue.type;

if (!datasourceType) {
messageInstance.error("datasource invalid");
return;
Expand Down Expand Up @@ -293,19 +295,20 @@ export const ResourceDropdown = (props: ResourceDropdownProps) => {
</SelectOptionContains>
</SelectOption>

{context?.placement !== "queryLibrary" && (
<>
<SelectOption
key={JSON.stringify(JSOptionValue)}
label={trans("query.executeJSCode")}
value={JSON.stringify(JSOptionValue)}
>
<SelectOptionContains>
{getBottomResIcon("js")}
<SelectOptionLabel>{trans("query.executeJSCode")} </SelectOptionLabel>
</SelectOptionContains>
</SelectOption>
{/* Always show JS option regardless of placement */}
<SelectOption
key={JSON.stringify(JSOptionValue)}
label={trans("query.executeJSCode")}
value={JSON.stringify(JSOptionValue)}
>
<SelectOptionContains>
{getBottomResIcon("js")}
<SelectOptionLabel>{trans("query.executeJSCode")} </SelectOptionLabel>
</SelectOptionContains>
</SelectOption>

{/* Only show Library Query option when not in Query Library */}
{context?.placement !== "queryLibrary" && (
<SelectOption
key={JSON.stringify(LibraryQueryOptionValue)}
label={trans("query.importFromQueryLibrary")}
Expand All @@ -316,8 +319,7 @@ export const ResourceDropdown = (props: ResourceDropdownProps) => {
<SelectOptionLabel>{trans("query.importFromQueryLibrary")} </SelectOptionLabel>
</SelectOptionContains>
</SelectOption>
</>
)}
)}
</CustomSelect>
</SelectWrapper>
);
Expand Down
1 change: 1 addition & 0 deletions client/packages/lowcoder/src/constants/datasourceConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ export interface Datasource {

export const QUICK_REST_API_ID = "#QUICK_REST_API";
export const QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL";
export const JS_CODE_ID = "#JS_CODE";
export const OLD_LOWCODER_DATASOURCE: Partial<DatasourceType>[] = [];
Loading