fix: allow null and blank values for application name and description fields

Author: liuruibin

apps/application/serializers/application.py

@@ -335,8 +335,8 @@ def to_application_model(user_id: str, workspace_id: str, application: Dict):
 
 class ApplicationQueryRequest(serializers.Serializer):
     folder_id = serializers.CharField(required=False, label=_("folder id"))
-    name = serializers.CharField(required=False, label=_('Application Name'))
-    desc = serializers.CharField(required=False, label=_("Application Description"))
+    name = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('Application Name'))
+    desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Application Description"))
     publish_status = serializers.ChoiceField(required=False, label=_("Publish status"),
                                              choices=[('published', _("Published")),
                                                       ('unpublished', _("Unpublished"))])
@@ -413,10 +413,11 @@ def list(self, instance: Dict):
         self.is_valid(raise_exception=True)
         workspace_id = self.data.get('workspace_id')
         user_id = self.data.get("user_id")
-        ApplicationQueryRequest(data=instance).is_valid(raise_exception=True)
+        req_dict = ApplicationQueryRequest(data=instance)
+        req_dict.is_valid(raise_exception=True)
         workspace_manage = is_workspace_manage(user_id, workspace_id)
         is_x_pack_ee = self.is_x_pack_ee()
-        return native_search(self.get_query_set(instance, workspace_manage, is_x_pack_ee),
+        return native_search(self.get_query_set(req_dict.data, workspace_manage, is_x_pack_ee),
                              select_string=get_file_content(
                                  os.path.join(PROJECT_DIR, "apps", "application", 'sql',
                                               'list_application.sql' if workspace_manage else (
@@ -425,13 +426,14 @@ def list(self, instance: Dict):
 
     def page(self, current_page: int, page_size: int, instance: Dict):
         self.is_valid(raise_exception=True)
-        ApplicationQueryRequest(data=instance).is_valid(raise_exception=True)
+        req_dict = ApplicationQueryRequest(data=instance)
+        req_dict.is_valid(raise_exception=True)
         workspace_id = self.data.get('workspace_id')
         user_id = self.data.get("user_id")
         workspace_manage = is_workspace_manage(user_id, workspace_id)
         is_x_pack_ee = self.is_x_pack_ee()
         result = native_page_search(current_page, page_size,
-                                    self.get_query_set(instance, workspace_manage, is_x_pack_ee),
+                                    self.get_query_set(req_dict.data, workspace_manage, is_x_pack_ee),
                                     get_file_content(
                                         os.path.join(PROJECT_DIR, "apps", "application", 'sql',
                                                      'list_application.sql' if workspace_manage else (

ui/src/components/folder-tree/index.vue

@@ -178,6 +178,7 @@ import { TreeToFlatten } from '@/utils/array'
 import { MsgConfirm, MsgError, MsgSuccess } from '@/utils/message'
 import permissionMap from '@/permission'
 import bus from '@/bus'
+import { v } from "vue-router/dist/router-CWoNjPRp";
 const { folder, user } = useStore()
 
 defineOptions({ name: 'FolderTree' })
@@ -621,7 +622,11 @@ const title = ref('')
 const loading = ref(false)
 
 watch(filterText, (val) => {
-  treeRef.value!.filter(val)
+  let v = val
+  if (val) {
+    v = val.trim()
+  }
+  treeRef.value!.filter(v)
 })
 const filterNode = (value: string, data: Tree) => {
   if (!value) return true