This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 54f831aad5 [INLONG-10226][Dashboard] Fix audit item search failure
(#10227)
54f831aad5 is described below
commit 54f831aad5fd70621e0a7258ec6c9c41b0926d9d
Author: haifxu <[email protected]>
AuthorDate: Thu May 16 11:04:13 2024 +0800
[INLONG-10226][Dashboard] Fix audit item search failure (#10227)
---
.../src/ui/pages/GroupDetail/Audit/config.tsx | 8 ++++----
.../src/ui/pages/ModuleAudit/IdModule/config.tsx | 16 ++++++++--------
.../src/ui/pages/ModuleAudit/IpModule/config.tsx | 16 ++++++++--------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx
b/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx
index ed39f678eb..39cd234f9a 100644
--- a/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx
+++ b/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx
@@ -218,10 +218,9 @@ export const getFormContent = (inlongGroupId,
initialValues, onSearch, onDataStr
dropdownMatchSelectWidth: false,
options: {
requestAuto: true,
- requestTrigger: ['onOpen', 'onSearch'],
- requestService: async keyword => {
- const res = await request('/audit/getAuditBases');
- return keyword === undefined ? res : res.filter(audit =>
audit.name.includes(keyword));
+ requestTrigger: ['onOpen'],
+ requestService: () => {
+ return request('/audit/getAuditBases');
},
requestParams: {
formatResult: result =>
@@ -231,6 +230,7 @@ export const getFormContent = (inlongGroupId,
initialValues, onSearch, onDataStr
})) || [],
},
},
+ filterOption: (keyword, option) => option.label.includes(keyword),
},
},
{
diff --git a/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx
b/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx
index a9f2a8109c..d9dec6fefe 100644
--- a/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx
+++ b/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx
@@ -140,10 +140,9 @@ export const getFormContent = (initialValues, onSearch) =>
[
dropdownMatchSelectWidth: false,
options: {
requestAuto: true,
- requestTrigger: ['onOpen', 'onSearch'],
- requestService: async keyword => {
- const res = await request('/audit/getAuditBases');
- return keyword === undefined ? res : res.filter(audit =>
audit.name.includes(keyword));
+ requestTrigger: ['onOpen'],
+ requestService: () => {
+ return request('/audit/getAuditBases');
},
requestParams: {
formatResult: result =>
@@ -153,6 +152,7 @@ export const getFormContent = (initialValues, onSearch) => [
})) || [],
},
},
+ filterOption: (keyword, option) => option.label.includes(keyword),
},
},
{
@@ -165,10 +165,9 @@ export const getFormContent = (initialValues, onSearch) =>
[
dropdownMatchSelectWidth: false,
options: {
requestAuto: true,
- requestTrigger: ['onOpen', 'onSearch'],
- requestService: async keyword => {
- const res = await request('/audit/getAuditBases');
- return keyword === undefined ? res : res.filter(audit =>
audit.name.includes(keyword));
+ requestTrigger: ['onOpen'],
+ requestService: () => {
+ return request('/audit/getAuditBases');
},
requestParams: {
formatResult: result =>
@@ -178,6 +177,7 @@ export const getFormContent = (initialValues, onSearch) => [
})) || [],
},
},
+ filterOption: (keyword, option) => option.label.includes(keyword),
},
},
{
diff --git a/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx
b/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx
index b54b422e12..f285181670 100644
--- a/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx
+++ b/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx
@@ -94,10 +94,9 @@ export const getFormContent = (initialValues, onSearch) => [
dropdownMatchSelectWidth: false,
options: {
requestAuto: true,
- requestTrigger: ['onOpen', 'onSearch'],
- requestService: async keyword => {
- const res = await request('/audit/getAuditBases');
- return keyword === undefined ? res : res.filter(audit =>
audit.name.includes(keyword));
+ requestTrigger: ['onOpen'],
+ requestService: () => {
+ return request('/audit/getAuditBases');
},
requestParams: {
formatResult: result =>
@@ -107,6 +106,7 @@ export const getFormContent = (initialValues, onSearch) => [
})) || [],
},
},
+ filterOption: (keyword, option) => option.label.includes(keyword),
},
},
{
@@ -119,10 +119,9 @@ export const getFormContent = (initialValues, onSearch) =>
[
dropdownMatchSelectWidth: false,
options: {
requestAuto: true,
- requestTrigger: ['onOpen', 'onSearch'],
- requestService: async keyword => {
- const res = await request('/audit/getAuditBases');
- return keyword === undefined ? res : res.filter(audit =>
audit.name.includes(keyword));
+ requestTrigger: ['onOpen'],
+ requestService: () => {
+ return request('/audit/getAuditBases');
},
requestParams: {
formatResult: result =>
@@ -132,6 +131,7 @@ export const getFormContent = (initialValues, onSearch) => [
})) || [],
},
},
+ filterOption: (keyword, option) => option.label.includes(keyword),
},
},
{
