#1352 Displaying & counting only the direct subscriptions notifications

nemerosa · Sep 17, 2024 · 2de8feb · 2de8feb
1 parent 43d4acb
commit 2de8feb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ontrack-web-core/components/builds/BuildContentNotifications.js b/ontrack-web-core/components/builds/BuildContentNotifications.js
@@ -11,6 +11,7 @@ export default function BuildContentNotifications({build}) {
                         type: 'BUILD',
                         id: build.id,
                     }}
+                    sourceId="entity-subscription"
                 />
             </GridCell>
         </>

diff --git a/ontrack-web-core/components/extension/notifications/EntityNotificationsBadge.js b/ontrack-web-core/components/extension/notifications/EntityNotificationsBadge.js
@@ -23,6 +23,7 @@ export default function EntityNotificationsBadge({entityType, entityId, href}) {
                         notificationRecords(
                             eventEntityType: $entityType,
                             eventEntityId: $entityId,
+                            sourceId: "entity-subscription",
                         ) {
                             pageItems {
                                 result {

diff --git a/ontrack-web-core/components/extension/notifications/NotificationRecordingsTable.js b/ontrack-web-core/components/extension/notifications/NotificationRecordingsTable.js
@@ -17,7 +17,7 @@ import NotificationRecordResultLink from "@components/extension/notifications/No
 
 const {Column} = Table
 
-export default function NotificationRecordingsTable({entity}) {
+export default function NotificationRecordingsTable({entity, sourceId}) {
 
     const client = useGraphQLClient()
 
@@ -48,6 +48,7 @@ export default function NotificationRecordingsTable({entity}) {
                         $resultType: NotificationResultType,
                         $eventEntityType: ProjectEntityType,
                         $eventEntityId: Int,
+                        $sourceId: String,
                     ) {
                         notificationRecords(
                             offset: $offset,
@@ -56,6 +57,7 @@ export default function NotificationRecordingsTable({entity}) {
                             resultType: $resultType,
                             eventEntityType: $eventEntityType,
                             eventEntityId: $eventEntityId,
+                            sourceId: $sourceId,
                         ) {
                             pageInfo {
                                 nextPage {
@@ -75,6 +77,7 @@ export default function NotificationRecordingsTable({entity}) {
                     size: pagination.size,
                     eventEntityType: entity?.type,
                     eventEntityId: entity?.id,
+                    sourceId: sourceId,
                     ...filter,
                 }
             ).then(data => {
@@ -88,7 +91,7 @@ export default function NotificationRecordingsTable({entity}) {
                 setLoading(false)
             })
         }
-    }, [client, pagination, filter]);
+    }, [client, pagination, filter, sourceId, entity]);
 
     const onTableChange = (_, filters) => {
         setFilter({

diff --git a/ontrack-web-core/components/promotionRuns/PromotionRunView.js b/ontrack-web-core/components/promotionRuns/PromotionRunView.js
@@ -199,6 +199,7 @@ export default function PromotionRunView({id}) {
                                     type: 'PROMOTION_RUN',
                                     id: run.id,
                                 }}
+                                sourceId="entity-subscription"
                             />
                         </PageSection>
                     </Space>