Merge pull request #218 from lvhuichao/develop

1. fix: fix GUI update command execution failure in view mode     2. feat: move RestApiUriBuilder from restApiPlugin module to openblocks-sdk module and reuse it in graphqlPlugin module     3. fix: remove empty variables and url params from query for graphql

Author: neon-balcony

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberServiceImpl.java

@@ -93,5 +93,4 @@ public Mono<List<String>> getNonDynamicUserGroupIdsInOrg(String orgId, String us
                 .collectList();
     }
 
-
 }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/service/InvitationService.java

@@ -7,7 +7,6 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import com.openblocks.domain.bizthreshold.AbstractBizThresholdChecker;
 import com.openblocks.domain.invitation.model.Invitation;
 import com.openblocks.domain.invitation.repository.InvitationRepository;
 import com.openblocks.domain.organization.model.MemberRole;
@@ -25,9 +24,6 @@ public class InvitationService {
     @Autowired
     private OrgMemberService orgMemberService;
 
-    @Autowired
-    private AbstractBizThresholdChecker bizThresholdChecker;
-
     @Autowired
     private InvitationRepository repository;
 
@@ -40,9 +36,7 @@ public Mono<Invitation> getById(@Nonnull String invitationId) {
     }
 
     public Mono<Boolean> inviteToOrg(String userId, String orgId) {
-        return bizThresholdChecker.checkMaxOrgCount(userId)
-                .then(bizThresholdChecker.checkMaxOrgMemberCount(orgId))
-                .then(orgMemberService.addMember(orgId, userId, MemberRole.MEMBER));
+        return orgMemberService.addMember(orgId, userId, MemberRole.MEMBER);
     }
 
 }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/MemberRole.java

@@ -30,4 +30,8 @@ public static MemberRole fromValue(String str) {
         return VALUE_MAP.getOrDefault(str, MEMBER);
     }
 
+    public static boolean isAdmin(String str) {
+        return ADMIN == fromValue(str);
+    }
+
 }

server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/EventType.java

