Updating Query Library Function

Author: FalkWolsky

client/packages/lowcoder/src/comps/queries/libraryQuery.tsx

@@ -10,6 +10,7 @@ import {
   isMyCustomAction,
   MultiBaseComp,
   wrapChildAction,
+  evalFunc,
 } from "lowcoder-core";
 import {
   Dropdown,
@@ -34,6 +35,9 @@ import {
   ToInstanceType,
 } from "../generators/multi";
 import { toQueryView } from "./queryCompUtils";
+import { getGlobalSettings } from "comps/utils/globalSettings";
+import { QUERY_EXECUTION_ERROR, QUERY_EXECUTION_OK } from "../../constants/queryConstants";
+import type { SandBoxOption } from "lowcoder-core/src/eval/utils/evalScript";
 
 const NoInputsWrapper = styled.div`
   color: ${GreyTextColor};
@@ -133,13 +137,60 @@ export const LibraryQuery = class extends LibraryQueryBase {
   readonly isReady: boolean = false;
 
   private value: DataType | undefined;
+  private queryInfo: any = null;
 
   constructor(params: CompParams<DataType>) {
     super(params);
     this.value = params.value;
   }
 
   override getView() {
+    // Check if this is a JS query
+    if (this.queryInfo?.query?.compType === "js") {
+      return async (props: any) => {
+        try {
+          const { orgCommonSettings } = getGlobalSettings();
+          const runInHost = !!orgCommonSettings?.runJavaScriptInHost;
+          const timer = performance.now();
+          const script = this.queryInfo.query.comp.script || "";
+          const options: SandBoxOption = { disableLimit: runInHost };
+
+          // Get input values from the inputs component
+          const inputValues = Object.entries(this.children.inputs.children).reduce((acc, [name, input]) => {
+            // Get the actual value from the input component's text property
+            const value = input.children.text.getView();
+            acc[name] = value;
+            return acc;
+          }, {} as Record<string, any>);
+
+          // Combine props.args with input values
+          const context = {
+            ...props.args,
+            ...inputValues,
+          };
+
+          console.log("script: " + script);
+          console.log("context: ", context);
+
+          // Pass script directly to evalFunc without wrapping
+          const data = await evalFunc(script, context, undefined, options);
+          return {
+            data: data,
+            code: QUERY_EXECUTION_OK,
+            success: true,
+            runTime: Number((performance.now() - timer).toFixed()),
+          };
+        } catch (e) {
+          return {
+            success: false,
+            data: "",
+            code: QUERY_EXECUTION_ERROR,
+            message: (e as any).message || "",
+          };
+        }
+      };
+    }
+
     return toQueryView(
       Object.entries(this.children.inputs.children).map(([name, input]) => ({
         key: name,
@@ -161,6 +212,7 @@ export const LibraryQuery = class extends LibraryQueryBase {
 
   override reduce(action: CompAction): this {
     if (isMyCustomAction<QueryLibraryUpdateAction>(action, "queryLibraryUpdate")) {
+      this.queryInfo = action.value?.dsl;
       const inputs = this.children.inputs.setInputs(action.value?.dsl?.["inputs"] ?? []);
       return setFieldsNoTypeCheck(this, {
         children: { ...this.children, inputs: inputs },

client/packages/lowcoder/src/comps/queries/queryComp.tsx

@@ -487,7 +487,7 @@ QueryCompTmp = class extends QueryCompTmp {
           args: action.args,
           variables: action.args,
           timeout: this.children.timeout,
-          callback: (result) => this.processResult(result, action, startTime)
+          callback: (result: QueryResult) => this.processResult(result, action, startTime)
         });
       }, getTriggerType(this) === "manual")
       .then(

client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx

@@ -7,6 +7,9 @@ import { Fragment } from "react";
 import { ParamsControlType, ValueFunction } from "../controls/paramsControl";
 import { getGlobalSettings } from "comps/utils/globalSettings";
 import { ResourceType } from "@lowcoder-ee/constants/queryConstants";
+import { evalFunc } from "lowcoder-core";
+import { QUERY_EXECUTION_ERROR, QUERY_EXECUTION_OK } from "../../constants/queryConstants";
+import type { SandBoxOption } from "lowcoder-core/src/eval/utils/evalScript";
 
 export type FunctionProperty = {
   key: string;
@@ -30,6 +33,32 @@ export function toQueryView(params: FunctionProperty[]) {
   }): Promise<QueryResult> => {
     const { applicationId, isViewMode } = getGlobalSettings();
 
+    // Check if this is a JS query
+    const isJsQuery = props.queryId?.startsWith("js:");
+    if (isJsQuery) {
+      try {
+        const { orgCommonSettings } = getGlobalSettings();
+        const runInHost = !!orgCommonSettings?.runJavaScriptInHost;
+        const timer = performance.now();
+        const script = props.args?.script || "";
+        const options: SandBoxOption = { disableLimit: runInHost };
+        const data = await evalFunc(`return (${script}\n);`, props.args || {}, undefined, options);
+        return {
+          data: data,
+          code: QUERY_EXECUTION_OK,
+          success: true,
+          runTime: Number((performance.now() - timer).toFixed()),
+        };
+      } catch (e) {
+        return {
+          success: false,
+          data: "",
+          code: QUERY_EXECUTION_ERROR,
+          message: (e as any).message || "",
+        };
+      }
+    }
+
     let mappedVariables: Array<{key: string, value: string}> = [];
     Object.keys(props.variables)
       .filter(k => k !== "$queryName")

client/packages/lowcoder/src/util/context/SimpleSubscriptionContext.tsx

@@ -96,7 +96,7 @@ export const SimpleSubscriptionContextProvider = (props: {
     };
 
     if (!productsLoaded && !subscriptionProductsLoading && !user.isAnonymous) {
-      console.log("Outer context: Fetching products...");
+      // console.log("Outer context: Fetching products...");
       setSubscriptionProductsLoading(true);
       fetchProducts();
     }