open-metadata · harshach · May 10, 2026 · May 10, 2026 · May 10, 2026 · May 10, 2026
diff --git a/...tadata-service/src/main/java/org/openmetadata/service/jdbi3/ActivityStreamRepository.java b/...tadata-service/src/main/java/org/openmetadata/service/jdbi3/ActivityStreamRepository.java
@@ -333,6 +333,24 @@ public int count(List<UUID> domainIds, long afterTimestamp) {
     return activityStreamDAO.countByDomains(domainJson, domainIdStrings, afterTimestamp);
   }
 
+  /** Get count of activity events for a specific entity. */
+  public int countByEntity(String entityType, UUID entityId, long afterTimestamp) {
+    return activityStreamDAO.countByEntity(entityType, entityId.toString(), afterTimestamp);
+  }
+
+  /** Get count of activity events for a specific entity scoped to specific domains. */
+  public int countByEntity(
+      String entityType, UUID entityId, List<UUID> domainIds, long afterTimestamp) {
+    if (nullOrEmpty(domainIds)) {
+      return countByEntity(entityType, entityId, afterTimestamp);
+    }
+
+    List<String> domainIdStrings = domainIds.stream().map(UUID::toString).toList();
+    String domainJson = JsonUtils.pojoToJson(domainIdStrings);
+    return activityStreamDAO.countByEntityAndDomains(
+        entityType, entityId.toString(), domainJson, domainIdStrings, afterTimestamp);
+  }
+
   /** Delete events older than the cutoff timestamp. */
   public int deleteOlderThan(long cutoffTimestamp) {
     return activityStreamDAO.deleteOlderThan(cutoffTimestamp);

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java
@@ -13252,6 +13252,42 @@ int countByDomains(
         @BindList("domainIds") List<String> domainIds,
         @Bind("after") long after);
 
+    @ConnectionAwareSqlQuery(
+        value =
+            "SELECT count(*) FROM activity_stream WHERE entityType = :entityType AND entityId = :entityId "
+                + "AND timestamp >= :after",
+        connectionType = MYSQL)
+    @ConnectionAwareSqlQuery(
+        value =
+            "SELECT count(*) FROM activity_stream WHERE entitytype = :entityType AND entityid = :entityId "
+                + "AND timestamp >= :after",
+        connectionType = POSTGRES)
+    int countByEntity(
+        @Bind("entityType") String entityType,
+        @Bind("entityId") String entityId,
+        @Bind("after") long after);
+
+    @ConnectionAwareSqlQuery(
+        value =
+            "SELECT count(*) FROM activity_stream WHERE entityType = :entityType AND entityId = :entityId "
+                + "AND JSON_OVERLAPS(domains, :domainJson) "
+                + "AND timestamp >= :after",
+        connectionType = MYSQL)
+    @ConnectionAwareSqlQuery(
+        value =
+            "SELECT count(*) FROM activity_stream WHERE entitytype = :entityType AND entityid = :entityId "
+                + "AND EXISTS ("
+                + "SELECT 1 FROM jsonb_array_elements_text(domains) AS domain_id "
+                + "WHERE domain_id IN (<domainIds>)) "
+                + "AND timestamp >= :after",
+        connectionType = POSTGRES)
+    int countByEntityAndDomains(
+        @Bind("entityType") String entityType,
+        @Bind("entityId") String entityId,
+        @Bind("domainJson") String domainJson,
+        @BindList("domainIds") List<String> domainIds,
+        @Bind("after") long after);
+
     @SqlUpdate("DELETE FROM activity_stream WHERE timestamp < :cutoff")
     int deleteOlderThan(@Bind("cutoff") long cutoffTimestamp);
 

diff --git a/...a-service/src/main/java/org/openmetadata/service/resources/activity/ActivityResource.java b/...a-service/src/main/java/org/openmetadata/service/resources/activity/ActivityResource.java
@@ -175,20 +175,27 @@ public ResultList<ActivityEvent> getEntityActivityById(
           @Max(90)
           @QueryParam("days")
           int days,
-      @Parameter(description = "Maximum number of events to return")
+      @Parameter(
+              description =
+                  "Maximum number of events to return. Pass 0 for a count-only response "
+                      + "(empty data array, accurate paging.total).")
           @DefaultValue("50")
-          @Min(1)
+          @Min(0)
           @Max(200)
           @QueryParam("limit")
           int limit) {
 
     long afterTimestamp = Instant.now().minus(days, ChronoUnit.DAYS).toEpochMilli();
     List<UUID> domainIds = getEffectiveDomainsByFqn(securityContext, domain);
+    int total =
+        activityStreamRepository.countByEntity(entityType, entityId, domainIds, afterTimestamp);
+    if (limit == 0) {
+      return new ResultList<>(List.of(), null, null, total);
+    }
     List<ActivityEvent> events =
         activityStreamRepository.listByEntity(
             entityType, entityId, domainIds, afterTimestamp, limit);
-
-    return new ResultList<>(events, null, null, events.size());
+    return new ResultList<>(events, null, null, total);
   }
 
   @GET
@@ -219,9 +226,13 @@ public ResultList<ActivityEvent> getEntityActivityByFqn(
           @Max(90)
           @QueryParam("days")
           int days,
-      @Parameter(description = "Maximum number of events to return")
+      @Parameter(
+              description =
+                  "Maximum number of events to return. Pass 0 for a count-only response "
+                      + "(empty data array, accurate paging.total). Frontend tab-badge fetches "
+                      + "use this path so first paint isn't blocked on a 100-row list query.")
           @DefaultValue("50")
-          @Min(1)
+          @Min(0)
           @Max(200)
           @QueryParam("limit")
           int limit) {
@@ -234,11 +245,15 @@ public ResultList<ActivityEvent> getEntityActivityByFqn(
     UUID entityId = entity.getId();
     List<UUID> domainIds = getEffectiveDomainsByFqn(securityContext, domain);
 
+    int total =
+        activityStreamRepository.countByEntity(entityType, entityId, domainIds, afterTimestamp);
+    if (limit == 0) {
+      return new ResultList<>(List.of(), null, null, total);
+    }
     List<ActivityEvent> events =
         activityStreamRepository.listByEntity(
             entityType, entityId, domainIds, afterTimestamp, limit);
-
-    return new ResultList<>(events, null, null, events.size());
+    return new ResultList<>(events, null, null, total);
   }
 
   @GET

diff --git a/...-service/src/main/java/org/openmetadata/service/resources/filters/ETagResponseFilter.java b/...-service/src/main/java/org/openmetadata/service/resources/filters/ETagResponseFilter.java
@@ -16,30 +16,87 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerResponseContext;
 import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 import org.openmetadata.schema.EntityInterface;
 import org.openmetadata.service.monitoring.RequestLatencyContext;
 import org.openmetadata.service.util.EntityETag;
 
 /**
- * JAX-RS filter that automatically adds ETag headers to GET responses
- * containing EntityInterface entities.
+ * JAX-RS filter that adds an {@code ETag} header to entity GET responses and short-circuits to
+ * {@code 304 Not Modified} when the client's {@code If-None-Match} matches the computed ETag.
+ *
+ * <p>The 304 path saves the response body bytes on the wire and the client-side render cost on
+ * revisits — the server still computes the entity body (we'd need a cheap version-stamp lookup
+ * to truly skip the work, see design doc), but the network and client savings are immediate.
+ *
+ * <p>{@code Cache-Control: no-store} is emitted alongside the ETag. Without an explicit
+ * Cache-Control, Chrome falls back to heuristic caching for ETag-bearing responses and reuses
+ * the cached body on a 304. That breaks any mutation path where the server returns 304 with
+ * stale-relative-to-the-client state — notably the relationship-only mutations
+ * ({@code addFollower}, {@code removeFollower}, {@code updateVote},
+ * {@code DataContractRepository.updateLatestResult}) that don't bump entity {@code version} or
+ * {@code updatedAt} and therefore leave the ETag unchanged. With {@code no-store} the browser
+ * never caches a body, so the only conditional-GET path is our explicit Axios interceptor,
+ * which already invalidates its cache on every mutation response. We keep emitting the ETag
+ * header so any future client (or our own interceptor) can opt in to conditional GETs.
  */
 @Provider
 public class ETagResponseFilter implements ContainerResponseFilter {
 
+  private static final String CACHE_CONTROL_VALUE = "no-store";
+
   @Override
   public void filter(
       ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
     try (var ignored = RequestLatencyContext.phase("etagGeneration")) {
-      if ("GET".equals(requestContext.getMethod())
-          && responseContext.getStatus() == Response.Status.OK.getStatusCode()
-          && responseContext.getEntity() instanceof EntityInterface entity) {
+      if (!"GET".equals(requestContext.getMethod())
+          || responseContext.getStatus() != Response.Status.OK.getStatusCode()
+          || !(responseContext.getEntity() instanceof EntityInterface entity)) {
+        return;
+      }
+
+      String etag = EntityETag.generateETag(entity);
+      if (etag == null) {
+        return;
+      }
+      responseContext.getHeaders().putSingle(HttpHeaders.ETAG, etag);
+      responseContext.getHeaders().putSingle(HttpHeaders.CACHE_CONTROL, CACHE_CONTROL_VALUE);
+
+      String ifNoneMatch = requestContext.getHeaderString(HttpHeaders.IF_NONE_MATCH);
+      if (ifNoneMatch == null) {
+        return;
+      }
+      if (matchesAny(ifNoneMatch, etag)) {
+        // RFC 7232: 304 must NOT include a message body. Drop the entity so the
+        // serializer emits an empty body. Headers (including ETag) are preserved.
+        responseContext.setStatus(Response.Status.NOT_MODIFIED.getStatusCode());
+        responseContext.setEntity(null);
+      }
+    }
+  }
 
-        String etag = EntityETag.generateETag(entity);
-        responseContext.getHeaders().add("ETag", etag);
+  /**
+   * RFC 7232 §3.2: {@code If-None-Match} can be {@code *} (match any), a single ETag, or a
+   * comma-separated list. Weak comparison is used — we treat {@code "abc"} and {@code W/"abc"}
+   * as matching, which is the spec's recommendation for cache-validation use.
+   */
+  private static boolean matchesAny(String ifNoneMatch, String currentEtag) {
+    String trimmed = ifNoneMatch.trim();
+    if ("*".equals(trimmed)) {
+      return true;
+    }
+    String currentBare = stripWeakPrefix(currentEtag);
+    for (String candidate : trimmed.split(",")) {
+      if (currentBare.equals(stripWeakPrefix(candidate.trim()))) {
+        return true;
       }
     }
+    return false;
+  }
+
+  private static String stripWeakPrefix(String etag) {
+    return etag.startsWith("W/") ? etag.substring(2) : etag;
   }
 }
@@ -75,6 +75,16 @@ module.exports = {
       '<rootDir>/src/test/unit/mocks/reactColumnResize.mock.js',
     '^.*/Lineage/Layout/ELKUtil/ELKUtil$':
       '<rootDir>/src/test/unit/mocks/elkLayout.mock.js',
+    // Force every `require('react')` / `require('react-dom')` to resolve to the consumer's
+    // copy. The `openmetadata-ui-core-components` package has its own `node_modules/react`
+    // (for its own dev/test) — without these mappings the CJS bundle loaded from
+    // `dist/*.cjs.js` resolves React from the core-components tree, producing a second React
+    // instance with a null hooks dispatcher and the classic "Invalid hook call ... reading
+    // 'useContext'" TypeError.
+    '^react$': '<rootDir>/node_modules/react',
+    '^react-dom$': '<rootDir>/node_modules/react-dom',
+    '^react/(.*)$': '<rootDir>/node_modules/react/$1',
+    '^react-dom/(.*)$': '<rootDir>/node_modules/react-dom/$1',
   },
   transformIgnorePatterns: [
     'node_modules/(?!(@azure/msal-react|react-dnd|react-dnd-html5-backend|dnd-core|@react-dnd/invariant|@react-dnd/asap|@react-dnd/shallowequal|@melloware/react-logviewer|@material/material-color-utilities|@openmetadata/ui-core-components|nanoid|@rjsf/core|@rjsf/utils|@rjsf/validator-ajv8|uuid|elkjs))',

@@ -29,7 +29,11 @@ import { useFqn } from '../../../hooks/useFqn';
 import { FeedCounts } from '../../../interface/feed.interface';
 import { restoreApiEndPoint } from '../../../rest/apiEndpointsAPI';
 import apiEndpointClassBase from '../../../utils/APIEndpoints/APIEndpointClassBase';
-import { getFeedCounts } from '../../../utils/CommonUtils';
+import {
+  fetchEntityActivityCountInto,
+  fetchEntityTaskCountsInto,
+  getFeedCounts,
+} from '../../../utils/CommonUtils';
 import {
   checkIfExpandViewSupported,
   getDetailsTabWithNewLabel,
@@ -179,6 +183,22 @@ const APIEndpointDetails: React.FC<APIEndpointDetailsProps> = ({
       handleFeedCount
     );
 
+  const fetchTaskCounts = useCallback(() => {
+    if (decodedApiEndpointFqn) {
+      fetchEntityTaskCountsInto(decodedApiEndpointFqn, setFeedCount);
+    }
+  }, [decodedApiEndpointFqn]);
+
+  const fetchActivityCount = useCallback(() => {
+    if (decodedApiEndpointFqn) {
+      fetchEntityActivityCountInto(
+        EntityType.API_ENDPOINT,
+        decodedApiEndpointFqn,
+        setFeedCount
+      );
+    }
+  }, [decodedApiEndpointFqn]);
+
   const afterDeleteAction = useCallback(
     (isSoftDelete?: boolean) => !isSoftDelete && navigate('/'),
     [navigate]
@@ -209,7 +229,8 @@ const APIEndpointDetails: React.FC<APIEndpointDetailsProps> = ({
   );
 
   useEffect(() => {
-    getEntityFeedCount();
+    fetchTaskCounts();
+    fetchActivityCount();
   }, [apiEndpointPermissions, decodedApiEndpointFqn]);
 
   const tabs = useMemo(() => {

@@ -54,6 +54,7 @@ import { withDomainFilter } from '../../../hoc/withDomainFilter';
 import { useApplicationStore } from '../../../hooks/useApplicationStore';
 import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation';
 import axiosClient from '../../../rest';
+import { clearEtagCache } from '../../../rest/etagInterceptor';
 import {
   fetchAuthenticationConfig,
   fetchAuthorizerConfig,
@@ -218,6 +219,10 @@ export const AuthProvider = ({
     // Clear tokens properly during logout
     await clearOidcToken();
 
+    // Drop the ETag interceptor's response cache so a freshly-authenticated user can't
+    // pick up another principal's cached body via If-None-Match → 304 mid-session.
+    clearEtagCache();
+
     setApplicationLoading(false);
 
     // Clear the refresh flag (used after refresh is complete)

@@ -31,7 +31,11 @@ import { useFqn } from '../../../hooks/useFqn';
 import { FeedCounts } from '../../../interface/feed.interface';
 import { restoreChart } from '../../../rest/chartsAPI';
 import chartDetailsClassBase from '../../../utils/ChartDetailsClassBase';
-import { getFeedCounts } from '../../../utils/CommonUtils';
+import {
+  fetchEntityActivityCountInto,
+  fetchEntityTaskCountsInto,
+  getFeedCounts,
+} from '../../../utils/CommonUtils';
 import {
   checkIfExpandViewSupported,
   getDetailsTabWithNewLabel,
@@ -127,8 +131,25 @@ const ChartDetails = ({
   const getEntityFeedCount = () =>
     getFeedCounts(EntityType.CHART, decodedChartFQN, handleFeedCount);
 
+  const fetchTaskCounts = useCallback(() => {
+    if (decodedChartFQN) {
+      fetchEntityTaskCountsInto(decodedChartFQN, setFeedCount);
+    }
+  }, [decodedChartFQN]);
+
+  const fetchActivityCount = useCallback(() => {
+    if (decodedChartFQN) {
+      fetchEntityActivityCountInto(
+        EntityType.CHART,
+        decodedChartFQN,
+        setFeedCount
+      );
+    }
+  }, [decodedChartFQN]);
+
   useEffect(() => {
-    getEntityFeedCount();
+    fetchTaskCounts();
+    fetchActivityCount();
   }, [decodedChartFQN]);
 
   const handleTabChange = (activeKey: string) => {

@@ -31,7 +31,11 @@ import { useCustomPages } from '../../../hooks/useCustomPages';
 import { useFqn } from '../../../hooks/useFqn';
 import { FeedCounts } from '../../../interface/feed.interface';
 import { restoreDashboard } from '../../../rest/dashboardAPI';
-import { getFeedCounts } from '../../../utils/CommonUtils';
+import {
+  fetchEntityActivityCountInto,
+  fetchEntityTaskCountsInto,
+  getFeedCounts,
+} from '../../../utils/CommonUtils';
 import {
   checkIfExpandViewSupported,
   getDetailsTabWithNewLabel,
@@ -139,8 +143,25 @@ const DashboardDetails = ({
   const getEntityFeedCount = () =>
     getFeedCounts(EntityType.DASHBOARD, decodedDashboardFQN, handleFeedCount);
 
+  const fetchTaskCounts = useCallback(() => {
+    if (decodedDashboardFQN) {
+      fetchEntityTaskCountsInto(decodedDashboardFQN, setFeedCount);
+    }
+  }, [decodedDashboardFQN]);
+
+  const fetchActivityCount = useCallback(() => {
+    if (decodedDashboardFQN) {
+      fetchEntityActivityCountInto(
+        EntityType.DASHBOARD,
+        decodedDashboardFQN,
+        setFeedCount
+      );
+    }
+  }, [decodedDashboardFQN]);
+
   useEffect(() => {
-    getEntityFeedCount();
+    fetchTaskCounts();
+    fetchActivityCount();
   }, [decodedDashboardFQN]);
 
   const handleTabChange = (activeKey: string) => {