@@ -43,6 +43,12 @@ public enum EventType {
     DATA_SOURCE_PERMISSION_GRANT("DATA_SOURCE_PERMISSION_GRANT"),
     DATA_SOURCE_PERMISSION_UPDATE("DATA_SOURCE_PERMISSION_UPDATE"),
     DATA_SOURCE_PERMISSION_DELETE("DATA_SOURCE_PERMISSION_DELETE"),
+
+    // library query
+    LIBRARY_QUERY_CREATE("LIBRARY_QUERY_CREATE"),
+    LIBRARY_QUERY_UPDATE("LIBRARY_QUERY_UPDATE"),
+    LIBRARY_QUERY_DELETE("LIBRARY_QUERY_DELETE"),
+    LIBRARY_QUERY_PUBLISH("LIBRARY_QUERY_PUBLISH"),
     ;
 
     private final String desc;

server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/LibraryQueryEvent.java

@@ -0,0 +1,18 @@
+package com.openblocks.infra.event;
+
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+@Getter
+@SuperBuilder
+public class LibraryQueryEvent extends AbstractEvent {
+
+    private String id;
+    private String name;
+    private EventType eventType;
+
+    @Override
+    public EventType getEventType() {
+        return eventType;
+    }
+}

server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java

@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -53,7 +53,6 @@
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.util.UriComponentsBuilder;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -68,6 +67,7 @@
 import com.openblocks.sdk.models.QueryExecutionResult;
 import com.openblocks.sdk.plugin.common.QueryExecutionUtils;
 import com.openblocks.sdk.plugin.common.QueryExecutor;
+import com.openblocks.sdk.plugin.common.RestApiUriBuilder;
 import com.openblocks.sdk.plugin.graphql.GraphQLDatasourceConfig;
 import com.openblocks.sdk.plugin.restapi.DataUtils;
 import com.openblocks.sdk.plugin.restapi.auth.AuthConfig;
@@ -140,8 +140,13 @@ public GraphQLQueryExecutionContext buildQueryExecutionContext(GraphQLDatasource
         List<Property> updatedQueryHeaders = renderMustacheValueInProperties(queryHeaders, requestParams);
         List<Property> updatedQueryBodyParams = renderMustacheValueInProperties(queryBodyParams, requestParams);
         var updatedVariables = JsonUtils.createObjectNode();
-        queryConfig.getVariables().forEach(property -> updatedVariables.set(property.getKey(),
-                MustacheHelper.renderMustacheJson(property.getValue(), requestParams)));
+        queryConfig.getVariables().forEach(property -> {
+            if (StringUtils.isAllBlank(property.getKey(), property.getValue())) {
+                return;
+            }
+            updatedVariables.set(property.getKey(),
+                    MustacheHelper.renderMustacheJson(property.getValue(), requestParams));
+        });
         String updatedQueryBody = renderMustacheString(queryBody, requestParams);
         String normalizedUrl = buildUrl(urlDomain, updatedQueryPath, requestParams);
         Map<String, String> allHeaders = buildHeaders(datasourceHeaders, updatedQueryHeaders);
@@ -239,13 +244,7 @@ private List<Property> buildBodyParams(List<Property> datasourceBodyFormData, Li
     @Override
     public Mono<QueryExecutionResult> executeQuery(Object o, GraphQLQueryExecutionContext context) {
         return Mono.defer(() -> {
-            URI uri;
-            try {
-                uri = buildUri(context.getUrl(), context.getUrlParams(), context.isEncodeParams());
-            } catch (URISyntaxException e) {
-                return Mono.just(QueryExecutionResult.error(QUERY_ARGUMENT_ERROR, "QUERY_ARGUMENT_ERROR", e));
-            }
-
+            URI uri = RestApiUriBuilder.buildUri(context.getUrl(), new HashMap<>(), context.getUrlParams());
             WebClient.Builder webClientBuilder = withSafeHost(builder());
 
             Map<String, String> allHeaders = context.getHeaders();
@@ -291,24 +290,6 @@ public Mono<QueryExecutionResult> executeQuery(Object o, GraphQLQueryExecutionCo
         });
     }
 
-    private URI buildUri(String url, Map<String, String> urlParams, boolean encodeParams) throws URISyntaxException {
-        String httpUrl = addHttpToUrlWhenPrefixNotPresent(url);
-        httpUrl = httpUrl.replaceAll("(?<!http:|https:)/{2,}", "/"); // remove redundant "/"
-        UriComponentsBuilder uriBuilder = UriComponentsBuilder.newInstance();
-        uriBuilder.uri(new URI(httpUrl));
-
-        urlParams.forEach((key, value) -> {
-            if (encodeParams) {
-                uriBuilder.queryParam(URLEncoder.encode(key, StandardCharsets.UTF_8),
-                        URLEncoder.encode(value, StandardCharsets.UTF_8)
-                );
-            } else {
-                uriBuilder.queryParam(key, value);
-            }
-        });
-        return uriBuilder.build(true).toUri();
-    }
-
     private Consumer<MultiValueMap<String, String>> injectCookies(GraphQLQueryExecutionContext request) {
         return currentCookies -> {
             Set<String> forwardCookies = request.getForwardCookies();

server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/utils/GraphQLBodyUtils.java

@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.openblocks.plugin.graphql.model.GraphQLQueryExecutionContext;
 import com.openblocks.sdk.util.JsonUtils;
 
@@ -15,7 +16,11 @@ public class GraphQLBodyUtils {
     public static String convertToGraphQLBody(GraphQLQueryExecutionContext graphQLQueryExecutionContext) {
         Map<String, Object> map = new HashMap<>();
         map.put(QUERY_KEY, graphQLQueryExecutionContext.getQueryBody());
-        map.put(VARIABLES_KEY, graphQLQueryExecutionContext.getVariablesParams());
+        // variables
+        JsonNode variablesParams = graphQLQueryExecutionContext.getVariablesParams();
+        if (!variablesParams.isEmpty()) {
+            map.put(VARIABLES_KEY, graphQLQueryExecutionContext.getVariablesParams());
+        }
         return JsonUtils.toJson(map);
     }
 }

server/api-service/openblocks-plugins/restApiPlugin/pom.xml

@@ -70,10 +70,7 @@
             <version>1.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
+
 
         <!--        &lt;!&ndash; https://mvnrepository.com/artifact/io.github.vzhn/netty-http-authenticator &ndash;&gt;-->
         <!--        <dependency>-->

server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiExecutor.java

@@ -85,14 +85,14 @@
 import com.openblocks.plugin.restapi.constants.ResponseDataType;
 import com.openblocks.plugin.restapi.helpers.AuthHelper;
 import com.openblocks.plugin.restapi.helpers.BufferingFilter;
-import com.openblocks.plugin.restapi.helpers.RestApiUriBuilder;
 import com.openblocks.plugin.restapi.model.RestApiQueryConfig;
 import com.openblocks.plugin.restapi.model.RestApiQueryExecutionContext;
 import com.openblocks.sdk.exception.PluginException;
 import com.openblocks.sdk.models.Property;
 import com.openblocks.sdk.models.QueryExecutionResult;
 import com.openblocks.sdk.models.RestBodyFormFileData;
 import com.openblocks.sdk.plugin.common.QueryExecutor;
+import com.openblocks.sdk.plugin.common.RestApiUriBuilder;
 import com.openblocks.sdk.plugin.restapi.DataUtils;
 import com.openblocks.sdk.plugin.restapi.MultipartFormData;
 import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig;

server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiEngineTest.java

@@ -19,10 +19,10 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.google.common.collect.ImmutableMap;
-import com.openblocks.plugin.restapi.helpers.RestApiUriBuilder;
 import com.openblocks.plugin.restapi.model.RestApiQueryExecutionContext;
 import com.openblocks.sdk.models.Property;
 import com.openblocks.sdk.models.QueryExecutionResult;
+import com.openblocks.sdk.plugin.common.RestApiUriBuilder;
 import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig;
 import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig;
 import com.openblocks.sdk.query.QueryExecutionContext;