[type:fix] filter disable dict option (apache#5776)

moremind · Nov 12, 2024 · 552968d · 552968d
1 parent 31473eb
commit 552968d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
@@ -187,7 +187,11 @@ public void onPluginDeleted(final BatchPluginDeletedEvent event) {
     private PluginHandleVO buildPluginHandleVO(final PluginHandleDO pluginHandleDO) {
         List<ShenyuDictVO> dictOptions = null;
         if (pluginHandleDO.getDataType() == SELECT_BOX_DATA_TYPE) {
-            dictOptions = ListUtil.map(shenyuDictMapper.findByType(pluginHandleDO.getField()), ShenyuDictVO::buildShenyuDictVO);
+            dictOptions = shenyuDictMapper.findByType(pluginHandleDO.getField())
+                    .stream()
+                    .filter(item -> Objects.equals(item.getEnabled(), Boolean.TRUE))
+                    .map(ShenyuDictVO::buildShenyuDictVO)
+                    .toList();
         }
         return PluginHandleVO.buildPluginHandleVO(pluginHandleDO, dictOptions);
     }
@@ -204,6 +208,7 @@ private List<PluginHandleVO> buildPluginHandleVO(final List<PluginHandleDO> plug
                 ? Optional.ofNullable(shenyuDictMapper.findByTypeBatch(fieldList))
                 .orElseGet(ArrayList::new)
                 .stream()
+                .filter(item -> Objects.equals(item.getEnabled(), Boolean.TRUE))
                 .map(ShenyuDictVO::buildShenyuDictVO)
                 .collect(Collectors.groupingBy(ShenyuDictVO::getType))
                 : new HashMap<>(0);

diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java
@@ -187,7 +187,18 @@ private List<ShenyuDictDO> buildShenyuDictDOs() {
                 .dateCreated(now)
                 .dateUpdated(now)
                 .build();
-        return Collections.singletonList(result);
+        final ShenyuDictDO disableDict = ShenyuDictDO.builder()
+                .type("burstCapacity")
+                .dictCode("RATE_LIMITER_QPS")
+                .dictName("disable")
+                .dictValue("disable")
+                .desc("disable")
+                .enabled(false)
+                .sort(1)
+                .dateCreated(now)
+                .dateUpdated(now)
+                .build();
+        return List.of(result, disableDict);
     }
 
     @Test