Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev

Author: iamfaran

client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx

@@ -56,6 +56,9 @@ const ExecuteQueryPropertyView = ({
   }, [placement]);
 
   const getVariableOptions = useCallback((editorState?: EditorState) => {
+    const queryVariables = comp.children.queryVariables.getView();
+    if (!queryVariables.length) return null;
+
     return comp.children.queryVariables.propertyView({
       label: trans("eventHandler.queryVariables"),
       layout: "vertical",

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

@@ -259,7 +259,11 @@ QueryCompTmp = class extends QueryCompTmp {
         || isInputChangeTrigger
         || (isPageLoadTrigger && notExecuted)
       )
-      // && (!isJsQuery || (isJsQuery && notExecuted)) // query which has deps can be executed on page load(first time)
+      && (
+        !isJsQuery
+        || (isJsQuery && !isAutomatic)
+        || (isJsQuery && isAutomatic && notExecuted)
+      ) // query which has deps can be executed on page load(first time)
     ) {
       const next = super.reduce(action);
       const depends = this.children.comp.node()?.dependValues();

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java

@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.SetUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
 import org.lowcoder.api.application.view.ApplicationInfoView;
@@ -101,7 +102,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
     public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
 
         Application application = new Application(createApplicationRequest.organizationId(),
-                UuidCreator.getTimeOrderedEpoch().toString(),
+                ObjectUtils.defaultIfNull(createApplicationRequest.gid(), UuidCreator.getTimeOrderedEpoch().toString()),
                 createApplicationRequest.name(),
                 createApplicationRequest.applicationType(),
                 NORMAL,

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java

@@ -298,6 +298,7 @@ public record UpdatePermissionRequest(String role) {
     }
 
     public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
+										   @Nullable String gid,
                                            String name,
                                            Integer applicationType,
                                            Map<String, Object> editingApplicationDSL,

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java

@@ -34,6 +34,7 @@ public Datasource resolve(UpsertDatasourceRequest dto) {
 
         Datasource datasource = new Datasource();
         datasource.setId(dto.getId());
+        datasource.setGid(dto.getGid());
         datasource.setName(dto.getName());
         datasource.setType(dto.getType());
         datasource.setOrganizationId(dto.getOrganizationId());

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java

@@ -70,7 +70,7 @@ public void testCreateApplicationSuccess() {
         });
         //
         Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
-                        "org01",
+                        "org01", null,
                         "app05",
                         ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
@@ -104,7 +104,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
         });
         //
         Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
-                        "org01",
+                        "org01", null,
                         "app03",
                         ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
@@ -129,7 +129,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
     @Test
     @WithMockUser
     public void testUpdateEditingStateSuccess() {
-        Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
+        Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
         Mono<ApplicationView> updateEditStateMono = applicationViewMono.delayUntil(app -> applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(), new ApplicationEndpoints.UpdateEditStateRequest(true)));
         Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
         StepVerifier.create(app)

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java

@@ -130,7 +130,7 @@ public void testDeleteNormalApplicationWithError() {
 
     private Mono<ApplicationView> createApplication(String name, String folderId) {
         CreateApplicationRequest createApplicationRequest =
-                new CreateApplicationRequest("org01", name, ApplicationType.APPLICATION.getValue(),
+                new CreateApplicationRequest("org01", null, name, ApplicationType.APPLICATION.getValue(),
                         Map.of("comp", "list"), folderId);
         return applicationApiService.create(createApplicationRequest);
     }