Merge branch 'develop' into github_develop

Author: lvhuichao

server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/DslConstants.java

@@ -10,5 +10,6 @@ public static class CompoundAppDslConstants {
         public static final String HIDE_WHEN_NO_PERMISSION = "hideWhenNoPermission";
         public static final String APP = "app";
         public static final String APP_ID = "appId";
+        public static final String ACTION = "action";
     }
 }

server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/CompoundApplicationDslFilter.java

@@ -1,13 +1,19 @@
 package com.openblocks.api.application;
 
 import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS;
+import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.ACTION;
+import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.APP;
+import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.APP_ID;
+import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.COMP;
+import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.HIDE_WHEN_NO_PERMISSION;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -19,9 +25,9 @@
 
 import com.google.common.collect.Sets;
 import com.openblocks.api.home.SessionUserService;
-import com.openblocks.sdk.util.MoreMapUtils;
 import com.openblocks.domain.permission.service.ResourcePermissionService;
 import com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants;
+import com.openblocks.sdk.util.MoreMapUtils;
 
 import reactor.core.publisher.Mono;
 
@@ -50,7 +56,6 @@ public Mono<Void> removeSubAppsFromCompoundDsl(Map<String, Object> dsl) {
                 .then();
     }
 
-    @SuppressWarnings("unchecked")
     private void removeSubAppsFromCompoundDsl(Map<String, Object> dsl, Set<String> appIdsNeedRemoved) {
 
         List<Map<String, Object>> items = MoreMapUtils.getList(dsl, CompoundAppDslConstants.ITEMS, new ArrayList<>());
@@ -59,13 +64,11 @@ private void removeSubAppsFromCompoundDsl(Map<String, Object> dsl, Set<String> a
             Map<String, Object> item = iterator.next();
             // for leaf node which has empty items.
             if (isLeaf(item)) {
-                boolean hideWhenNoPermission = MapUtils.getBoolean(item, CompoundAppDslConstants.HIDE_WHEN_NO_PERMISSION, true);
-                if (!hideWhenNoPermission) {
+                if (!hideWhenNoPermission(item)) {
                     continue;
                 }
 
-                Map<String, Object> app = (Map<String, Object>) MapUtils.getMap(item, CompoundAppDslConstants.APP, new HashMap<>());
-                String appId = MapUtils.getString(app, CompoundAppDslConstants.APP_ID);
+                String appId = getAppId(item);
                 if (StringUtils.isNotBlank(appId) && appIdsNeedRemoved.contains(appId)) {
                     iterator.remove();
                     continue;
@@ -92,15 +95,13 @@ private boolean isLeaf(Map<String, Object> item) {
     /**
      * Recursively find all sub-application ids from the DSL of the compound application.
      */
-    @SuppressWarnings("unchecked")
     public Set<String> getAllSubAppIdsFromCompoundAppDsl(Map<String, Object> dsl) {
         List<Map<String, Object>> items = MoreMapUtils.getList(dsl, CompoundAppDslConstants.ITEMS, new ArrayList<>());
         return items.stream()
                 .map(item -> {
                     // If the item is a leaf node, find its id and return it.
                     if (isLeaf(item)) {
-                        Map<String, Object> app = (Map<String, Object>) MapUtils.getMap(item, CompoundAppDslConstants.APP, new HashMap<>());
-                        String appId = MapUtils.getString(app, CompoundAppDslConstants.APP_ID);
+                        String appId = getAppId(item);
                         if (StringUtils.isBlank(appId)) {
                             return Collections.<String> emptySet();
                         }
@@ -112,4 +113,23 @@ public Set<String> getAllSubAppIdsFromCompoundAppDsl(Map<String, Object> dsl) {
                 .flatMap(Set::stream)
                 .collect(Collectors.toSet());
     }
+
+    @SuppressWarnings("unchecked")
+    private String getAppId(Map<String, Object> item) {
+        return Optional.ofNullable((Map<String, Object>) MapUtils.getMap(item, ACTION))
+                .map(action -> (Map<String, Object>) MapUtils.getMap(action, COMP))
+                .or(() -> Optional.of(item)) // compatible code
+                .map(i -> (Map<String, Object>) MapUtils.getMap(i, APP))
+                .map(app -> MapUtils.getString(app, APP_ID))
+                .orElse(null);
+    }
+
+    @SuppressWarnings("unchecked")
+    private boolean hideWhenNoPermission(Map<String, Object> item) {
+        return Optional.ofNullable((Map<String, Object>) MapUtils.getMap(item, ACTION))
+                .map(action -> (Map<String, Object>) MapUtils.getMap(action, COMP))
+                .or(() -> Optional.of(item)) // compatible code
+                .map(i -> MapUtils.getBoolean(i, HIDE_WHEN_NO_PERMISSION))
+                .orElse(true);
+    }
 }

server/api-service/openblocks-server/src/main/java/com/openblocks/api/misc/JsLibraryController.java

@@ -11,6 +11,8 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -24,12 +26,14 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.openblocks.api.framework.view.ResponseView;
 import com.openblocks.infra.constant.NewUrl;
 import com.openblocks.infra.localcache.ReloadableCache;
+import com.openblocks.sdk.util.JsonUtils;
 import com.openblocks.sdk.webclient.WebClientBuildHelper;
 
 import lombok.Builder;
@@ -63,19 +67,25 @@ public Mono<JsLibraryMeta> load(@NotNull String key) {
             .build();
 
     static {
-        try (InputStream is = JsLibraryController.class.getClassLoader().getResourceAsStream("recommendedJsLibraries")) {
+        try (InputStream is = JsLibraryController.class.getClassLoader().getResourceAsStream("recommendedJsLibraries.json")) {
             if (is != null) {
-                List<String> names = IOUtils.readLines(is, Charset.defaultCharset());
-                log.info("find recommended js library names: {}", names);
-                for (String libName : names) {
+                String content = IOUtils.toString(is, Charset.defaultCharset());
+                List<Map<String, Object>> recommendedJsLibraries = JsonUtils.fromJsonSafely(content, new TypeReference<>() {
+                }, Collections.emptyList());
+                Map<String, Map<String, Object>> recommendedJsLibraryMap = recommendedJsLibraries.stream()
+                        .collect(Collectors.toMap(map -> MapUtils.getString(map, "name"), Function.identity()));
+
+                log.info("find recommended js library names: {}", recommendedJsLibraryMap.keySet());
+                for (String libName : recommendedJsLibraryMap.keySet()) {
                     ReloadableCache<JsLibraryMeta> reloadableCache = ReloadableCache.<JsLibraryMeta> newBuilder()
                             .setName(libName)
                             .setInterval(Duration.ofDays(1))
-                            .setFactory(() -> {
-                                Mono<JsLibraryMeta> fetch = fetch(libName);
-                                log.info("reloaded recommended js library: {}", libName);
-                                return fetch;
-                            })
+                            .setFactory(() -> fetch(libName)
+                                    .doOnNext(jsLibraryMeta -> {
+                                        Map<String, Object> map = recommendedJsLibraryMap.get(libName);
+                                        jsLibraryMeta.setDownloadUrl(MapUtils.getString(map, "downloadUrl"));
+                                    })
+                                    .doOnNext(jsLibraryMeta -> log.info("reloaded recommended js library: {}", JsonUtils.toJson(jsLibraryMeta))))
                             .build();
                     RECOMMENDED_JS_LIB_META_CACHE.put(libName, reloadableCache);
                 }
@@ -154,5 +164,6 @@ public static class JsLibraryMeta {
         private String latestVersion;
         private String homepage;
         private String description;
+        private String downloadUrl;
     }
 }

server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries

@@ -0,0 +1,18 @@
+[
+  {
+    "name": "jspdf",
+    "downloadUrl": "https://unpkg.com/jspdf/dist/jspdf.umd.min.js"
+  },
+  {
+    "name": "jmespath",
+    "downloadUrl": "https://unpkg.com/jmespath/jmespath.js"
+  },
+  {
+    "name": "jsonpath",
+    "downloadUrl": "https://unpkg.com/jsonpath/jsonpath.js"
+  },
+  {
+    "name": "i18next",
+    "downloadUrl": "https://unpkg.com/i18next/dist/umd/i18next.min.js"
+  }
+]