Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GEN-Activity Feed Filtering #18873

Merged
merged 13 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ set json = JSON_SET(json, '$.connection.config.supportsSystemProfile', true)
where serviceType in ('Snowflake', 'Redshift', 'BigQuery');

-- Update all rows in the consumers_dlq table to set the source column to 'publisher'
UPDATE consumers_dlq SET source = 'publisher';
UPDATE consumers_dlq SET source = 'publisher';

DELETE from event_subscription_entity where name = "ActivityFeedAlert";
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,6 @@ SET json = jsonb_set(json::jsonb, '{connection,config,supportsSystemProfile}', '
WHERE serviceType IN ('Snowflake', 'Redshift', 'BigQuery');

-- Update all rows in the consumers_dlq table to set the source column to 'publisher'
UPDATE consumers_dlq SET source = 'publisher';
UPDATE consumers_dlq SET source = 'publisher';

DELETE from event_subscription_entity where name = 'ActivityFeedAlert';
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,20 @@
{
"name": "matchAnyEventType",
"effect": "include",
"condition": "matchAnyEventType({'entityCreated', 'entityDeleted', 'entitySoftDeleted'}) && !matchUpdatedBy({'ingestion-bot'}) && !matchAnySource({'user', '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'})",
"prefixCondition": "AND"
},
{
"name": "matchAnyFieldChange",
"effect": "include",
"condition": "matchAnyFieldChange({'testCaseResult'})",
"prefixCondition": "OR"
},
{
"name": "matchAnyFieldChange",
"effect": "include",
"condition": "matchAnyFieldChange({'description', 'domain', 'owners', 'tags', 'followers', 'extension','parameterValues', 'assets'})",
"condition": "matchAnyFieldChange({'description', 'domain', 'owners', 'tags', 'followers','parameterValues', 'assets'})",
"prefixCondition": "OR"
},
{
"name": "matchAnySource",
"effect": "include",
"prefixCondition": "AND",
"condition": "matchAnySource({'chart','container','dashboard','dashboardDataModel','database','databaseSchema','glossary','glossaryTerm','mlmodel','pipeline','query','report','searchIndex','storedProcedure','table','topic','testSuite','testCase', 'domain', 'dataProduct'})"
"condition": "matchAnySource({'chart','container','dashboard','dashboardDataModel','database','databaseSchema','glossary','glossaryTerm','mlmodel','pipeline','query','report','searchIndex','storedProcedure','table','topic', 'domain', 'dataProduct', 'metric'})"
},
{
"name": "matchUpdatedBy",
Expand Down Expand Up @@ -76,9 +70,7 @@
"owners",
"tags",
"followers",
"extension",
"parameterValues",
"testCaseResult",
"pipelineStatus"
]
}
Expand Down Expand Up @@ -108,8 +100,6 @@
"storedProcedure",
"table",
"topic",
"testSuite",
"testCase",
"domain",
"dataProduct"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,14 @@ import {
import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
import entityUtilClassBase from '../../../../utils/EntityUtilClassBase';
import {
entityDisplayName,
getEntityFQN,
getEntityType,
getFrontEndFormat,
MarkdownToHTMLConverter,
} from '../../../../utils/FeedUtils';
import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard';
import CustomPropertyFeed from '../../ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.component';
import DescriptionFeed from '../../ActivityFeedCardV2/FeedCardBody/DescriptionFeed/DescriptionFeed';
import TagsFeed from '../../ActivityFeedCardV2/FeedCardBody/TagsFeed/TagsFeed';
import TestCaseFeed from '../../ActivityFeedCardV2/FeedCardBody/TestCaseFeed/TestCaseFeed';
import './feed-card-body-v1.less';
import { FeedCardBodyV1Props } from './FeedCardBodyV1.interface';

Expand Down Expand Up @@ -83,15 +80,6 @@ const FeedCardBodyV1 = ({
return <TagsFeed feed={feed} />;
}

if (cardStyle === CardStyle.TestCaseResult) {
return (
<TestCaseFeed
entitySpecificInfo={feed.feedInfo?.entitySpecificInfo}
testCaseName={entityDisplayName(entityType, entityFQN) ?? ''}
/>
);
}

if (ASSET_CARD_STYLES.includes(cardStyle as CardStyle)) {
const entityInfo = feed.feedInfo?.entitySpecificInfo?.entity;
const isExecutableTestSuite =
Expand Down Expand Up @@ -127,10 +115,6 @@ const FeedCardBodyV1 = ({
</Link>
);
}

if (cardStyle === CardStyle.CustomProperties) {
return <CustomPropertyFeed feed={feed} />;
}
}

return (
Expand Down
Loading