feat: compatible for compound application

lvhuichao · lvhuichao · commit 04295541cd2c · 2023-03-21T11:00:07.000+08:00
diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/DslConstants.java b/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";
     }
 }
diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/CompoundApplicationDslFilter.java b/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);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ public static class CompoundAppDslConstants {`
`10`	`10`	`public static final String HIDE_WHEN_NO_PERMISSION = "hideWhenNoPermission";`
`11`	`11`	`public static final String APP = "app";`
`12`	`12`	`public static final String APP_ID = "appId";`
	`13`	`+ public static final String ACTION = "action";`
`13`	`14`	`}`
`14`	`15`	`}`