From 81246af0a7923f4c9c60680170a05b3428f740e3 Mon Sep 17 00:00:00 2001 From: Siddhant <86899184+Siddhanttimeline@users.noreply.github.com> Date: Thu, 12 Dec 2024 15:24:01 +0530 Subject: [PATCH] Fix: Filter activity feed events for test cases and test suites. (#19004) * fix: Filter activity feed events for test cases and suites. * minor fix around the button label after save task tab --------- Co-authored-by: Ashish Gupta --- .../json/data/eventsubscription/ActivityFeedEvents.json | 2 +- .../components/Entity/Task/TaskTab/TaskTab.component.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json b/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json index ecdaeba28b4..4db1f4b296b 100644 --- a/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json +++ b/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json @@ -10,7 +10,7 @@ { "name": "matchAnyEventType", "effect": "include", - "condition": "matchAnyEventType({'entityCreated', 'entityDeleted', 'entitySoftDeleted'}) && !matchUpdatedBy({'ingestion-bot'}) && !matchAnySource({'user', 'team', 'owners', 'databaseService', 'messagingService', 'dashboardService', 'pipelineService', 'storageService', 'mlmodelService', 'metadataService', 'searchService', 'apiService', 'ingestionPipeline', 'workflow'})", + "condition": "matchAnyEventType({'entityCreated', 'entityDeleted', 'entitySoftDeleted'}) && !matchUpdatedBy({'ingestion-bot'}) && !matchAnySource({'user', 'team', 'owners', 'databaseService', 'messagingService', 'dashboardService', 'pipelineService', 'storageService', 'mlmodelService', 'metadataService', 'searchService', 'apiService', 'ingestionPipeline', 'workflow', 'testCase', 'testSuite'})", "prefixCondition": "AND" }, { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx index 4e6cd1a724c..0549abd6900 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx @@ -431,8 +431,11 @@ export const TaskTab = ({ onTaskResolve(); } setTaskAction( - TASK_ACTION_LIST.find((action) => action.key === info.key) ?? - TASK_ACTION_LIST[0] + [ + ...TASK_ACTION_LIST, + ...GLOSSARY_TASK_ACTION_LIST, + ...INCIDENT_TASK_ACTION_LIST, + ].find((action) => action.key === info.key) ?? TASK_ACTION_LIST[0] ); };