The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
[Monitor] Tab counters. UX unification. (#84291)
Stas Gavrylov761781d73688
diff --git a/e2e/test/scenarios/monitor/tools/tools.cy.spec.ts b/e2e/test/scenarios/monitor/tools/tools.cy.spec.tsindex 6d8d70b28cd..7f864a18be2 100644--- a/e2e/test/scenarios/monitor/tools/tools.cy.spec.ts+++ b/e2e/test/scenarios/monitor/tools/tools.cy.spec.ts@@ -5,8 +5,8 @@ import { createMockTask } from "metabase-types/api/mocks";const { H } = cy;describe("issue 14636", () => {- const total = 57;- const limit = 50;+ const total = 32;+ const limit = 25;/*** @param {Object} payload@@ -107,7 +107,7 @@ describe("issue 14636", () => {cy.signInAsAdmin();// The only reliable way to reproduce this issue is by stubing page responses!- // All previous attempts to generate enough real tasks (more than 50)+ // All previous attempts to generate enough real tasks (more than one page)// resulted in flaky and unpredictable tests.stubPageResponses({ page: 0, alias: "first" });stubPageResponses({ page: 1, alias: "second" });@@ -121,7 +121,9 @@ describe("issue 14636", () => {cy.findByRole("heading", { name: "Background tasks" }).should("be.visible");- cy.findByLabelText("pagination").findByText("1 - 50").should("be.visible");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("be.visible");cy.findByTestId("tasks-table").should("contain.text", "field values scanning").and("contain.text", "513");@@ -133,9 +135,11 @@ describe("issue 14636", () => {cy.location("search").should("eq", "?page=1");cy.findByLabelText("pagination")- .findByText(`51 - ${total}`)+ .findByText(`${limit + 1} - ${total}`).should("be.visible");- cy.findByLabelText("pagination").findByText("1 - 50").should("not.exist");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("not.exist");cy.findByTestId("tasks-table").should("contain.text", "analyze").and("contain.text", "200")@@ -145,7 +149,9 @@ describe("issue 14636", () => {cy.findByLabelText("Previous page").should("not.be.disabled").click();cy.location("search").should("eq", "");- cy.findByLabelText("pagination").findByText("1 - 50").should("be.visible");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("be.visible");cy.findByTestId("tasks-table").should("contain.text","field values scanning",@@ -229,13 +235,15 @@ describe("issue 14636", () => {.click();cy.location("search").should("eq", "");cy.wait("@unfilteredFirst");- cy.findByLabelText("pagination").findByText("1 - 50").should("be.visible");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("be.visible");cy.log("it should respect page query param on page load");cy.visit("/monitor/tasks/list?page=1");cy.wait("@unfilteredSecond");cy.findByLabelText("pagination")- .findByText(`51 - ${total}`)+ .findByText(`${limit + 1} - ${total}`).should("be.visible");cy.log("should reset pagination when changing filters");@@ -699,7 +707,7 @@ describe("scenarios > monitor > tools > task runs", () => {response.body = {data: [taskRun],total: 1,- limit: 50,+ limit: 25,offset: 0,};});@@ -784,8 +792,8 @@ describe("scenarios > monitor > tools > task runs", () => {});describe("scenarios > monitor > tools > task runs pagination", () => {- const total = 57;- const limit = 50;+ const total = 32;+ const limit = 25;function stubRunsPageResponses({page,@@ -847,7 +855,9 @@ describe("scenarios > monitor > tools > task runs pagination", () => {cy.location("search").should("eq", "");- cy.findByLabelText("pagination").findByText("1 - 50").should("be.visible");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("be.visible");cy.findByTestId("task-runs-table").should("contain.text", "Sync");cy.findByLabelText("Previous page").should("be.disabled");@@ -858,7 +868,7 @@ describe("scenarios > monitor > tools > task runs pagination", () => {cy.findByLabelText("pagination").scrollIntoView()- .findByText(`51 - ${total}`)+ .findByText(`${limit + 1} - ${total}`).should("be.visible");cy.findByTestId("task-runs-table").should("contain.text", "Fingerprint");@@ -866,7 +876,9 @@ describe("scenarios > monitor > tools > task runs pagination", () => {cy.findByLabelText("Previous page").should("not.be.disabled").click();cy.location("search").should("eq", "");- cy.findByLabelText("pagination").findByText("1 - 50").should("be.visible");+ cy.findByLabelText("pagination")+ .findByText(`1 - ${limit}`)+ .should("be.visible");cy.findByTestId("task-runs-table").should("contain.text", "Sync");});});@@ -881,7 +893,7 @@ describe("scenarios > monitor > tools > task runs filtering", () => {response.body = {data: [],total: 0,- limit: 50,+ limit: 25,offset: 0,};});diff --git a/enterprise/backend/src/metabase_enterprise/content_diagnostics/api.clj b/enterprise/backend/src/metabase_enterprise/content_diagnostics/api.cljindex f6fc28b0d98..fcaffc5020b 100644--- a/enterprise/backend/src/metabase_enterprise/content_diagnostics/api.clj+++ b/enterprise/backend/src/metabase_enterprise/content_diagnostics/api.clj@@ -330,6 +330,24 @@(check-diagnostics-access)(handler request respond raise)))))+(api.macros/defendpoint :get "/counts"+ :- [:map {:closed true}+ [:stale nat-int?]+ [:duplicated nat-int?]+ [:slow nat-int?]+ [:empty nat-int?]+ [:sparse nat-int?]+ [:crowded nat-int?]]+ "Count each tab's default latest valid, visible findings, including personal collections."+ [_route-params _query-params _body _request]+ (let [params {:exclude-personal? false}]+ {:stale (cd.db/finding-count (stale-where-clause params))+ :duplicated (cd.db/finding-count (duplicated-where-clause params))+ :slow (cd.db/finding-count (slow-where-clause params))+ :empty (cd.db/finding-count (imbalanced-where-clause (assoc params :finding-types :empty)))+ :sparse (cd.db/finding-count (imbalanced-where-clause (assoc params :finding-types :sparse)))+ :crowded (cd.db/finding-count (imbalanced-where-clause (assoc params :finding-types :crowded)))}))+(api.macros/defendpoint :get "/stale":- [:map[:data [:sequential StaleFinding]]diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.cljindex c81fb4f9816..e66aab0255d 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj@@ -611,19 +611,101 @@"Valid sort columns for /graph/broken and /graph/unreferenced endpoints."#{:name :location :dependents-with-errors :dependents-errors})+(def ^:private types-arg+ [:or+ ::deps.dependency-types/dependency-types+ [:sequential ::deps.dependency-types/dependency-types]])++(def ^:private card-types-arg+ [:or+ (ms/enum-decode-keyword lib.schema.metadata/card-types)+ [:sequential (ms/enum-decode-keyword lib.schema.metadata/card-types)]])+(def ^:private dependency-items-args[:map {:closed true}- [:types {:optional true} [:or- ::deps.dependency-types/dependency-types- [:sequential ::deps.dependency-types/dependency-types]]]- [:card-types {:optional true} [:or- (ms/enum-decode-keyword lib.schema.metadata/card-types)- [:sequential (ms/enum-decode-keyword lib.schema.metadata/card-types)]]]+ [:types {:optional true} types-arg]+ [:card-types {:optional true} card-types-arg][:query {:optional true} :string][:include-personal-collections {:optional true} :boolean][:sort-column {:optional true} (ms/enum-decode-keyword breaking-items-sort-columns)][:sort-direction {:optional true} (ms/enum-decode-keyword sort-directions)]])+(mu/defn- dependency-item-params :- ::dependencies.db/dependency-item-filter-params+ [query-type :- [:enum :unreferenced :breaking]+ {:keys [types card-types query include-personal-collections sort-column]+ :or {card-types (vec lib.schema.metadata/card-types)+ include-personal-collections false+ sort-column :name}} :- [:maybe dependency-items-args]]+ (let [types (or types (case query-type+ :unreferenced (vec deps.dependency-types/dependency-types)+ :breaking [:card :table]))+ selected-types (cond->> (if (sequential? types) types [types])+ ;; Sandboxes have no name or location to search.+ query (remove #{:sandbox}))]+ (merge (current-user-visibility nil)+ {:query-type query-type+ :entity-types selected-types+ :card-types (if (sequential? card-types) card-types [card-types])+ :search-text query+ :include-personal-collections? include-personal-collections+ :sort-column sort-column})))++(mu/defn- dependency-item-page-ids+ "A page of [[dependencies.db/dependency-item-ids]] for `item-params`, sorted in the request's `sort-direction`+ (default `:asc`)."+ [item-params :- ::dependencies.db/dependency-item-filter-params+ {:keys [sort-direction] :or {sort-direction :asc}} :- [:maybe dependency-items-args]+ offset :- ms/IntGreaterThanOrEqualToZero+ limit :- ms/PositiveInt]+ (dependencies.db/dependency-item-ids+ (assoc item-params :sort-direction sort-direction :offset offset :limit limit)))++(def ^:private counted-list-args+ "The list args `/counts` accepts for each list, prefixed with the list's query type."+ {:types types-arg+ :card-types card-types-arg+ :include-personal-collections :boolean})++(mu/defn- counts-arg-key :- :keyword+ "The `/counts` param naming `query-type`'s list `arg`, e.g. `:breaking-types`."+ [query-type :- [:enum :breaking :unreferenced]+ arg :- :keyword]+ (keyword (str (name query-type) "-" (name arg))))++(def ^:private counts-args+ (into [:map {:closed true}]+ (for [query-type [:breaking :unreferenced]+ [arg schema] counted-list-args]+ [(counts-arg-key query-type arg) {:optional true} schema])))++(mu/defn- counted-list-params :- dependency-items-args+ "The `query-type` list's args among the prefixed `/counts` `params`."+ [query-type :- [:enum :breaking :unreferenced]+ params :- [:maybe counts-args]]+ (into {}+ (keep (fn [arg]+ (let [value (get params (counts-arg-key query-type arg))]+ (when (some? value)+ [arg value]))))+ (keys counted-list-args)))++(api.macros/defendpoint :get "/counts" :- [:map {:closed true}+ [:breaking nat-int?]+ [:unreferenced nat-int?]]+ "Returns the `total` of the `/graph/breaking` and `/graph/unreferenced` lists in one request.++ Accepts each list's `types`, `card-types`, and `include-personal-collections` params, prefixed with the list's+ name (e.g. `breaking-types`, `unreferenced-include-personal-collections`). Omitted params use the list's+ defaults."+ [_route-params+ params :- counts-args+ _body _request]+ (into {}+ (map (fn [query-type]+ [query-type (dependencies.db/dependency-item-count+ (dependency-item-params query-type (counted-list-params query-type params)))]))+ [:breaking :unreferenced]))+(def ^:private dependency-items-response[:map[:data [:sequential ::entity]]@@ -651,29 +733,12 @@- `offset`: Applied offset- `limit`: Applied limit"[_route-params- {:keys [types card-types query include-personal-collections sort-column sort-direction]- :or {types (vec deps.dependency-types/dependency-types)- card-types (vec lib.schema.metadata/card-types)- include-personal-collections false- sort-column :name- sort-direction :asc}} :- dependency-items-args]+ params :- dependency-items-args+ _body _request](let [offset (or (request/offset) 0)limit (or (request/limit) 50)- selected-types (cond->> (if (sequential? types) types [types])- ;; Sandboxes don't support query filtering, so exclude them when a query is provided- query (remove #{:sandbox}))- card-types (if (sequential? card-types) card-types [card-types])- item-params (merge (current-user-visibility nil)- {:query-type :unreferenced- :entity-types selected-types- :card-types card-types- :search-text query- :include-personal-collections? include-personal-collections- :sort-column sort-column- :sort-direction sort-direction- :offset offset- :limit limit})- all-ids (dependencies.db/dependency-item-ids item-params)+ item-params (dependency-item-params :unreferenced params)+ all-ids (dependency-item-page-ids item-params params offset limit)downstream-graph (graph/cached-graph (readable-graph-dependents))total (dependencies.db/dependency-item-count item-params)]{:data (expanded-nodes downstream-graph all-ids {:include-errors? false})@@ -702,29 +767,12 @@- `offset`: Applied offset- `limit`: Applied limit"[_route-params- {:keys [types card-types query include-personal-collections sort-column sort-direction]- :or {types [:card :table]- card-types (vec lib.schema.metadata/card-types)- include-personal-collections false- sort-column :name- sort-direction :asc}} :- dependency-items-args]+ params :- dependency-items-args+ _body _request](let [offset (or (request/offset) 0)limit (or (request/limit) 50)- selected-types (cond->> (if (sequential? types) types [types])- ;; Sandboxes don't support query filtering, so exclude them when a query is provided- query (remove #{:sandbox}))- card-types (if (sequential? card-types) card-types [card-types])- item-params (merge (current-user-visibility nil)- {:query-type :breaking- :entity-types selected-types- :card-types card-types- :search-text query- :include-personal-collections? include-personal-collections- :sort-column sort-column- :sort-direction sort-direction- :offset offset- :limit limit})- all-ids (dependencies.db/dependency-item-ids item-params)+ item-params (dependency-item-params :breaking params)+ all-ids (dependency-item-page-ids item-params params offset limit)downstream-graph (graph/cached-graph (readable-graph-dependents))nodes-by-type (u/group-by first second all-ids)downstream-errors (node-downstream-errors nodes-by-type)diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/db.clj b/enterprise/backend/src/metabase_enterprise/dependencies/db.cljindex 8cd5a0d3cb2..65df475f10b 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/db.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/db.clj@@ -16,6 +16,7 @@[metabase.util :as u][metabase.util.honey-sql-2 :as h2x][metabase.util.malli :as mu]+ [metabase.util.malli.registry :as mr][metabase.util.malli.schema :as ms][metabase.warehouse-schema-overlay.core :as warehouse-schema-overlay][toucan2.core :as t2]))@@ -274,8 +275,8 @@;;; `entity_type`/`entity_id`/`sort_key` rows, then page and count that union. These private helpers build the;;; per-entity-type SELECT and the pieces (joins, extra filters, sort expression) that make it up.-(def ^:private DependencyItemParams- "Params shared by [[dependency-item-ids]] and [[dependency-item-count]]."+(mr/def ::dependency-item-filter-params+ "Filter params shared by [[dependency-item-ids]] and [[dependency-item-count]]."[:map {:closed true}[:query-type [:enum :unreferenced :breaking]][:entity-types [:sequential ::deps.dependency-types/dependency-types]]@@ -283,16 +284,25 @@[:search-text {:optional true} [:maybe :string]][:include-personal-collections? :boolean][:sort-column {:optional true} [:maybe [:enum :name :location :dependents-errors :dependents-with-errors]]]- [:sort-direction [:enum :asc :desc]]- [:offset ms/IntGreaterThanOrEqualToZero]- [:limit ms/PositiveInt][:user-id ::lib.schema.id/user][:is-superuser? {:optional true} [:maybe :boolean]][:is-data-analyst? {:optional true} [:maybe :boolean]]])+(mr/def ::dependency-item-page-params+ "[[::dependency-item-filter-params]] plus the sort direction and page bounds for [[dependency-item-ids]]."+ [:merge+ ::dependency-item-filter-params+ [:map {:closed true}+ [:sort-direction [:enum :asc :desc]]+ [:offset ms/IntGreaterThanOrEqualToZero]+ [:limit ms/PositiveInt]]])+(def ^:private DependencyItemSelectParams- "The [[DependencyItemParams]] of the SELECT of one `:entity-type`."- (mut/assoc DependencyItemParams :entity-type ::deps.dependency-types/dependency-types))+ "The [[::dependency-item-filter-params]] of the SELECT of one `:entity-type`."+ [:merge+ ::dependency-item-filter-params+ [:map {:closed true}+ [:entity-type ::deps.dependency-types/dependency-types]]])(mu/defn- personal-root-collection-ids :- [:sequential ::lib.schema.id/collection]"The IDs of the personal Collections."@@ -539,8 +549,9 @@`:dependents-with-errors`) in `sort-direction`, skipping `offset` and returning up to `limit`. Entities arerestricted to those visible to the user described by `user-id`, `is-superuser?`, and `is-data-analyst?`; throwswhen `user-id` is missing."- [{:keys [entity-types sort-direction offset limit] :as params} :- DependencyItemParams]- (let [union-query ^:allow-subquery {:union-all (mapv #(dependency-item-select (assoc params :entity-type %))+ [{:keys [entity-types sort-direction offset limit] :as params} :- ::dependency-item-page-params]+ (let [filter-params (dissoc params :sort-direction :offset :limit)+ union-query ^:allow-subquery {:union-all (mapv #(dependency-item-select (assoc filter-params :entity-type %))entity-types)}](->> (t2/query (assoc union-query:order-by [[:sort_key sort-direction] [:entity_id sort-direction] [:entity_type sort-direction]]@@ -551,7 +562,7 @@(mu/defn dependency-item-count"The total count of items matching the same criteria as [[dependency-item-ids]] (ignoring sort direction, offset,and limit); throws when `user-id` is missing."- [{:keys [entity-types] :as params} :- DependencyItemParams]+ [{:keys [entity-types] :as params} :- ::dependency-item-filter-params](let [union-query ^:allow-subquery {:union-all (mapv #(dependency-item-select (assoc params :entity-type %))entity-types)}](-> (t2/query {:select [[:%count.* :total]] :from [[union-query :subquery]]})diff --git a/enterprise/backend/src/metabase_enterprise/session_management/api.clj b/enterprise/backend/src/metabase_enterprise/session_management/api.cljindex 5c1ade1f53c..4c19a967825 100644--- a/enterprise/backend/src/metabase_enterprise/session_management/api.clj+++ b/enterprise/backend/src/metabase_enterprise/session_management/api.clj@@ -233,6 +233,17 @@limit offsetauthed-session-key-hash))}))+(api.macros/defendpoint :get "/counts" :- [:map {:closed true}+ [:active ms/IntGreaterThanOrEqualToZero]+ [:ended ms/IntGreaterThanOrEqualToZero]]+ "Count active and ended sessions without table filters or pagination. Superuser only."+ [_route-params _query-params _body _request]+ (api/check-superuser)+ (let [liveness (session/liveness-params)+ filters (params->filters nil)]+ {:active (sm.db/session-count liveness (assoc filters :status :live))+ :ended (sm.db/session-count liveness (assoc filters :status :ended))}))+(defn- record-revocation!"Write the audit trail for a revoke by criteria: one `:event/sessions-revoked` summary row for the whole call, plusone `:event/session-revoked` row per affected user, tied back to the summary by the criteria they share. Neverdiff --git a/enterprise/backend/test/metabase_enterprise/content_diagnostics/api_test.clj b/enterprise/backend/test/metabase_enterprise/content_diagnostics/api_test.cljindex 1b41076e043..22bd6e14fa8 100644--- a/enterprise/backend/test/metabase_enterprise/content_diagnostics/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/content_diagnostics/api_test.clj@@ -6,12 +6,16 @@[clojure.edn :as edn][clojure.java.io :as io][clojure.test :refer :all]+ [java-time.api :as t][metabase-enterprise.content-diagnostics.api :as cd.api]+ [metabase.collections.models.collection :as collection][metabase.permissions.core :as perms]- [metabase.test :as mt]))+ [metabase.test :as mt]+ [toucan2.core :as t2]))(def ^:private read-endpoints- ["ee/content-diagnostics/stale"+ ["ee/content-diagnostics/counts"+ "ee/content-diagnostics/stale""ee/content-diagnostics/slow""ee/content-diagnostics/imbalanced""ee/content-diagnostics/duplicated"])@@ -167,3 +171,112 @@(testing "a column no endpoint serves is still rejected"(mt/user-http-request :rasta :put 400 "user-key-value/namespace/content_diagnostics/key/stale"{:value {:sort_column "not-a-sortable-column"}}))))))++(defn- default-list-counts+ [user]+ (into {}+ (for [[tab endpoint params] [[:stale "stale" []]+ [:duplicated "duplicated" []]+ [:slow "slow" []]+ [:empty "imbalanced" [:finding-types "empty"]]+ [:sparse "imbalanced" [:finding-types "sparse"]]+ [:crowded "imbalanced" [:finding-types "crowded"]]]]+ [tab (:total (apply mt/user-http-request user :get 200+ (str "ee/content-diagnostics/" endpoint)+ :include-personal-collections true :limit 1 params))])))++(defn- insert-counted-findings!+ [entity-type entity-id finding-types]+ (t2/insert-returning-instances!+ :model/ContentDiagnosticsFinding+ (for [finding-type finding-types]+ {:scan_id (mt/random-name)+ :entity_type entity-type+ :entity_kind entity-type+ :entity_id entity-id+ :entity_name "Counter fixture"+ :finding_type finding-type+ :duration_ms 20000+ :duplicate_count 2+ :content_count 0+ :details (case finding-type+ :stale {:threshold_days 30}+ :slow {:slow_entity_ids []}+ :duplicate_name {:normalized_name "counter fixture" :duplicate_entity_ids []}+ {:threshold 5 :unit "items"})})))++(deftest ^:synchronized counts-default-populations-test+ (testing "counters match the UI's personal-inclusive defaults, excluding archived and missing entities"+ (mt/with-premium-features #{:content-diagnostics}+ (let [baseline (default-list-counts :crowberto)+ expected (merge-with + baseline {:stale 3 :duplicated 4 :slow 4 :empty 4 :sparse 4 :crowded 4})+ finding-types [:stale :duplicate_name :slow :empty :sparse :crowded]+ personal-id (:id (collection/user->personal-collection (mt/user->id :crowberto)))]+ (mt/with-model-cleanup [:model/ContentDiagnosticsFinding]+ (mt/with-temp [:model/Dashboard {first-id :id} {}+ :model/Dashboard {second-id :id} {}+ :model/Dashboard {archived-id :id} {:archived true}+ :model/Dashboard {personal-dash :id} {:collection_id personal-id}+ :model/Collection {nested-personal :id} {:location (str "/" personal-id "/")}+ :model/Dashboard {nested-dash :id} {:collection_id nested-personal}+ :model/Collection {archived-folder :id} {:archived true}+ :model/Dashboard {folder-dash :id} {:collection_id archived-folder}]+ (doseq [id [first-id second-id archived-id personal-dash nested-dash folder-dash Integer/MAX_VALUE]]+ (insert-counted-findings! :dashboard id finding-types))+ ;; A partial new scan can leave two active rows. Only the newest may count.+ (insert-counted-findings! :dashboard first-id [:duplicate_name])+ (let [newest-stale (first (insert-counted-findings! :dashboard second-id [:stale]))]+ (t2/update! :model/ContentDiagnosticsFinding (:id newest-stale) {:invalidated_at (t/offset-date-time)}))+ (is (= expected (mt/user-http-request :crowberto :get 200 "ee/content-diagnostics/counts")))+ (testing "optional table filters and pagination never narrow badge populations"+ (is (= expected (mt/user-http-request :crowberto :get 200 "ee/content-diagnostics/counts"+ :include-personal-collections false :query "no matches"+ :entity-types "card" :finding-types "empty"+ :threshold-days 100000 :min-duration-ms 99999999+ :min-duplicate-count 99 :offset 1000 :limit 1))))+ (is (= expected (default-list-counts :crowberto)))+ (testing "dismissal removes a finding from its tab without collapsing other finding types"+ (let [empty-id (t2/select-one-pk :model/ContentDiagnosticsFinding+ :entity_type :dashboard :entity_id first-id :finding_type :empty)]+ (mt/user-http-request :crowberto :post 200 "ee/content-diagnostics/invalidate" {:ids [empty-id]})+ (is (= (update expected :empty dec)+ (mt/user-http-request :crowberto :get 200 "ee/content-diagnostics/counts")))))))))))++(deftest ^:synchronized counts-live-collection-visibility-test+ (testing "an analyst's counts follow current collection permissions and moves, not the scan-time collection"+ (mt/with-premium-features #{:content-diagnostics :advanced-permissions}+ (mt/with-data-analyst-role! (mt/user->id :rasta)+ (mt/with-non-admin-groups-no-root-collection-perms+ (let [baseline (default-list-counts :rasta)]+ (mt/with-model-cleanup [:model/ContentDiagnosticsFinding]+ (mt/with-temp [:model/Collection {readable :id} {}+ :model/Collection {hidden :id} {}+ :model/Dashboard {visible-dash :id} {:collection_id readable}+ :model/Dashboard {hidden-dash :id} {:collection_id hidden}]+ (perms/grant-collection-read-permissions! (perms/all-users-group) readable)+ (doseq [id [visible-dash hidden-dash]]+ (insert-counted-findings! :dashboard id [:stale :duplicate_name :slow :empty :sparse :crowded]))+ (is (= (update-vals baseline inc)+ (mt/user-http-request :rasta :get 200 "ee/content-diagnostics/counts")))+ (t2/update! :model/Dashboard visible-dash {:collection_id hidden})+ (is (= baseline (mt/user-http-request :rasta :get 200 "ee/content-diagnostics/counts")))+ (perms/grant-collection-read-permissions! (perms/all-users-group) hidden)+ (is (= (update-vals baseline #(+ % 2))+ (mt/user-http-request :rasta :get 200 "ee/content-diagnostics/counts")))))))))))++(deftest ^:synchronized counts-transform-entitlements-test+ (testing "transform findings require both an entitled analyst and an enabled transforms feature"+ (mt/with-user-in-groups [group {:name "Counter monitoring"}+ user [group]]+ (mt/with-premium-features #{:content-diagnostics :advanced-permissions :transforms-basic :hosting}+ (perms/grant-application-permissions! group :monitoring)+ (let [baseline (default-list-counts user)]+ (mt/with-model-cleanup [:model/ContentDiagnosticsFinding]+ (mt/with-temp [:model/Transform {transform-id :id} {}]+ (insert-counted-findings! :transform transform-id [:stale :slow :duplicate_name])+ (is (= baseline (mt/user-http-request user :get 200 "ee/content-diagnostics/counts")))+ (mt/with-data-analyst-role! (:id user)+ (is (= (merge-with + baseline {:stale 1 :slow 1 :duplicated 1})+ (mt/user-http-request user :get 200 "ee/content-diagnostics/counts")))+ (mt/with-premium-features #{:content-diagnostics :advanced-permissions}+ (is (= baseline (mt/user-http-request user :get 200 "ee/content-diagnostics/counts"))))))))))))diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.cljindex c3e6b382dd6..629f62654db 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj@@ -2822,6 +2822,208 @@:email "[email protected]"}}}]}response)))))))))+(deftest counts-access-test+ (testing "Dependency counts require authentication and the dependencies feature"+ (mt/with-premium-features #{:dependencies}+ (is (= "Unauthenticated" (mt/client :get 401 "ee/dependencies/counts"))))+ (mt/with-premium-features #{}+ (is (some? (mt/user-http-request :crowberto :get 402 "ee/dependencies/counts"))))))++(def ^:private monitor-list-params+ "The params the Monitor's Broken and Unreferenced tables send by default."+ {:breaking {:types ["table" "card" "transform"]+ :card-types ["question" "model"]+ :include-personal-collections true}+ :unreferenced {:types ["table" "card" "segment" "measure" "snippet"]+ :card-types ["question" "model" "metric"]+ :include-personal-collections true}})++(defn- list-total+ "The `total` of the `query-type` list endpoint for `list-params`, plus any extra `params`."+ [user query-type list-params & params]+ (:total (apply mt/user-http-request user :get 200 (str "ee/dependencies/graph/" (name query-type))+ (concat (mapcat identity list-params) params))))++(defn- default-dependency-list-total+ [user query-type & params]+ (apply list-total user query-type (monitor-list-params query-type) params))++(defn- counts+ "`/counts` for `list-params-by-type`, sending each list's params prefixed with its query type."+ [user list-params-by-type]+ (apply mt/user-http-request user :get 200 "ee/dependencies/counts"+ (for [[query-type list-params] list-params-by-type+ [k v] list-params+ x [(keyword (str (name query-type) "-" (name k))) v]]+ x)))++(defn- monitor-counts+ [user]+ (counts user monitor-list-params))++(deftest ^:synchronized counts-unreferenced-test+ (mt/with-premium-features #{:dependencies :transforms-basic :hosting}+ (let [baseline (default-dependency-list-total :crowberto :unreferenced)]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/Collection {personal-child-id :id}+ {:location (format "/%d/" (personal-collection-id user-id))}+ :model/Card {dependent-id :id} {}+ :model/Card {referenced-id :id} {}+ :model/Dependency _ {:from_entity_type :card :from_entity_id dependent-id+ :to_entity_type :card :to_entity_id referenced-id}+ :model/Table _ {}+ :model/Transform _ {}+ :model/NativeQuerySnippet _ {}+ :model/Dashboard _ {}+ :model/Document _ {}+ :model/Segment _ {}+ :model/Measure _ {}+ :model/Card _ {:archived true}+ :model/Card _ {:collection_id (personal-collection-id user-id)}+ :model/Dashboard _ {:collection_id personal-child-id}]+ (testing "Counts include the UI's default entity types and personal items, but not archived items"+ (is (= (+ baseline 6)+ (:unreferenced (monitor-counts :crowberto)))))))))++(deftest ^:synchronized counts-params-test+ (mt/with-premium-features #{:dependencies :transforms-basic :hosting}+ (let [cases [[{:types ["card"] :card-types ["question"]} 1]+ [{:types ["table"]} 1]+ [{:types ["card"] :include-personal-collections true} 3]+ [{:types ["card"] :include-personal-collections false} 2]]+ baseline-breaking (list-total :crowberto :breaking (monitor-list-params :breaking))+ baselines (mapv #(list-total :crowberto :unreferenced (first %)) cases)+ baseline-defaults {:breaking (list-total :crowberto :breaking {})+ :unreferenced (list-total :crowberto :unreferenced {})}]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/Card _ {:type :question}+ :model/Card _ {:type :model}+ :model/Table _ {}+ :model/Card _ {:type :question :collection_id (personal-collection-id user-id)}]+ (testing "Each list is counted with its own prefixed params"+ (doseq [[[unreferenced-params increment] baseline] (map vector cases baselines)]+ (testing (pr-str unreferenced-params)+ (is (= {:breaking baseline-breaking :unreferenced (+ baseline increment)}+ (counts :crowberto {:breaking (monitor-list-params :breaking)+ :unreferenced unreferenced-params}))))))+ (testing "Omitted params use the list endpoints' defaults: all unreferenced types, no personal items"+ (is (= {:breaking (:breaking baseline-defaults)+ :unreferenced (+ (:unreferenced baseline-defaults) 3)}+ (mt/user-http-request :crowberto :get 200 "ee/dependencies/counts"))))))))++(deftest ^:synchronized counts-breaking-sources-test+ (mt/with-premium-features #{:dependencies}+ (let [baseline (default-dependency-list-total :crowberto :breaking)]+ (mt/with-temp [:model/Card {source-id :id} {:archived true}+ :model/Table {table-id :id} {}+ :model/Card {dependent-a-id :id} {}+ :model/Card {dependent-b-id :id} {}+ :model/Card {archived-dependent-id :id} {:archived true}+ :model/Card {archived-only-source-id :id} {}+ :model/User {user-id :id} {}+ :model/Card {personal-source-id :id} {:collection_id (personal-collection-id user-id)}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-a-id+ :source_entity_type :card :source_entity_id source-id+ :error_type :missing-column :error_detail "column-a"}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-a-id+ :source_entity_type :card :source_entity_id source-id+ :error_type :missing-column :error_detail "column-b"}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-b-id+ :source_entity_type :card :source_entity_id source-id+ :error_type :missing-column}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-a-id+ :source_entity_type :table :source_entity_id table-id+ :error_type :missing-column}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id archived-dependent-id+ :source_entity_type :card :source_entity_id archived-only-source-id+ :error_type :missing-column}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-a-id+ :source_entity_type :card :source_entity_id personal-source-id+ :error_type :missing-column}]+ (testing "Counts sources, including personal and archived sources still causing errors"+ (is (= (+ baseline 3)+ (:breaking (monitor-counts :crowberto)))))+ (testing "The count agrees with the default table total, including when the table is paginated"+ (is (= (+ baseline 3)+ (default-dependency-list-total :crowberto :breaking :limit 1))))))))++(deftest ^:synchronized counts-unreferenced-default-types-test+ (mt/with-premium-features #{:dependencies :transforms-basic :hosting}+ (let [baseline (default-dependency-list-total :crowberto :unreferenced)]+ (doseq [[model attrs increment] [[:model/Card {:type :question} 1]+ [:model/Card {:type :model} 1]+ [:model/Card {:type :metric} 1]+ [:model/Table {} 1]+ [:model/Segment {} 1]+ [:model/Measure {} 1]+ [:model/NativeQuerySnippet {} 1]+ [:model/Transform {} 0]+ [:model/Dashboard {} 0]+ [:model/Document {} 0]]]+ (testing (str model " " attrs)+ (mt/with-temp [model _ attrs]+ (is (= (+ baseline increment)+ (default-dependency-list-total :crowberto :unreferenced :limit 1)))+ (is (= (+ baseline increment)+ (:unreferenced (monitor-counts :crowberto))))))))))++(deftest ^:synchronized counts-breaking-default-types-test+ (mt/with-premium-features #{:dependencies :transforms-basic :hosting}+ (let [baseline (default-dependency-list-total :crowberto :breaking)]+ (doseq [[model attrs entity-type increment] [[:model/Card {:type :question} :card 1]+ [:model/Card {:type :model} :card 1]+ [:model/Card {:type :metric} :card 0]+ [:model/Table {} :table 1]+ [:model/Transform {} :transform 1]+ [:model/Dashboard {} :dashboard 0]+ [:model/Document {} :document 0]]]+ (testing (str model " " attrs)+ (mt/with-temp [model {source-id :id} attrs+ :model/Card {dependent-id :id} {}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id dependent-id+ :source_entity_type entity-type+ :source_entity_id source-id+ :error_type :missing-column}]+ (is (= (+ baseline increment)+ (default-dependency-list-total :crowberto :breaking :limit 1)))+ (is (= (+ baseline increment)+ (:breaking (monitor-counts :crowberto))))))))))++(deftest ^:synchronized counts-visibility-test+ (mt/with-premium-features #{:dependencies}+ (mt/with-non-admin-groups-no-root-collection-perms+ (let [baseline-unreferenced (default-dependency-list-total :rasta :unreferenced)+ baseline-breaking (default-dependency-list-total :rasta :breaking)]+ (mt/with-temp [:model/Collection visible-collection {}+ :model/Collection hidden-collection {}+ :model/Card {visible-source-id :id} {:collection_id (:id visible-collection)}+ :model/Card {visible-dependent-id :id} {:collection_id (:id visible-collection)}+ :model/Card {hidden-source-id :id} {:collection_id (:id hidden-collection)}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id visible-dependent-id+ :source_entity_type :card :source_entity_id visible-source-id+ :error_type :missing-column}+ :model/AnalysisFindingError _ {:analyzed_entity_type :card+ :analyzed_entity_id visible-dependent-id+ :source_entity_type :card :source_entity_id hidden-source-id+ :error_type :missing-column}]+ (perms/grant-collection-read-permissions! (perms/all-users-group) visible-collection)+ (testing "Non-admin counts are restricted to readable sources and items"+ (is (= {:breaking (inc baseline-breaking) :unreferenced (+ baseline-unreferenced 2)}+ (monitor-counts :rasta))))+ (perms/revoke-collection-permissions! (perms/all-users-group) visible-collection)+ (perms/grant-collection-read-permissions! (perms/all-users-group) hidden-collection)+ (testing "A readable source is not breaking if its only broken dependent is unreadable"+ (is (= {:breaking baseline-breaking :unreferenced (inc baseline-unreferenced)}+ (monitor-counts :rasta)))))))))+(deftest data-analyst-can-access-dependency-graph-test(mt/with-premium-features #{:advanced-permissions :data-studio :dependencies :transforms-basic :hosting}(testing "Data analysts can access dependency diagnostics endpoints"diff --git a/enterprise/backend/test/metabase_enterprise/session_management/api_test.clj b/enterprise/backend/test/metabase_enterprise/session_management/api_test.cljindex cb34f08f4d4..8a8b34f403a 100644--- a/enterprise/backend/test/metabase_enterprise/session_management/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/session_management/api_test.clj@@ -81,6 +81,7 @@(let [message (str "Session management is a paid feature not currently available to your instance. ""Please upgrade to use it. Learn more at metabase.com/upgrade/")](doseq [[method path body] [[:get "ee/session-management"]+ [:get "ee/session-management/counts"][:post "ee/session-management/revoke" {}]]user [:crowberto :rasta]](testing (str method " " path " as " user)@@ -96,6 +97,73 @@(mt/user-http-request :rasta :get 403 "ee/session-management")))(is (map? (mt/user-http-request :crowberto :get 200 "ee/session-management")))))+(deftest counts-permissions-test+ (testing "session counts are superuser-only"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 "ee/session-management/counts")))+ (is (some? (mt/client :get 401 "ee/session-management/counts"))))+ (testing "without the feature counts are unavailable even to a superuser"+ (mt/with-premium-features #{}+ (is (=? {:message some?}+ (mt/user-http-request :crowberto :get 402 "ee/session-management/counts"))))))++(deftest counts-test+ (let [live-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management"))+ ended-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management" :status "ended"))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/AuthIdentity {mcp-id :id} {:user_id user-id :provider "mcp"}]+ (let [revocable (insert-session! user-id)]+ (insert-session! user-id)+ (insert-session! user-id :key_hashed nil :ended_at (ago 1 :hour) :end_reason "logout")+ (insert-session! user-id :expires_at (ago 1 :hour))+ (insert-session! user-id :created_at (ago 30 :day))+ (insert-session! user-id :auth_identity_id mcp-id)+ (insert-session! user-id :auth_identity_id mcp-id :key_hashed nil :ended_at (ago 1 :hour))+ (testing "counts include unswept expiry and max age, exclude MCP, and count sessions rather than users"+ (is (= {:active (+ live-before 2), :ended (+ ended-before 3)}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts"))))+ (testing "table filters and pagination do not narrow the tab populations"+ (is (= {:active (+ live-before 2), :ended (+ ended-before 3)}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts"+ :user-id user-id :status "ended" :query "nobody"+ :limit 1 :offset 100))))+ (testing "revoking a live session moves it to the ended count"+ (mt/user-http-request :crowberto :post 200 "ee/session-management/revoke" {:ids [revocable]})+ (is (= {:active (inc live-before), :ended (+ ended-before 4)}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts"))))))))++(deftest counts-idle-and-deactivated-test+ (mt/with-additional-premium-features #{:session-timeout-config}+ (mt/with-temporary-setting-values [session-timeout {:amount 1 :unit "hours"}]+ (let [live-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management"))+ ended-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management" :status "ended"))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/User {inactive-user :id} {:is_active false}]+ (insert-session! user-id :created_at (ago 2 :hour) :last_active_at (ago 1 :minute))+ (insert-session! user-id :created_at (ago 2 :hour) :last_active_at (ago 2 :hour))+ (insert-session! inactive-user)+ (testing "idle and inactive-user rows are ended before a sweep records their ending"+ (is (= {:active (inc live-before), :ended (+ ended-before 2)}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts")))))))))++(deftest counts-tenancy-test+ (mt/with-additional-premium-features #{:tenants}+ (mt/with-temporary-setting-values [use-tenants true]+ (let [live-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management"))+ ended-before (:total (mt/user-http-request :crowberto :get 200 "ee/session-management" :status "ended"))]+ (mt/with-temp [:model/Tenant {tenant-id :id} {:name "Wren" :slug "wren-counts"}+ :model/User {external :id} {:tenant_id tenant-id}+ :model/User {internal :id} {}]+ (insert-session! external)+ (insert-session! internal)+ (testing "the default population includes internal and external sessions"+ (is (= {:active (+ live-before 2), :ended ended-before}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts"))))+ (t2/update! :model/Tenant tenant-id {:is_active false})+ (testing "an inactive tenant's sessions move to ended"+ (is (= {:active (inc live-before), :ended (inc ended-before)}+ (mt/user-http-request :crowberto :get 200 "ee/session-management/counts")))))))))+(deftest shape-test(testing "each item carries the user, device, and expiry columns — and never the session credential"(mt/with-temp [:model/User {user-id :id} {:first_name "Sess" :last_name "Ion" :email "[email protected]"}]diff --git a/enterprise/frontend/src/metabase-enterprise/api/content-diagnostics.ts b/enterprise/frontend/src/metabase-enterprise/api/content-diagnostics.tsindex bc703756f2a..b258583fdb4 100644--- a/enterprise/frontend/src/metabase-enterprise/api/content-diagnostics.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/content-diagnostics.ts@@ -1,4 +1,5 @@import type {+ ContentDiagnosticsCountsResponse,InvalidateFindingsRequest,InvalidateFindingsResponse,ListDuplicatedFindingsRequest,@@ -16,6 +17,16 @@ import { listTag } from "./tags";export const contentDiagnosticsApi = EnterpriseApi.injectEndpoints({endpoints: (builder) => ({+ getContentDiagnosticsCounts: builder.query<+ ContentDiagnosticsCountsResponse,+ void+ >({+ query: () => ({+ method: "GET",+ url: "/api/ee/content-diagnostics/counts",+ }),+ providesTags: () => [listTag("content-diagnostics-finding")],+ }),invalidateFindings: builder.mutation<InvalidateFindingsResponse,InvalidateFindingsRequest@@ -75,6 +86,7 @@ export const contentDiagnosticsApi = EnterpriseApi.injectEndpoints({});export const {+ useGetContentDiagnosticsCountsQuery,useInvalidateFindingsMutation,useListStaleFindingsQuery,useListSlowFindingsQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts b/enterprise/frontend/src/metabase-enterprise/api/dependencies.tsindex 4de3d88b00a..ac2858e5895 100644--- a/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts@@ -1,6 +1,8 @@import type {+ DependencyCountsResponse,DependencyGraph,DependencyNode,+ GetDependencyCountsRequest,GetDependencyGraphRequest,ListBreakingGraphNodesRequest,ListBreakingGraphNodesResponse,@@ -12,12 +14,27 @@ import type {import { EnterpriseApi } from "./api";import {+ listTag,provideDependencyGraphTags,provideDependencyNodeListTags,} from "./tags";export const dependencyApi = EnterpriseApi.injectEndpoints({endpoints: (builder) => ({+ getDependencyCounts: builder.query<+ DependencyCountsResponse,+ GetDependencyCountsRequest+ >({+ query: (params) => ({+ method: "GET",+ url: "/api/ee/dependencies/counts",+ params,+ }),+ providesTags: () => [+ ...provideDependencyNodeListTags([]),+ listTag("collection"),+ ],+ }),getDependencyGraph: builder.query<DependencyGraph,GetDependencyGraphRequest@@ -81,6 +98,7 @@ export const dependencyApi = EnterpriseApi.injectEndpoints({});export const {+ useGetDependencyCountsQuery,useGetDependencyGraphQuery,useListNodeDependentsQuery,useListBreakingGraphNodesQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/api/session-management.ts b/enterprise/frontend/src/metabase-enterprise/api/session-management.tsindex 217d61e10b6..210ee33f0a9 100644--- a/enterprise/frontend/src/metabase-enterprise/api/session-management.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/session-management.ts@@ -1,6 +1,7 @@import type {RevokeSessionsRequest,RevokeSessionsResponse,+ SessionCountsResponse,SessionListParams,SessionListResponse,} from "metabase-types/api";@@ -20,6 +21,14 @@ export const sessionManagementApi = EnterpriseApi.injectEndpoints({response ? provideSessionListTags(response.data) : [],}),+ getSessionCounts: builder.query<SessionCountsResponse, void>({+ query: () => ({+ method: "GET",+ url: "/api/ee/session-management/counts",+ }),+ providesTags: [listTag("session")],+ }),+revokeSessions: builder.mutation<RevokeSessionsResponse,RevokeSessionsRequest@@ -39,4 +48,5 @@ export const {useListSessionsQuery,useLazyListSessionsQuery,useRevokeSessionsMutation,+ useGetSessionCountsQuery,} = sessionManagementApi;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/components/DashboardHeader/DashboardTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/components/DashboardHeader/DashboardTabs.tsxindex 45b020fb024..dc298b77801 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/components/DashboardHeader/DashboardTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/components/DashboardHeader/DashboardTabs.tsx@@ -45,7 +45,10 @@ export function DashboardTabs({ dashboardId, tabsInfo }: DashboardTabsProps) {{label: t`Subscriptions`,to: subscriptionsUrl,- count: tabsInfo.subscriptionCount,+ count:+ tabsInfo.subscriptionCount === undefined+ ? undefined+ : { status: "loaded", value: tabsInfo.subscriptionCount },isSelected: (pathname) => pathname.startsWith(subscriptionsUrl),},];diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.tsxindex 7dec7492a16..b8174b0f61a 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.tsx@@ -15,6 +15,7 @@ import { useCliHasData } from "metabase-enterprise/monitor/ai-auditing/cli-analyimport { cliUrlStateConfig } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state";import { AiAnalyticsSectionLayout } from "metabase-enterprise/monitor/ai-auditing/components/AiAnalyticsSectionLayout";import { NewQuestionButton } from "metabase-enterprise/monitor/ai-auditing/components/NewQuestionButton";+import { useAuditRowCount } from "metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount";import {ConversationFilters as CliCallsFilter,useFilterOptions,@@ -48,6 +49,7 @@ export function CliAnalyticsSectionLayout() {const hasPii = useSetting("analytics-pii-retention-enabled") === true;const callsAudit = useAuditTable(VIEW_AGENT_API_CALLS);const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);+ const tabCount = useAuditRowCount(callsAudit);const dataSources = useMemo(() => ({@@ -85,6 +87,7 @@ export function CliAnalyticsSectionLayout() {},{label: t`Calls`,+ count: tabCount,to: `${callsPath}${location.search}`,isSelected: (pathname) => pathname === callsPath,},diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsxindex 18f6d7edc55..3d9e344c5a0 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsx@@ -7,6 +7,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { useScrollToTop, useSortingStateChange } from "metabase/common/hooks";import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";import { MonitorTableCard } from "metabase/monitor/components/MonitorTableCard";+import { PAGE_SIZE } from "metabase/monitor/constants";import {Box,Ellipsified,@@ -35,8 +36,6 @@ import type {} from "metabase-lib";import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";-export const EVENTS_PAGE_SIZE = 25;-const DEFAULT_SORTING: SortingOptions<CliEventSortColumn> = {sort_column: "created_at",sort_direction: "desc",@@ -225,11 +224,7 @@ function CliEventsTableInner({],);- const { data, isFetching, error } = useCliEventsQuery(- query,- page,- EVENTS_PAGE_SIZE,- );+ const { data, isFetching, error } = useCliEventsQuery(query, page, PAGE_SIZE);// The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —// not the curated `columns` we render. So we map each curated column to its position in the@@ -313,7 +308,10 @@ function CliEventsTableInner({<TreeTableSkeleton columnWidths={skeletonColumnWidths} />) : (<>- <LoadingOverlay visible={isFetching} />+ <LoadingOverlay+ visible={isFetching}+ data-testid="loading-overlay"+ /><TreeTableinstance={treeTableInstance}hierarchical={false}@@ -329,7 +327,7 @@ function CliEventsTableInner({<Flex justify="flex-end"><PaginationControlspage={page}- pageSize={EVENTS_PAGE_SIZE}+ pageSize={PAGE_SIZE}itemsLength={rows.length}total={total}showTotaldiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.tsnew file mode 100644index 00000000000..78701ef5ce5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.ts@@ -0,0 +1,55 @@+import { useMemo } from "react";++import { skipToken, useGetAdhocQueryQuery } from "metabase/api";+import {+ type TabCountState,+ getTabCount,+} from "metabase/common/components/PillTabNavigation";+import { DEFAULT_DATE_FILTER } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions";+import { applyDateFilter } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils";+import type { useAuditTable } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable";+import * as Lib from "metabase-lib";++export function useAuditRowCount(+ {+ provider,+ table,+ isLoading,+ error: metadataError,+ }: ReturnType<typeof useAuditTable>,+ {+ dateColumn = "created_at",+ }: { dateColumn?: "created_at" | "occurred_at" } = {},+): TabCountState {+ const query = useMemo(() => {+ if (!provider || !table) {+ return null;+ }+ const query = applyDateFilter(+ Lib.queryFromTableOrCardMetadata(provider, table),+ DEFAULT_DATE_FILTER,+ dateColumn,+ );+ // Legacy MBQL has no generated clause UUIDs, so rebuilding this query sends the same request and reuses the cached count.+ return Lib.toLegacyQuery(Lib.aggregateByCount(query, 0));+ }, [provider, table, dateColumn]);+ const { currentData: data, error } = useGetAdhocQueryQuery(+ query ?? skipToken,+ );+ const rows = data?.data?.rows;+ const isEmptyResult = rows !== undefined && rows.length === 0;+ const value = isEmptyResult ? 0 : rows?.[0]?.[0];+ const isValidCount =+ typeof value === "number" && Number.isSafeInteger(value) && value >= 0;+ const isError =+ metadataError != null ||+ error !== undefined ||+ (!isLoading && query === null) ||+ (data !== undefined &&+ (!isValidCount || data.error != null || data.status === "failed"));++ return getTabCount({+ value: isValidCount ? value : undefined,+ isError,+ });+}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.unit.spec.tsxnew file mode 100644index 00000000000..9cf652d8892--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount.unit.spec.tsx@@ -0,0 +1,520 @@+import userEvent from "@testing-library/user-event";+import fetchMock, { type CallLog } from "fetch-mock";++import { setupEnterprisePlugins } from "__support__/enterprise";+import {+ setupAdhocQueryEndpoint,+ setupAdhocQueryMetadataEndpoint,+ setupApiKeyEndpoints,+ setupDatabaseMetadataEndpoint,+ setupDatabaseMetadataErrorEndpoint,+ setupFieldEndpoints,+ setupGroupsEndpoint,+ setupUsersEndpoints,+} from "__support__/server-mocks";+import { mockSettings } from "__support__/settings";+import { createMockState } from "__support__/state";+import {+ act,+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";+import { fieldApi } from "metabase/api";+import { Route } from "metabase/router";+import * as Urls from "metabase/urls";+import { defer } from "metabase/utils/promise";+import { CliAnalyticsSectionLayout } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout";+import { CliCallsPage } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallsPage";+import { McpAnalyticsSectionLayout } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout";+import { McpEventsPage } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsPage";+import { AUDIT_DB_ID } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants";+import { ApiKeyUsageEventsPage } from "metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageEventsPage";+import { ApiKeyUsageSectionLayout } from "metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageSectionLayout";+import type { Dataset, Field, Table } from "metabase-types/api";+import {+ createMockColumn,+ createMockDatabase,+ createMockDataset,+ createMockDatasetData,+ createMockField,+ createMockGroup,+ createMockTable,+ createMockTokenFeatures,+ createMockUser,+} from "metabase-types/api/mocks";++const SECTIONS = [+ {+ label: "Calls",+ tableName: "v_agent_api_calls",+ idColumn: "call_id",+ dateColumn: "created_at",+ displayColumn: "operation",+ eventsPath: Urls.monitorAiAuditingCliCalls(),+ usagePath: Urls.monitorAiAuditingCliUsage(),+ layout: <CliAnalyticsSectionLayout />,+ page: <CliCallsPage />,+ },+ {+ label: "Tool calls",+ tableName: "v_mcp_tool_calls",+ idColumn: "tool_call_id",+ dateColumn: "created_at",+ displayColumn: "tool_name",+ eventsPath: Urls.monitorAiAuditingMcpEvents(),+ usagePath: Urls.monitorAiAuditingMcpUsage(),+ layout: <McpAnalyticsSectionLayout />,+ page: <McpEventsPage />,+ },+ {+ label: "Events",+ tableName: "v_api_key_usage",+ idColumn: "log_id",+ dateColumn: "occurred_at",+ displayColumn: "route_template",+ eventsPath: Urls.monitorApiKeyUsageEvents(),+ usagePath: Urls.monitorApiKeyUsageOverview(),+ layout: <ApiKeyUsageSectionLayout />,+ page: <ApiKeyUsageEventsPage />,+ },+];++type Section = (typeof SECTIONS)[number];+const [CLI_SECTION] = SECTIONS;+const EVENTS_TABLE_ID = 2001;+const GROUP_MEMBERS_TABLE_ID = 2002;+const DATE_FIELD_ID = EVENTS_TABLE_ID * 100 + 1;+const FILTERED_ROUTE_SEARCH =+ "?date=past7days~&user=1&group=2&api_key=9&page=2";++function buildTable(id: number, name: string, fields: Partial<Field>[]): Table {+ return createMockTable({+ id,+ db_id: AUDIT_DB_ID,+ name,+ fields: fields.map((field, index) =>+ createMockField({+ id: id * 100 + index,+ table_id: id,+ display_name: field.name,+ fingerprint: null,+ base_type: "type/Text",+ effective_type: "type/Text",+ ...field,+ }),+ ),+ });+}++function countDataset(count: number): Dataset {+ return createMockDataset({+ database_id: AUDIT_DB_ID,+ row_count: 1,+ data: createMockDatasetData({+ rows: [[count]],+ cols: [createMockColumn({ name: "count", source: "aggregation" })],+ }),+ });+}++function requestBody(call: CallLog | undefined): unknown {+ return typeof call?.options?.body === "string"+ ? JSON.parse(call.options.body)+ : null;+}++function requestStage(call: CallLog | undefined): unknown {+ const body = requestBody(call);+ if (body === null || typeof body !== "object") {+ return null;+ }+ if ("query" in body) {+ return body.query;+ }+ if (!("stages" in body) || !Array.isArray(body.stages)) {+ return null;+ }+ const stages: unknown[] = body.stages;+ return stages[0];+}++function isCounterQuery(call: CallLog): boolean {+ const body = requestBody(call);+ return body !== null && typeof body === "object" && "query" in body;+}++function countCalls() {+ return fetchMock.callHistory.calls("audit-row-count");+}++// TreeTable briefly renders cell text in hidden column-measuring nodes, so wait+// for the rendered row rather than the first matching text.+function findEventRow() {+ return screen.findByRole("row", { name: /Visible event/ });+}++function getTab(section: Section) {+ return screen.getByRole("link", { name: section.label });+}++interface SetupOpts {+ section?: Section;+ getCountResponse?: () => Dataset | Response | Promise<Dataset | Response>;+ missingView?: boolean;+ metadataError?: boolean;+ initialRoute?: string;+ tableTotal?: number;+ getEventsResponse?: () => Dataset | Promise<Dataset>;+}++function setup({+ section = CLI_SECTION,+ getCountResponse = () => countDataset(137),+ missingView = false,+ metadataError = false,+ initialRoute = `${section.eventsPath}${FILTERED_ROUTE_SEARCH}`,+ tableTotal = 3,+ getEventsResponse,+}: SetupOpts = {}) {+ setupEnterprisePlugins();+ mockGetBoundingClientRect({ width: 100, height: 100 });+ const database = createMockDatabase({+ id: AUDIT_DB_ID,+ tables: missingView+ ? []+ : [+ buildTable(EVENTS_TABLE_ID, section.tableName, [+ { name: section.idColumn, semantic_type: "type/PK" },+ {+ name: section.dateColumn,+ base_type: "type/DateTimeWithLocalTZ",+ effective_type: "type/DateTimeWithLocalTZ",+ semantic_type: "type/CreationTimestamp",+ },+ { name: section.displayColumn },+ { name: "status" },+ ...[+ "user_id",+ "tenant_id",+ "api_key_id",+ "creator_id",+ "actor_user_id",+ ].map((name) => ({+ name,+ base_type: "type/Integer" as const,+ effective_type: "type/Integer" as const,+ })),+ ]),+ buildTable(GROUP_MEMBERS_TABLE_ID, "v_group_members", [+ {+ name: "user_id",+ base_type: "type/Integer",+ effective_type: "type/Integer",+ },+ {+ name: "group_id",+ base_type: "type/Integer",+ effective_type: "type/Integer",+ },+ { name: "group_name" },+ ]),+ ],+ });+ if (metadataError) {+ setupDatabaseMetadataErrorEndpoint(AUDIT_DB_ID);+ } else {+ setupDatabaseMetadataEndpoint(database);+ }+ setupAdhocQueryMetadataEndpoint({+ databases: [database],+ tables: database.tables ?? [],+ fields: database.tables?.flatMap((table) => table.fields ?? []) ?? [],+ });+ setupUsersEndpoints([createMockUser({ id: 1 })]);+ setupGroupsEndpoint([createMockGroup({ id: 1 }), createMockGroup({ id: 2 })]);+ setupApiKeyEndpoints([]);+ setupAdhocQueryEndpoint(getCountResponse, {+ name: "audit-row-count",+ matcherFunction: isCounterQuery,+ });+ const filteredDataset = createMockDataset({+ database_id: AUDIT_DB_ID,+ row_count: 1,+ data: createMockDatasetData({+ rows: [[tableTotal, "Visible event"]],+ cols: [+ createMockColumn({ name: "count", source: "aggregation" }),+ createMockColumn({ name: section.displayColumn, source: "fields" }),+ ],+ }),+ });+ setupAdhocQueryEndpoint(+ (call) => {+ const stage = requestStage(call);+ const isRowPage =+ stage !== null && typeof stage === "object" && "page" in stage;+ return getEventsResponse && isRowPage+ ? getEventsResponse()+ : filteredDataset;+ },+ { name: "filtered-dataset" },+ );++ return renderWithProviders(+ <>+ <Route element={section.layout}>+ <Route path={section.eventsPath} element={section.page} />+ <Route path={section.usagePath} element={<div />} />+ </Route>+ <Route path="/outside" element={<div>Outside analytics</div>} />+ </>,+ {+ withRouter: true,+ initialRoute,+ storeInitialState: createMockState({+ settings: mockSettings({+ "token-features": createMockTokenFeatures({ audit_app: true }),+ }),+ }),+ },+ );+}++describe.each(SECTIONS)("$label tab count", (section) => {+ it("counts the default 30-day population, ignoring optional filters", async () => {+ setup({ section });++ expect(await within(getTab(section)).findByText("137")).toBeVisible();+ expect(+ within(screen.getByRole("link", { name: "Usage" })).queryByText("137"),+ ).not.toBeInTheDocument();+ expect(await findEventRow()).toBeVisible();+ expect(countCalls()).toHaveLength(1);+ const stage = requestStage(countCalls()[0]);+ expect(stage).toEqual(+ expect.objectContaining({+ "source-table": EVENTS_TABLE_ID,+ aggregation: [["count"]],+ filter: [+ "time-interval",+ ["field", DATE_FIELD_ID, expect.anything()],+ -29,+ "day",+ { "include-current": true },+ ],+ }),+ );+ for (const key of ["joins", "page", "limit", "breakout", "order-by"]) {+ expect(stage).not.toHaveProperty(key);+ }+ });++ it("matches the unfiltered table's date window and total", async () => {+ setup({ section, initialRoute: section.eventsPath, tableTotal: 137 });++ expect(await within(getTab(section)).findByText("137")).toBeVisible();+ expect(await screen.findByTestId("pagination-total")).toHaveTextContent(+ "137",+ );+ const totalStage = fetchMock.callHistory+ .calls("filtered-dataset")+ .map(requestStage)+ .find(+ (stage) =>+ stage !== null &&+ typeof stage === "object" &&+ "aggregation" in stage &&+ !("page" in stage),+ );+ expect(totalStage).toEqual(+ expect.objectContaining({+ "source-table": EVENTS_TABLE_ID,+ filters: [+ [+ "time-interval",+ expect.objectContaining({ "include-current": true }),+ ["field", expect.anything(), DATE_FIELD_ID],+ -29,+ "day",+ ],+ ],+ }),+ );+ expect(totalStage).not.toHaveProperty("joins");+ });+});++describe("audit tab count freshness and failures", () => {+ it("shows 0 when a successful count returns no rows", async () => {+ setup({+ getCountResponse: () =>+ createMockDataset({+ database_id: AUDIT_DB_ID,+ row_count: 0,+ data: createMockDatasetData({+ rows: [],+ cols: [createMockColumn({ name: "count", source: "aggregation" })],+ }),+ }),+ });+ expect(await within(getTab(CLI_SECTION)).findByText("0")).toBeVisible();+ });++ it("shows a zero count rather than hiding it", async () => {+ setup({ getCountResponse: () => countDataset(0) });+ expect(await within(getTab(CLI_SECTION)).findByText("0")).toBeVisible();+ expect(+ within(getTab(CLI_SECTION)).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument();+ });++ it("keeps the table and navigation usable while the count is pending", async () => {+ const pending = defer<Dataset>();+ setup({ getCountResponse: () => pending.promise });+ expect(await findEventRow()).toBeVisible();+ await userEvent.click(screen.getByRole("link", { name: "Usage" }));+ expect(screen.getByRole("link", { name: "Usage" })).toHaveAttribute(+ "aria-current",+ "page",+ );+ await act(async () => pending.resolve(countDataset(137)));+ expect(await within(getTab(CLI_SECTION)).findByText("137")).toBeVisible();+ });++ it("does not refetch for optional filters or pages, but refreshes on section entry", async () => {+ let count = 137;+ const { router } = setup({ getCountResponse: () => countDataset(count) });+ expect(await within(getTab(CLI_SECTION)).findByText("137")).toBeVisible();++ act(() =>+ router?.navigate(+ `${CLI_SECTION.eventsPath}?date=past30days~&user=1&group=2&page=3`,+ ),+ );+ await waitFor(() =>+ expect(+ fetchMock.callHistory.calls("filtered-dataset").map(requestStage),+ ).toEqual(+ expect.arrayContaining([+ expect.objectContaining({+ page: expect.objectContaining({ page: 4 }),+ }),+ ]),+ ),+ );+ expect(countCalls()).toHaveLength(1);++ act(() => router?.navigate("/outside"));+ await screen.findByText("Outside analytics");+ count = 139;+ act(() => router?.navigate(CLI_SECTION.eventsPath));+ expect(await within(getTab(CLI_SECTION)).findByText("139")).toBeVisible();+ expect(countCalls()).toHaveLength(2);+ });++ it("refreshes after an audit metadata mutation invalidates ad-hoc datasets", async () => {+ const pending = defer<Dataset>();+ let calls = 0;+ const { store } = setup({+ getCountResponse: () =>+ ++calls === 1 ? countDataset(137) : pending.promise,+ });+ setupFieldEndpoints(createMockField({ id: EVENTS_TABLE_ID * 100 }));+ expect(await within(getTab(CLI_SECTION)).findByText("137")).toBeVisible();+ await act(async () => {+ await store+ .dispatch(+ fieldApi.endpoints.updateField.initiate({+ id: EVENTS_TABLE_ID * 100,+ description: "Audit event identifier",+ }),+ )+ .unwrap();+ });+ await waitFor(() => expect(countCalls()).toHaveLength(2));+ expect(within(getTab(CLI_SECTION)).getByText("137")).toBeVisible();+ await act(async () => pending.resolve(countDataset(138)));+ expect(await within(getTab(CLI_SECTION)).findByText("138")).toBeVisible();+ });++ it.each([+ { name: "negative scalar", response: countDataset(-1) },+ {+ name: "failed dataset",+ response: createMockDataset({+ ...countDataset(137),+ error: "Query failed",+ status: "failed",+ }),+ },+ { name: "HTTP error", response: new Response(null, { status: 500 }) },+ ])("hides a $name count without blocking the table", async ({ response }) => {+ setup({ getCountResponse: () => response });+ expect(await findEventRow()).toBeVisible();+ await waitFor(() => expect(countCalls()).toHaveLength(1));+ await waitFor(() =>+ expect(+ within(getTab(CLI_SECTION)).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument(),+ );+ expect(getTab(CLI_SECTION)).toHaveTextContent(/^Calls$/);+ });++ it.each([{ missingView: true }, { metadataError: true }])(+ "hides the count without querying when audit metadata is unavailable: %j",+ async (options) => {+ setup(options);+ await waitFor(() =>+ expect(+ fetchMock.callHistory.called(`database-${AUDIT_DB_ID}-metadata`),+ ).toBe(true),+ );+ await waitFor(() =>+ expect(+ within(getTab(CLI_SECTION)).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument(),+ );+ expect(getTab(CLI_SECTION)).toHaveTextContent(/^Calls$/);+ expect(countCalls()).toHaveLength(0);+ },+ );+});++// Audit tables load rows through ad-hoc dataset queries rather than an RTK list+// endpoint, so the CLI Calls grid covers that loading path for all three.+describe("CLI Calls grid loading", () => {+ it("shows a skeleton only initially and keeps rows under the loader while paging", async () => {+ const initial = defer<Dataset>();+ const pending = defer<Dataset>();+ const page = (name: string) =>+ createMockDataset({+ data: createMockDatasetData({+ rows: [[name]],+ cols: [createMockColumn({ name: CLI_SECTION.displayColumn })],+ }),+ });+ let requests = 0;+ setup({+ initialRoute: CLI_SECTION.eventsPath,+ tableTotal: 26,+ getEventsResponse: () =>+ ++requests === 1 ? initial.promise : pending.promise,+ });+ expect(await screen.findByTestId("tree-table-skeleton")).toBeVisible();+ expect(screen.queryByRole("treegrid")).not.toBeInTheDocument();+ await act(async () => initial.resolve(page("First event")));+ await screen.findByText("First event");+ await userEvent.click(screen.getByLabelText("Next page"));+ await waitFor(() => expect(requests).toBe(2));+ expect(screen.getByText("First event")).toBeVisible();+ expect(screen.getByTestId("loading-overlay")).toBeVisible();+ expect(screen.queryByTestId("tree-table-skeleton")).not.toBeInTheDocument();+ expect(screen.getByTestId("pagination-total")).toHaveTextContent("26");+ await act(async () => pending.resolve(page("Next event")));+ expect(await screen.findByText("Next event")).toBeVisible();+ expect(screen.queryByText("First event")).not.toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.tsxindex c93a00678e7..b91ded9e8ab 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.tsx@@ -9,6 +9,7 @@ import { useSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { AiAnalyticsSectionLayout } from "metabase-enterprise/monitor/ai-auditing/components/AiAnalyticsSectionLayout";import { NewQuestionButton } from "metabase-enterprise/monitor/ai-auditing/components/NewQuestionButton";+import { useAuditRowCount } from "metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount";import {VIEW_GROUP_MEMBERS,VIEW_MCP_TOOL_CALLS,@@ -48,6 +49,7 @@ export function McpAnalyticsSectionLayout() {const hasPii = useSetting("analytics-pii-retention-enabled") === true;const toolCallsAudit = useAuditTable(VIEW_MCP_TOOL_CALLS);const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);+ const tabCount = useAuditRowCount(toolCallsAudit);const dataSources = useMemo(() => ({@@ -85,6 +87,7 @@ export function McpAnalyticsSectionLayout() {},{label: t`Tool calls`,+ count: tabCount,to: `${eventsPath}${location.search}`,isSelected: (pathname) => pathname === eventsPath,},diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsxindex c98c32e6265..62a70c353f9 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx@@ -133,7 +133,7 @@ const datasetResponse: Dataset = createMockDataset({});// A count/breakout dataset whose scalar count (rows[0][0]) exceeds one page, so the events-// table's pagination controls appear (total > EVENTS_PAGE_SIZE of 25).+// table's pagination controls appear (total > PAGE_SIZE of 25).const multiPageDatasetResponse: Dataset = createMockDataset({data: createMockDatasetData({rows: [diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsxindex cb5bef2831b..ba74e7dfc8f 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsx@@ -7,6 +7,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { useScrollToTop, useSortingStateChange } from "metabase/common/hooks";import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";import { MonitorTableCard } from "metabase/monitor/components/MonitorTableCard";+import { PAGE_SIZE } from "metabase/monitor/constants";import {Box,Flex,@@ -34,8 +35,6 @@ import type {} from "metabase-lib";import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";-export const EVENTS_PAGE_SIZE = 25;-const DEFAULT_SORTING: SortingOptions<McpEventSortColumn> = {sort_column: "created_at",sort_direction: "desc",@@ -224,11 +223,7 @@ function McpEventsTableInner({],);- const { data, isFetching, error } = useMcpEventsQuery(- query,- page,- EVENTS_PAGE_SIZE,- );+ const { data, isFetching, error } = useMcpEventsQuery(query, page, PAGE_SIZE);// The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —// not the curated `columns` we render. So we map each curated column to its position in the@@ -313,7 +308,10 @@ function McpEventsTableInner({<TreeTableSkeleton columnWidths={skeletonColumnWidths} />) : (<>- <LoadingOverlay visible={isFetching} />+ <LoadingOverlay+ visible={isFetching}+ data-testid="loading-overlay"+ /><TreeTableinstance={treeTableInstance}hierarchical={false}@@ -329,7 +327,7 @@ function McpEventsTableInner({<Flex justify="flex-end"><PaginationControlspage={page}- pageSize={EVENTS_PAGE_SIZE}+ pageSize={PAGE_SIZE}itemsLength={rows.length}total={total}showTotaldiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsxindex b909484ae85..5e492a1bd26 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx@@ -6,6 +6,7 @@ import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { useUrlState } from "metabase/common/hooks/use-url-state";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useLocation } from "metabase/router";import { Flex } from "metabase/ui";import { useLazyListMetabotAnalyticsConversationsQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/api";@@ -15,7 +16,7 @@ import {} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters";import { ConversationsTable } from "./ConversationsTable";-import { PAGE_SIZE, urlStateConfig } from "./utils";+import { urlStateConfig } from "./utils";export function ConversationsPage() {const location = useLocation();diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.tsindex 39f53fdd6ea..20e043f2657 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.ts@@ -16,8 +16,6 @@ import {mergeUrlStateConfig,} from "../ConversationFilters/url-state";-export const PAGE_SIZE = 25;-const DEFAULT_SORT_COLUMN: ConversationSortColumn = "created_at";const DEFAULT_SORT_DIRECTION: SortDirection = "desc";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageEventsTable.tsxindex 9b291f961b9..1dc7d7555c2 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageEventsTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageEventsTable.tsx@@ -7,6 +7,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { useScrollToTop, useSortingStateChange } from "metabase/common/hooks";import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";import { MonitorTableCard } from "metabase/monitor/components/MonitorTableCard";+import { PAGE_SIZE } from "metabase/monitor/constants";import {Box,Ellipsified,@@ -35,8 +36,6 @@ import type {} from "metabase-lib";import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";-export const EVENTS_PAGE_SIZE = 25;-const DEFAULT_SORTING: SortingOptions<ApiKeyUsageEventSortColumn> = {sort_column: "occurred_at",sort_direction: "desc",@@ -232,7 +231,7 @@ function ApiKeyUsageEventsTableInner({const { data, isFetching, error } = useApiKeyUsageEventsQuery(query,page,- EVENTS_PAGE_SIZE,+ PAGE_SIZE,);// The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —@@ -324,7 +323,10 @@ function ApiKeyUsageEventsTableInner({<TreeTableSkeleton columnWidths={skeletonColumnWidths} />) : (<>- <LoadingOverlay visible={isFetching} />+ <LoadingOverlay+ visible={isFetching}+ data-testid="loading-overlay"+ /><TreeTableinstance={treeTableInstance}hierarchical={false}@@ -340,7 +342,7 @@ function ApiKeyUsageEventsTableInner({<Flex justify="flex-end"><PaginationControlspage={page}- pageSize={EVENTS_PAGE_SIZE}+ pageSize={PAGE_SIZE}itemsLength={rows.length}total={total}showTotaldiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageSectionLayout.tsxindex 2f13a0a9f61..ee21b2f4cb9 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/api-key-usage/components/ApiKeyUsageSectionLayout.tsx@@ -16,6 +16,7 @@ import { useSetting } from "metabase/settings";import { Flex, Loader, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import { NewQuestionButton } from "metabase-enterprise/monitor/ai-auditing/components/NewQuestionButton";+import { useAuditRowCount } from "metabase-enterprise/monitor/ai-auditing/hooks/useAuditRowCount";import {ConversationFilters as ApiKeyUsageFilterBar,parseId,@@ -98,6 +99,7 @@ export function ApiKeyUsageSectionLayout() {const hasPii = useSetting("analytics-pii-retention-enabled") === true;const usageAudit = useAuditTable(VIEW_API_KEY_USAGE);const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);+ const tabCount = useAuditRowCount(usageAudit, { dateColumn: "occurred_at" });const dataSources = useMemo(() => ({@@ -144,6 +146,7 @@ export function ApiKeyUsageSectionLayout() {},{label: t`Events`,+ count: tabCount,to: `${eventsPath}${location.search}`,isSelected: (pathname) => pathname === eventsPath,},diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsContent.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsContent.tsxindex 1574afe0947..bffe2248c45 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsContent.tsx@@ -12,9 +12,9 @@ import {import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Center, Flex } from "metabase/ui";import type { Sorting } from "metabase/utils/sorting";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";import type {ContentDiagnosticsBaseFinding,ContentDiagnosticsFilterType,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsxindex ce1617a5262..b8be02c91bd 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx@@ -4,28 +4,35 @@ import { c, t } from "ttag";import {type PillTab,PillTabNavigation,+ getTabCount,} from "metabase/common/components/PillTabNavigation";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { Group, Icon, Stack, Text, Tooltip, UnstyledButton } from "metabase/ui";import * as Urls from "metabase/urls";+import { useGetContentDiagnosticsCountsQuery } from "metabase-enterprise/api/content-diagnostics";export const DiagnosticsHeader = memo(function DiagnosticsHeader() {+ const { currentData: counts, isError } =+ useGetContentDiagnosticsCountsQuery();const tabs: PillTab[] = [{label: c("Navigation tab for content that hasn't been used recently").t`Stale`,to: Urls.staleContent(),icon: "clock",+ count: getTabCount({ value: counts?.stale, isError }),},{label: c("Navigation tab for duplicated content").t`Duplicated`,to: Urls.duplicatedContent(),icon: "copy",+ count: getTabCount({ value: counts?.duplicated, isError }),},{label: c("Navigation tab for slow-loading content").t`Slow`,to: Urls.slowContent(),icon: "gauge",+ count: getTabCount({ value: counts?.slow, isError }),},{label: c(@@ -33,16 +40,19 @@ export const DiagnosticsHeader = memo(function DiagnosticsHeader() {).t`Empty`,to: Urls.imbalancedContent("empty"),icon: "unreferenced",+ count: getTabCount({ value: counts?.empty, isError }),},{label: c("Navigation tab for content with very few items").t`Sparse`,to: Urls.imbalancedContent("sparse"),icon: "layout_grid",+ count: getTabCount({ value: counts?.sparse, isError }),},{label: c("Navigation tab for content with too many items").t`Crowded`,to: Urls.imbalancedContent("crowded"),icon: "grid_bordered",+ count: getTabCount({ value: counts?.crowded, isError }),},];diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsxindex 016a80550f1..ac08eb71d68 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx@@ -1,6 +1,6 @@import { PaginationControls } from "metabase/common/components/PaginationControls";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Flex } from "metabase/ui";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";type DiagnosticsPaginationProps = {page: number;diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DuplicatedContent.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DuplicatedContent.tsxindex 2eace43c57e..e98b2186562 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DuplicatedContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DuplicatedContent.tsx@@ -1,5 +1,5 @@+import { PAGE_SIZE } from "metabase/monitor/constants";import { useListDuplicatedFindingsQuery } from "metabase-enterprise/api";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";import {type DuplicatedContentParams,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ImbalancedContent.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ImbalancedContent.tsxindex 23aaf35723f..01b9a76deb0 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ImbalancedContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ImbalancedContent.tsx@@ -1,5 +1,5 @@+import { PAGE_SIZE } from "metabase/monitor/constants";import { useListImbalancedFindingsQuery } from "metabase-enterprise/api";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";import type { ContentDiagnosticsImbalancedFindingType } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/SlowContent.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/SlowContent.tsxindex e0c4481d2d7..1b1520c66ed 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/SlowContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/SlowContent.tsx@@ -1,5 +1,5 @@+import { PAGE_SIZE } from "metabase/monitor/constants";import { useListSlowFindingsQuery } from "metabase-enterprise/api";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";import { type SlowContentParams, slowContentConfig } from "../config";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/StaleContent.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/StaleContent.tsxindex 27cee46252d..012477dfb10 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/StaleContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/StaleContent.tsx@@ -1,5 +1,5 @@+import { PAGE_SIZE } from "metabase/monitor/constants";import { useListStaleFindingsQuery } from "metabase-enterprise/api";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";import { type StaleContentParams, staleContentConfig } from "../config";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/DuplicatedContentPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/DuplicatedContentPage.unit.spec.tsxindex 801b341752f..83b7a8582a2 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/DuplicatedContentPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/DuplicatedContentPage.unit.spec.tsx@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import {+ setupContentDiagnosticsCountsEndpoint,setupListDuplicatedFindingsEndpoint,setupUserKeyValueEndpoints,} from "__support__/server-mocks";@@ -90,6 +91,7 @@ function setup({value: lastUsedParams,});+ setupContentDiagnosticsCountsEndpoint();mockGetBoundingClientRect({ width: 100, height: 100 });const { router } = renderWithProviders(diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/ImbalancedContentPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/ImbalancedContentPage.unit.spec.tsxindex 9e77917879b..0e560b7d870 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/ImbalancedContentPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/ImbalancedContentPage.unit.spec.tsx@@ -3,6 +3,7 @@ import fetchMock from "fetch-mock";import type { ComponentType } from "react";import {+ setupContentDiagnosticsCountsEndpoint,setupInvalidateFindingsEndpoint,setupListImbalancedFindingsEndpoint,setupUserKeyValueEndpoints,@@ -109,6 +110,7 @@ function setup({value: lastUsedParams,});+ setupContentDiagnosticsCountsEndpoint();mockGetBoundingClientRect({ width: 100, height: 100 });const Page = PAGE_BY_MODE[mode];diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/SlowContentPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/SlowContentPage.unit.spec.tsxindex fee6591ace0..88a56eb3f2d 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/SlowContentPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/SlowContentPage.unit.spec.tsx@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import {+ setupContentDiagnosticsCountsEndpoint,setupListSlowFindingsEndpoint,setupUserKeyValueEndpoints,} from "__support__/server-mocks";@@ -89,6 +90,7 @@ function setup({value: lastUsedParams,});+ setupContentDiagnosticsCountsEndpoint();mockGetBoundingClientRect({ width: 100, height: 100 });const { router } = renderWithProviders(diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/StaleContentPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/StaleContentPage.unit.spec.tsxindex 804d13a7f23..7f2cfadaac7 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/StaleContentPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/pages/StaleContentPage.unit.spec.tsx@@ -3,6 +3,7 @@ import fetchMock from "fetch-mock";import {setupCardEndpoints,+ setupContentDiagnosticsCountsEndpoint,setupInvalidateFindingsEndpoint,setupListStaleFindingsEndpoint,setupUpdateCardEndpointWithError,@@ -10,6 +11,7 @@ import {} from "__support__/server-mocks";import {type TestRouter,+ act,mockGetBoundingClientRect,renderWithProviders,screen,@@ -97,6 +99,7 @@ function setup({value: lastUsedParams,});+ setupContentDiagnosticsCountsEndpoint();mockGetBoundingClientRect({ width: 100, height: 100 });const { router, store } = renderWithProviders(@@ -160,6 +163,46 @@ describe("StaleContentPage", () => {expect(within(list).getByText("Marketing funnel")).toBeInTheDocument();});+ it("shows a skeleton only initially and keeps rows under the loader while paging", async () => {+ const pending = defer<ListStaleFindingsResponse>();+ const firstPage = createMockListStaleFindingsResponse({+ data: [+ createMockContentDiagnosticsStaleFinding({+ id: 1,+ entity_display_name: "First page finding",+ }),+ ],+ total: 26,+ });+ const nextPage = createMockListStaleFindingsResponse({+ data: [+ createMockContentDiagnosticsStaleFinding({+ id: 26,+ entity_display_name: "Next page finding",+ }),+ ],+ total: 26,+ });+ setup({+ getResponse: (url) =>+ new URL(url).searchParams.get("offset") === "25"+ ? pending.promise+ : firstPage,+ });+ expect(screen.getByTestId("tree-table-skeleton")).toBeVisible();+ await screen.findByText("First page finding");+ await userEvent.click(screen.getByLabelText("Next page"));+ await waitFor(() =>+ expect(screen.getByTestId("loading-overlay")).toBeVisible(),+ );+ expect(screen.getByText("First page finding")).toBeVisible();+ expect(screen.queryByTestId("tree-table-skeleton")).not.toBeInTheDocument();+ expect(screen.getByTestId("pagination-total")).toHaveTextContent("26");+ await act(async () => pending.resolve(nextPage));+ expect(await screen.findByText("Next page finding")).toBeVisible();+ expect(screen.queryByText("First page finding")).not.toBeInTheDocument();+ });+it("shows an empty state when there are no findings", async () => {setup({ findings: [] });diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/routes.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/routes.unit.spec.tsxnew file mode 100644index 00000000000..dee7a52bf2e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/routes.unit.spec.tsx@@ -0,0 +1,261 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";++import {+ setupContentDiagnosticsCountsEndpoint,+ setupContentDiagnosticsCountsErrorEndpoint,+ setupInvalidateFindingsEndpoint,+ setupListDuplicatedFindingsEndpoint,+ setupListImbalancedFindingsEndpoint,+ setupListSlowFindingsEndpoint,+ setupListStaleFindingsEndpoint,+ setupUserKeyValueEndpoints,+} from "__support__/server-mocks";+import {+ act,+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";+import { MonitorContent } from "metabase/monitor/components/MonitorLayout/MonitorContent";+import { Outlet, Route } from "metabase/router";+import * as Urls from "metabase/urls";+import { defer } from "metabase/utils/promise";+import type {+ ContentDiagnosticsCountsResponse,+ ContentDiagnosticsStaleFinding,+} from "metabase-types/api";+import {+ createMockContentDiagnosticsStaleFinding,+ createMockListDuplicatedFindingsResponse,+ createMockListImbalancedFindingsResponse,+ createMockListSlowFindingsResponse,+ createMockListStaleFindingsResponse,+ createMockUser,+} from "metabase-types/api/mocks";++import { getContentDiagnosticsRoutes } from "./routes";++const COUNTS: ContentDiagnosticsCountsResponse = {+ stale: 137,+ duplicated: 11,+ slow: 23,+ empty: 1,+ sparse: 6,+ crowded: 2,+};++interface SetupOpts {+ countsError?: boolean;+ findings?: ContentDiagnosticsStaleFinding[];+ total?: number;+ initialRoute?: string;+ getCounts?: () =>+ | ContentDiagnosticsCountsResponse+ | Promise<ContentDiagnosticsCountsResponse>;+}++function setup({+ getCounts = () => COUNTS,+ countsError = false,+ findings = [],+ total = findings.length,+ initialRoute = Urls.staleContent(),+}: SetupOpts = {}) {+ if (countsError) {+ setupContentDiagnosticsCountsErrorEndpoint();+ } else {+ setupContentDiagnosticsCountsEndpoint(getCounts, {+ name: "content-counts",+ });+ }+ setupListStaleFindingsEndpoint(+ createMockListStaleFindingsResponse({ data: findings, total }),+ );+ setupListDuplicatedFindingsEndpoint(+ createMockListDuplicatedFindingsResponse({ data: [], total: 0 }),+ );+ setupListSlowFindingsEndpoint(+ createMockListSlowFindingsResponse({ data: [], total: 0 }),+ );+ setupListImbalancedFindingsEndpoint(+ createMockListImbalancedFindingsResponse({ data: [], total: 0 }),+ );+ for (const key of [+ "stale",+ "duplicated",+ "slow",+ "empty",+ "sparse",+ "crowded",+ ] as const) {+ setupUserKeyValueEndpoints({+ namespace: "content_diagnostics",+ key,+ value: {},+ });+ }+ mockGetBoundingClientRect({ width: 100, height: 100 });++ return renderWithProviders(+ <Route+ path={Urls.contentDiagnostics()}+ element={+ <MonitorContent>+ <Outlet />+ </MonitorContent>+ }+ >+ {getContentDiagnosticsRoutes()}+ </Route>,+ {+ withRouter: true,+ initialRoute,+ storeInitialState: { currentUser: createMockUser() },+ },+ );+}++const getCountCalls = () =>+ fetchMock.callHistory.calls("path:/api/ee/content-diagnostics/counts");+const getTab = (name: string) => screen.getByRole("link", { name });++async function switchTab(name: string, emptyState: string) {+ await userEvent.click(getTab(name));+ expect(await screen.findByText(emptyState)).toBeVisible();+ expect(getTab(name)).toHaveAttribute("aria-current", "page");+}++async function visitAllTabs() {+ await switchTab("Duplicated", "No duplicated content found");+ await switchTab("Slow", "No slow content found");+ await switchTab("Empty", "No empty content found");+ await switchTab("Sparse", "No sparse content found");+ await switchTab("Crowded", "No crowded content found");+ await switchTab("Stale", "No stale content found");+}++describe("content diagnostics section counts", () => {+ it("maps all six default populations and reuses counts and cached findings across tab cycles", async () => {+ setup();+ expect(await screen.findByText("No stale content found")).toBeVisible();+ expect(await within(getTab("Stale")).findByText("137")).toBeVisible();+ expect(within(getTab("Duplicated")).getByText("11")).toBeVisible();+ expect(within(getTab("Slow")).getByText("23")).toBeVisible();+ expect(within(getTab("Empty")).getByText("1")).toBeVisible();+ expect(within(getTab("Sparse")).getByText("6")).toBeVisible();+ expect(within(getTab("Crowded")).getByText("2")).toBeVisible();++ await visitAllTabs();+ await visitAllTabs();++ expect(getCountCalls()).toHaveLength(1);+ for (const path of ["stale", "duplicated", "slow"]) {+ expect(+ fetchMock.callHistory.calls(`path:/api/ee/content-diagnostics/${path}`),+ ).toHaveLength(1);+ }+ expect(+ fetchMock.callHistory.calls(+ "path:/api/ee/content-diagnostics/imbalanced",+ ),+ ).toHaveLength(3);+ });++ it("keeps filtered and paginated findings independent of default counts", async () => {+ setup({+ findings: [+ createMockContentDiagnosticsStaleFinding({+ entity_display_name: "Sales overview",+ }),+ ],+ total: 60,+ initialRoute: `${Urls.staleContent()}?page=1&query=Sales&threshold-days=90&include-personal-collections=false`,+ });+ expect(await screen.findByText("Sales overview")).toBeVisible();+ expect(await within(getTab("Stale")).findByText("137")).toBeVisible();+ const calls = getCountCalls();+ expect(calls).toHaveLength(1);+ expect(new URL(calls[0].url).search).toBe("");+ const listCalls = fetchMock.callHistory.calls(+ "path:/api/ee/content-diagnostics/stale",+ );+ expect(listCalls).toHaveLength(1);+ const params = new URL(listCalls[0].url).searchParams;+ expect(params.get("query")).toBe("Sales");+ expect(params.get("offset")).toBe("25");+ expect(params.get("limit")).toBe("25");+ expect(params.get("threshold-days")).toBe("90");+ expect(params.get("include-personal-collections")).toBe("false");+ });++ it("keeps navigation working and hides badges when counts fail", async () => {+ setup({ countsError: true });+ expect(await screen.findByText("No stale content found")).toBeVisible();+ await waitFor(() =>+ expect(+ fetchMock.callHistory.done("path:/api/ee/content-diagnostics/counts"),+ ).toBe(true),+ );+ await visitAllTabs();+ await waitFor(() =>+ expect(+ within(getTab("Stale")).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument(),+ );+ expect(getTab("Stale")).toHaveTextContent(/^Stale$/);+ });++ it("retains counts across tab changes during a dismissal-triggered refresh", async () => {+ const pendingCounts = defer<ContentDiagnosticsCountsResponse>();+ setupInvalidateFindingsEndpoint({ invalidated: [1], skipped: [] });+ setup({+ findings: [+ createMockContentDiagnosticsStaleFinding({+ id: 1,+ entity_display_name: "Stale question",+ }),+ ],+ });+ expect(await screen.findByText("Stale question")).toBeVisible();+ expect(await within(getTab("Stale")).findByText("137")).toBeVisible();+ fetchMock.modifyRoute("content-counts", {+ response: () => pendingCounts.promise,+ });+ await userEvent.click(screen.getByLabelText("Select all"));+ await userEvent.click(+ screen.getByRole("button", { name: "Dismiss finding" }),+ );+ await userEvent.click(+ within(await screen.findByRole("dialog")).getByRole("button", {+ name: "Dismiss finding",+ }),+ );+ await waitFor(() => expect(getCountCalls()).toHaveLength(2));+ const calls = fetchMock.callHistory.calls(+ "path:/api/ee/content-diagnostics/invalidate",+ );+ expect(calls).toHaveLength(1);+ const body: unknown = await calls[0].request?.json();+ expect(body).toEqual({ ids: [1] });+ await switchTab("Duplicated", "No duplicated content found");+ expect(within(getTab("Stale")).getByText("137")).toBeVisible();+ await act(async () => pendingCounts.resolve({ ...COUNTS, stale: 136 }));+ expect(await within(getTab("Stale")).findByText("136")).toBeVisible();+ expect(getCountCalls()).toHaveLength(2);+ });++ it("shares the pending count request without blocking tab navigation", async () => {+ const pendingCounts = defer<ContentDiagnosticsCountsResponse>();+ setup({ getCounts: () => pendingCounts.promise });+ expect(await screen.findByText("No stale content found")).toBeVisible();+ await visitAllTabs();+ expect(getCountCalls()).toHaveLength(1);+ await act(async () => pendingCounts.resolve(COUNTS));+ expect(await within(getTab("Stale")).findByText("137")).toBeVisible();+ await switchTab("Duplicated", "No duplicated content found");+ expect(getCountCalls()).toHaveLength(1);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DependencyDiagnostics.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DependencyDiagnostics.tsxindex 8e68e407544..0e8890c3094 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DependencyDiagnostics.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DependencyDiagnostics.tsx@@ -6,23 +6,18 @@ import { trackDependencyDiagnosticsEntitySelected } from "metabase/common/data-simport { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Center, Flex } from "metabase/ui";import type * as Urls from "metabase/urls";import {useLazyListBreakingGraphNodesQuery,useLazyListUnreferencedGraphNodesQuery,} from "metabase-enterprise/api";-import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "metabase-enterprise/dependencies/constants";import type {DependencyFilterOptions,DependencySortOptions,} from "metabase-enterprise/dependencies/types";-import {- getCardTypes,- getDependencyTypes,- isSameNode,-} from "metabase-enterprise/dependencies/utils";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";+import { isSameNode } from "metabase-enterprise/dependencies/utils";import type { DependencyEntry } from "metabase-types/api";import { DiagnosticsFilterBar } from "./DiagnosticsFilterBar";@@ -35,8 +30,8 @@ import type {DependencyDiagnosticsParamsOptions,} from "./types";import {- getAvailableGroupTypes,getFilterOptions,+ getListFilterParams,getParamsWithoutDefaults,getSortOptions,} from "./utils";@@ -65,14 +60,7 @@ export function DependencyDiagnostics({? useLazyListBreakingGraphNodesQuery: useLazyListUnreferencedGraphNodesQuery;- const {- page = 0,- query,- groupTypes = getAvailableGroupTypes(mode),- includePersonalCollections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,- sortColumn,- sortDirection,- } = params;+ const { page = 0, query, sortColumn, sortDirection } = params;const {data,@@ -82,10 +70,8 @@ export function DependencyDiagnostics({} = useAbortableQuery(useLazyListGraphNodesQuery,{- types: getDependencyTypes(groupTypes),- "card-types": getCardTypes(groupTypes),+ ...getListFilterParams(getFilterOptions(mode, params)),query,- "include-personal-collections": includePersonalCollections,"sort-column": sortColumn,"sort-direction": sortDirection,offset: page * PAGE_SIZE,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsxindex cbb36bc045e..80ae0c71355 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsHeader/DiagnosticsHeader.tsx@@ -4,22 +4,31 @@ import { t } from "ttag";import {type PillTab,PillTabNavigation,+ getTabCount,} from "metabase/common/components/PillTabNavigation";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { Stack } from "metabase/ui";import * as Urls from "metabase/urls";+import { useGetDependencyCountsQuery } from "metabase-enterprise/api/dependencies";++import { getDependencyCountsRequest } from "../utils";export const DiagnosticsHeader = memo(function DiagnosticsHeader() {+ const { currentData: counts, isError } = useGetDependencyCountsQuery(+ getDependencyCountsRequest(),+ );const tabs: PillTab[] = [{label: t`Broken dependencies`,to: Urls.brokenDependencies(),icon: "broken_link",+ count: getTabCount({ value: counts?.breaking, isError }),},{label: t`Unreferenced entities`,to: Urls.unreferencedDependencies(),icon: "unreferenced",+ count: getTabCount({ value: counts?.unreferenced, isError }),},];diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsxindex 7a3b626df0e..ef7fe773347 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsPagination/DiagnosticsPagination.tsx@@ -1,6 +1,6 @@import { PaginationControls } from "metabase/common/components/PaginationControls";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Flex } from "metabase/ui";-import { PAGE_SIZE } from "metabase-enterprise/monitor/constants";type DiagnosticsPaginationProps = {page: number;diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/utils.tsindex c2730d89776..8696069569b 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/utils.ts@@ -4,6 +4,15 @@ import type {DependencyFilterOptions,DependencySortOptions,} from "metabase-enterprise/dependencies/types";+import {+ getCardTypes,+ getDependencyTypes,+} from "metabase-enterprise/dependencies/utils";+import type {+ CardType,+ DependencyType,+ GetDependencyCountsRequest,+} from "metabase-types/api";import { BROKEN_GROUP_TYPES, UNREFERENCED_GROUP_TYPES } from "./constants";import type { DependencyDiagnosticsMode } from "./types";@@ -31,6 +40,42 @@ export function getDefaultFilterOptions(return getFilterOptions(mode, {});}+type ListFilterParams = {+ types: DependencyType[];+ "card-types": CardType[];+ "include-personal-collections": boolean;+};++export function getListFilterParams({+ groupTypes,+ includePersonalCollections,+}: DependencyFilterOptions): ListFilterParams {+ return {+ types: getDependencyTypes(groupTypes),+ "card-types": getCardTypes(groupTypes),+ "include-personal-collections": includePersonalCollections,+ };+}++/** Counts the Broken and Unreferenced lists as their pages show them by default. */+export function getDependencyCountsRequest(): GetDependencyCountsRequest {+ const broken = getListFilterParams(getDefaultFilterOptions("broken"));+ const unreferenced = getListFilterParams(+ getDefaultFilterOptions("unreferenced"),+ );++ return {+ "breaking-types": broken.types,+ "breaking-card-types": broken["card-types"],+ "breaking-include-personal-collections":+ broken["include-personal-collections"],+ "unreferenced-types": unreferenced.types,+ "unreferenced-card-types": unreferenced["card-types"],+ "unreferenced-include-personal-collections":+ unreferenced["include-personal-collections"],+ };+}+export function getSortOptions({sortColumn,sortDirection,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsxindex 8f0633a28b8..1e97b3880b4 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx@@ -1,6 +1,7 @@import userEvent from "@testing-library/user-event";import {+ setupDependencyCountsEndpoint,setupListBreakingGraphNodesEndpoint,setupListUnreferencedGraphNodesEndpoint,setupUserKeyValueEndpoints,@@ -82,6 +83,7 @@ function setup({value: lastUsedParams,});+ setupDependencyCountsEndpoint();mockGetBoundingClientRect({ width: 100, height: 100 });const PageComponent =diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/routes.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/routes.unit.spec.tsxindex 593dffe1b46..5f2ae3b2558 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/routes.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/routes.unit.spec.tsx@@ -1,7 +1,151 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";+import { lazyLoaders } from "__support__/lazy-routes";+import {+ setupDeleteCardEndpoint,+ setupDependencyCountsEndpoint,+ setupDependencyCountsErrorEndpoint,+ setupListBreakingGraphNodesEndpoint,+ setupListUnreferencedGraphNodesEndpoint,+ setupUpdateCollectionEndpoint,+ setupUserKeyValueEndpoints,+} from "__support__/server-mocks";+import {+ act,+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";+import {+ useDeleteCardMutation,+ useUpdateCollectionMutation,+} from "metabase/api";+import { MonitorContent } from "metabase/monitor/components/MonitorLayout/MonitorContent";+import { Outlet, Route } from "metabase/router";+import { Button } from "metabase/ui";+import * as Urls from "metabase/urls";+import { defer } from "metabase/utils/promise";+import type {+ DependencyCountsResponse,+ DependencyNode,+} from "metabase-types/api";+import {+ createMockCardDependencyNode,+ createMockCardDependencyNodeData,+ createMockCollection,+ createMockListBrokenGraphNodesResponse,+ createMockListUnreferencedGraphNodesResponse,+ createMockUser,+} from "metabase-types/api/mocks";import { getDependencyDiagnosticsRoutes } from "./routes";+const COUNTS: DependencyCountsResponse = { breaking: 137, unreferenced: 0 };++interface SetupOpts {+ nodes?: DependencyNode[];+ total?: number;+ initialRoute?: string;+ countsResponse?: DependencyCountsResponse | Promise<DependencyCountsResponse>;+ withMutations?: boolean;+ withCountsError?: boolean;+}++function DeleteQuestionButton() {+ const [deleteCard] = useDeleteCardMutation();+ const handleDelete = async () => {+ await deleteCard(1).unwrap();+ };+ return <Button onClick={handleDelete}>Delete question</Button>;+}++function ArchiveCollectionButton() {+ const [updateCollection] = useUpdateCollectionMutation();+ const handleArchive = async () => {+ await updateCollection({ id: 1, archived: true }).unwrap();+ };+ return <Button onClick={handleArchive}>Archive collection</Button>;+}++function setup({+ nodes = [],+ total = nodes.length,+ initialRoute = Urls.brokenDependencies(),+ countsResponse = COUNTS,+ withMutations = false,+ withCountsError = false,+}: SetupOpts = {}) {+ if (withCountsError) {+ setupDependencyCountsErrorEndpoint();+ } else {+ setupDependencyCountsEndpoint(() => countsResponse, {+ name: "dependency-counts",+ });+ }+ setupListBreakingGraphNodesEndpoint(+ createMockListBrokenGraphNodesResponse({ data: nodes, total }),+ );+ setupListUnreferencedGraphNodesEndpoint(+ createMockListUnreferencedGraphNodesResponse({ data: [], total: 0 }),+ );+ for (const key of ["broken", "unreferenced"]) {+ setupUserKeyValueEndpoints({+ namespace: "dependency_diagnostics",+ key,+ value: {},+ });+ }+ if (withMutations) {+ setupDeleteCardEndpoint(1);+ setupUpdateCollectionEndpoint(+ createMockCollection({ id: 1, archived: true }),+ );+ }+ mockGetBoundingClientRect({ width: 100, height: 100 });++ return renderWithProviders(+ <Route+ path={Urls.dependencyDiagnostics()}+ element={+ <MonitorContent>+ {withMutations && (+ <>+ <DeleteQuestionButton />+ <ArchiveCollectionButton />+ </>+ )}+ <Outlet />+ </MonitorContent>+ }+ >+ {getDependencyDiagnosticsRoutes()}+ </Route>,+ {+ withRouter: true,+ initialRoute,+ storeInitialState: { currentUser: createMockUser() },+ },+ );+}++const getCountCalls = () =>+ fetchMock.callHistory.calls("path:/api/ee/dependencies/counts");+const getTab = (name: string) => screen.getByRole("link", { name });++async function switchTab(name: string, emptyState: string) {+ await userEvent.click(getTab(name));+ expect(await screen.findByText(emptyState)).toBeVisible();+ expect(getTab(name)).toHaveAttribute("aria-current", "page");+}++async function visitBothTabs() {+ await switchTab("Unreferenced entities", "No unreferenced entities found");+ await switchTab("Broken dependencies", "No broken dependencies found");+}+describe("dependency diagnostics routes", () => {it("resolves every page", async () => {const loaders = lazyLoaders(getDependencyDiagnosticsRoutes());@@ -13,3 +157,163 @@ describe("dependency diagnostics routes", () => {}});});++describe("dependency diagnostics section counts", () => {+ it("maps both default populations and reuses counts across tab cycles", async () => {+ setup();+ expect(+ await screen.findByText("No broken dependencies found"),+ ).toBeVisible();+ expect(+ await within(getTab("Broken dependencies")).findByText("137"),+ ).toBeVisible();+ expect(+ within(getTab("Unreferenced entities")).getByText("0"),+ ).toBeVisible();++ await visitBothTabs();+ await visitBothTabs();++ expect(getCountCalls()).toHaveLength(1);+ });++ it("counts the default lists, independent of the filtered and paginated list", async () => {+ setup({+ nodes: [+ createMockCardDependencyNode({+ id: 1,+ data: createMockCardDependencyNodeData({ name: "Sales question" }),+ }),+ ],+ total: 60,+ initialRoute: Urls.brokenDependencies({+ page: 1,+ query: "Sales",+ includePersonalCollections: false,+ }),+ });+ expect(await screen.findByText("Sales question")).toBeVisible();+ expect(+ await within(getTab("Broken dependencies")).findByText("137"),+ ).toBeVisible();+ const calls = getCountCalls();+ expect(calls).toHaveLength(1);+ const countParams = new URL(calls[0].url).searchParams;+ expect(+ Object.fromEntries(+ [...new Set(countParams.keys())].map((key) => [+ key,+ countParams.getAll(key),+ ]),+ ),+ ).toEqual({+ "breaking-types": ["table", "card", "transform"],+ "breaking-card-types": ["question", "model"],+ "breaking-include-personal-collections": ["true"],+ "unreferenced-types": ["table", "card", "segment", "measure", "snippet"],+ "unreferenced-card-types": ["question", "model", "metric"],+ "unreferenced-include-personal-collections": ["true"],+ });+ const listCalls = fetchMock.callHistory.calls(+ "path:/api/ee/dependencies/graph/breaking",+ );+ expect(listCalls).toHaveLength(1);+ const params = new URL(listCalls[0].url).searchParams;+ expect(params.get("query")).toBe("Sales");+ expect(params.get("offset")).toBe("25");+ expect(params.get("limit")).toBe("25");+ expect(params.get("include-personal-collections")).toBe("false");+ });++ it("keeps navigation working and hides badges when counts fail", async () => {+ setup({ withCountsError: true });+ expect(+ await screen.findByText("No broken dependencies found"),+ ).toBeVisible();+ await waitFor(() =>+ expect(+ fetchMock.callHistory.done("path:/api/ee/dependencies/counts"),+ ).toBe(true),+ );+ await visitBothTabs();+ await waitFor(() =>+ expect(+ within(getTab("Broken dependencies")).queryByTestId(+ "tab-count-skeleton",+ ),+ ).not.toBeInTheDocument(),+ );+ expect(getTab("Broken dependencies")).toHaveTextContent(+ /^Broken dependencies$/,+ );+ });++ it("shares the pending count request without blocking tab navigation", async () => {+ const pendingCounts = defer<DependencyCountsResponse>();+ setup({ countsResponse: pendingCounts.promise });+ expect(+ await screen.findByText("No broken dependencies found"),+ ).toBeVisible();+ await visitBothTabs();+ expect(getCountCalls()).toHaveLength(1);+ await act(async () => pendingCounts.resolve(COUNTS));+ expect(+ await within(getTab("Broken dependencies")).findByText("137"),+ ).toBeVisible();+ await switchTab("Unreferenced entities", "No unreferenced entities found");+ expect(getCountCalls()).toHaveLength(1);+ });++ it("retains counts across tab changes while a question deletion refreshes them", async () => {+ const pendingCounts = defer<DependencyCountsResponse>();+ setup({ withMutations: true });+ expect(+ await screen.findByText("No broken dependencies found"),+ ).toBeVisible();+ expect(+ await within(getTab("Broken dependencies")).findByText("137"),+ ).toBeVisible();+ fetchMock.modifyRoute("dependency-counts", {+ response: () => pendingCounts.promise,+ });+ await userEvent.click(+ screen.getByRole("button", { name: "Delete question" }),+ );+ await waitFor(() => expect(getCountCalls()).toHaveLength(2));+ await switchTab("Unreferenced entities", "No unreferenced entities found");+ expect(+ within(getTab("Broken dependencies")).getByText("137"),+ ).toBeVisible();+ await act(async () =>+ pendingCounts.resolve({ breaking: 136, unreferenced: 1 }),+ );+ expect(+ await within(getTab("Broken dependencies")).findByText("136"),+ ).toBeVisible();+ expect(+ within(getTab("Unreferenced entities")).getByText("1"),+ ).toBeVisible();+ expect(getCountCalls()).toHaveLength(2);+ });++ it("refreshes counts when a collection is archived", async () => {+ setup({ withMutations: true });+ expect(+ await screen.findByText("No broken dependencies found"),+ ).toBeVisible();+ expect(+ await within(getTab("Broken dependencies")).findByText("137"),+ ).toBeVisible();+ fetchMock.modifyRoute("dependency-counts", {+ response: { breaking: 0, unreferenced: 4 },+ });+ await userEvent.click(+ screen.getByRole("button", { name: "Archive collection" }),+ );+ expect(+ await within(getTab("Unreferenced entities")).findByText("4"),+ ).toBeVisible();+ expect(within(getTab("Broken dependencies")).getByText("0")).toBeVisible();+ expect(getCountCalls()).toHaveLength(2);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.tsxindex 79777b9f344..f911c30ae93 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.tsx@@ -17,6 +17,7 @@ import { SIDEBAR_WIDTH } from "metabase/monitor/components/DetailSidebar";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useLocation, useNavigate, useParams } from "metabase/router";import { Button, Flex, Group } from "metabase/ui";import * as Urls from "metabase/urls";@@ -31,7 +32,6 @@ import { SessionsTabs } from "../SessionsTabs";import {DEFAULT_SORT_COLUMN,DEFAULT_SORT_DIRECTION,- PAGE_SIZE,TAB_SORT_COLUMNS,} from "./constants";import type { RouteParams } from "./types";@@ -229,7 +229,7 @@ export const SessionsPage = () => {<SessionsFilters state={urlState} onChange={patchUrlState} />{!isEndedTab && (// not tied to the listed total: revoking all ignores the search and filters- <Button disabled={isRevoking} onClick={revokeAll} size="lg">+ <Button size="lg" disabled={isRevoking} onClick={revokeAll}>{t`Revoke all active sessions`}</Button>)}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.unit.spec.tsxindex 14304fc4e8d..f03868adecb 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/SessionsPage.unit.spec.tsx@@ -6,8 +6,11 @@ import {setupListSessionsErrorEndpoint,setupRevokeSessionsEndpoint,setupRevokeSessionsErrorEndpoint,+ setupSessionCountsEndpoint,+ setupSessionCountsErrorEndpoint,} from "__support__/server-mocks";import {+ act,mockGetBoundingClientRect,renderWithProviders,screen,@@ -15,10 +18,13 @@ import {within,} from "__support__/ui";import { MonitorContent } from "metabase/monitor/components/MonitorLayout/MonitorContent";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Route } from "metabase/router";+import { defer } from "metabase/utils/promise";import type {RevokeSessionsResponse,Session,+ SessionCountsResponse,SessionListResponse,} from "metabase-types/api";import {@@ -29,7 +35,6 @@ import {} from "metabase-types/api/mocks";import { SessionsPage } from "./SessionsPage";-import { PAGE_SIZE } from "./constants";const PATHNAME = "/monitor/sessions";@@ -50,6 +55,8 @@ type SetupOpts = {sessions?: Session[];total?: number;listFails?: boolean;+ counts?: SessionCountsResponse;+ countsFail?: boolean;/** Answers each list request from its query params, in place of `sessions` and `total` */getListResponse?: (params: URLSearchParams) => SessionListResponse;initialRoute?: string;@@ -61,11 +68,18 @@ const setup = ({sessions = [ANN_SESSION, BOB_SESSION, CARL_SESSION],total = sessions.length,listFails = false,+ counts = { active: 137, ended: 241 },+ countsFail = false,getListResponse,initialRoute = PATHNAME,revokeResponse = createMockRevokeSessionsResponse(),revokeError,}: SetupOpts = {}) => {+ if (countsFail) {+ setupSessionCountsErrorEndpoint();+ } else {+ setupSessionCountsEndpoint(counts, { name: "session-counts" });+ }if (listFails) {setupListSessionsErrorEndpoint();} else if (getListResponse) {@@ -82,16 +96,19 @@ const setup = ({}return renderWithProviders(- <Route- path={PATHNAME}- element={- <MonitorContent>- <SessionsPage />- </MonitorContent>- }- >- <Route path=":sessionId" />- </Route>,+ <>+ <Route+ path={PATHNAME}+ element={+ <MonitorContent>+ <SessionsPage />+ </MonitorContent>+ }+ >+ <Route path=":sessionId" />+ </Route>+ <Route path="/outside" element={<div>Outside the section</div>} />+ </>,{withRouter: true,withUndos: true,@@ -147,26 +164,157 @@ const queryBulkActionBar = () => screen.queryByTestId("toast-card");const getRevokeBodies = () =>fetchMock.callHistory.calls("path:/api/ee/session-management/revoke")- .map((call) => JSON.parse(String(call.options.body)));+ .map((call) => {+ const body: unknown = JSON.parse(String(call.options.body));+ return body;+ });describe("SessionsPage", () => {beforeEach(() => {mockGetBoundingClientRect({ height: 800, width: 1000 });});- describe("list", () => {- it("requests the tab in the URL, sorted by sign-in time by default", async () => {- setup({ initialRoute: `${PATHNAME}?tab=ended` });+ describe("counters", () => {+ it("shows the default populations independently of the filtered and paged table", async () => {+ setup({+ initialRoute: `${PATHNAME}?tab=ended&query=ann&page=1`,+ total: 35,+ });await screen.findByTestId("session-row-ann-session");- const params = getLastListParams();- expect(params.get("status")).toBe("ended");- expect(params.get("limit")).toBe(String(PAGE_SIZE));- expect(params.get("offset")).toBe("0");- expect(params.get("sort-column")).toBe("created_at");- expect(params.get("sort-direction")).toBe("desc");+ expect(+ await within(screen.getByRole("button", { name: "Active" })).findByText(+ "137",+ ),+ ).toBeInTheDocument();+ expect(+ within(screen.getByRole("button", { name: "Ended" })).getByText("241"),+ ).toBeInTheDocument();+ const calls = fetchMock.callHistory.calls(+ "path:/api/ee/session-management/counts",+ );+ expect(calls).toHaveLength(1);+ expect(new URL(calls[0].url).search).toBe("");+ expect(getLastListParams().get("status")).toBe("ended");+ expect(getLastListParams().get("query")).toBe("ann");+ expect(getLastListParams().get("limit")).toBe("25");+ expect(getLastListParams().get("offset")).toBe("25");});+ it("reuses the section counts when switching tabs repeatedly", async () => {+ setup();+ await screen.findByTestId("session-row-ann-session");+ expect(+ await within(screen.getByRole("button", { name: "Active" })).findByText(+ "137",+ ),+ ).toBeVisible();++ for (let visit = 0; visit < 2; visit++) {+ for (const label of ["Ended", "Active"]) {+ await userEvent.click(screen.getByRole("button", { name: label }));+ await waitFor(() =>+ expect(screen.getByRole("button", { name: label })).toHaveAttribute(+ "aria-current",+ "page",+ ),+ );+ expect(+ await screen.findByTestId("session-row-ann-session"),+ ).toBeVisible();+ }+ }+ expect(+ fetchMock.callHistory.calls("path:/api/ee/session-management/counts"),+ ).toHaveLength(1);+ });++ it("refreshes counters after revocation while retaining known counts during the refresh", async () => {+ setup();+ const activeTab = screen.getByRole("button", { name: "Active" });+ const endedTab = screen.getByRole("button", { name: "Ended" });+ expect(await within(activeTab).findByText("137")).toBeInTheDocument();+ const refreshedCounts = defer<SessionCountsResponse>();+ fetchMock.modifyRoute("session-counts", {+ response: () => refreshedCounts.promise,+ });++ await clickRevokeAll();+ await confirmRevoke();++ await waitFor(() => {+ expect(+ fetchMock.callHistory.calls("path:/api/ee/session-management/counts"),+ ).toHaveLength(2);+ });+ expect(within(activeTab).getByText("137")).toBeInTheDocument();+ expect(within(endedTab).getByText("241")).toBeInTheDocument();+ await act(async () => {+ refreshedCounts.resolve({ active: 134, ended: 244 });+ });+ expect(await within(activeTab).findByText("134")).toBeInTheDocument();+ expect(within(endedTab).getByText("244")).toBeInTheDocument();+ });++ it("refreshes cached populations on section re-entry", async () => {+ const { router } = setup();+ if (!router) {+ throw new Error("Expected test router");+ }+ const getActive = () => screen.getByRole("button", { name: "Active" });+ expect(await within(getActive()).findByText("137")).toBeVisible();+ await act(async () => router.navigate("/outside"));+ expect(await screen.findByText("Outside the section")).toBeVisible();+ fetchMock.modifyRoute("session-counts", {+ response: { active: 138, ended: 241 },+ });+ await act(async () => router.navigate(PATHNAME));+ expect(await within(getActive()).findByText("138")).toBeVisible();+ expect(+ fetchMock.callHistory.calls("path:/api/ee/session-management/counts"),+ ).toHaveLength(2);+ });++ it("keeps session navigation available after counts fail", async () => {+ setup({ countsFail: true });+ await screen.findByTestId("session-row-ann-session");+ await waitFor(() =>+ expect(+ fetchMock.callHistory.done("path:/api/ee/session-management/counts"),+ ).toBe(true),+ );+ await userEvent.click(screen.getByRole("button", { name: "Ended" }));+ await waitFor(() =>+ expect(getLastListParams().get("status")).toBe("ended"),+ );+ expect(+ await screen.findByTestId("session-row-ann-session"),+ ).toBeVisible();+ expect(+ fetchMock.callHistory.calls("path:/api/ee/session-management/counts"),+ ).toHaveLength(1);+ });+ });++ describe("list", () => {+ it.each([+ { tab: "active", status: "live" },+ { tab: "ended", status: "ended" },+ ])(+ "requests $tab sessions in 25-row pages sorted by sign-in time",+ async ({ tab, status }) => {+ setup({ initialRoute: `${PATHNAME}?tab=${tab}` });+ await screen.findByTestId("session-row-ann-session");++ const params = getLastListParams();+ expect(params.get("status")).toBe(status);+ expect(params.get("limit")).toBe("25");+ expect(params.get("offset")).toBe("0");+ expect(params.get("sort-column")).toBe("created_at");+ expect(params.get("sort-direction")).toBe("desc");+ },+ );+it("says when there are no active sessions", async () => {setup({ sessions: [] });@@ -254,13 +402,13 @@ describe("SessionsPage", () => {});it("pages to the next set of sessions, dropping the selection", async () => {- setup({ total: PAGE_SIZE + 10 });+ setup({ total: 35 });await clickRowCheckbox("ann-session");await userEvent.click(screen.getByRole("button", { name: "Next page" }));await waitFor(() => {- expect(getLastListParams().get("offset")).toBe(String(PAGE_SIZE));+ expect(getLastListParams().get("offset")).toBe("25");});expect(queryBulkActionBar()).not.toBeInTheDocument();});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/constants.ts b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/constants.tsindex 1b441df298a..4a7711c272f 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/constants.ts@@ -6,8 +6,6 @@ import type {import type { SessionsTab } from "./types";-export const PAGE_SIZE = 50;-export const DEFAULT_TAB: SessionsTab = "active";export const TAB_STATUS: Record<SessionsTab, SessionStatusFilter> = {diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/utils.unit.spec.tsindex 6cc7304dfc3..5134365c538 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/utils.unit.spec.ts@@ -1,9 +1,9 @@+import { PAGE_SIZE } from "metabase/monitor/constants";import {createMockSession,createMockSessionUser,} from "metabase-types/api/mocks";-import { PAGE_SIZE } from "./constants";import type { SessionsUrlState } from "./types";import {buildListParams,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsTabs/SessionsTabs.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsTabs/SessionsTabs.tsxindex 73199abee1c..c633f96f083 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsTabs/SessionsTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsTabs/SessionsTabs.tsx@@ -1,6 +1,11 @@import { t } from "ttag";-import { Group, Icon, Tabs, Text, Tooltip } from "metabase/ui";+import {+ PillTabNavigation,+ getTabCount,+} from "metabase/common/components/PillTabNavigation";+import { Group, Icon, Text, Tooltip } from "metabase/ui";+import { useGetSessionCountsQuery } from "metabase-enterprise/api";import type { IconName } from "metabase-types/api";import type { SessionsTab } from "../SessionsPage/types";@@ -17,39 +22,27 @@ type TabConfig = {};export const SessionsTabs = ({ tab, onChange }: SessionsTabsProps) => {+ const { currentData: counts, isError } = useGetSessionCountsQuery(undefined, {+ refetchOnMountOrArgChange: true,+ });const tabs: TabConfig[] = [{ value: "active", icon: "group", label: t`Active` },{ value: "ended", icon: "history", label: t`Ended` },];- const handleTabChange = (value: string | null) => {- const next = tabs.find((config) => config.value === value);- if (next !== undefined) {- onChange(next.value);- }- };-return (<Group justify="space-between">- <Tabs- variant="pills"- value={tab}- onChange={handleTabChange}+ <PillTabNavigationdata-testid="sessions-tabs"- >- <Tabs.List>- {tabs.map((config) => (- <Tabs.Tab- key={config.value}- value={config.value}- leftSection={<Icon name={config.icon} />}- data-testid={`sessions-tab-${config.value}`}- >- {config.label}- </Tabs.Tab>- ))}- </Tabs.List>- </Tabs>+ tabs={tabs.map((config) => ({+ label: config.label,+ icon: config.icon,+ count: getTabCount({ value: counts?.[config.value], isError }),+ isSelected: config.value === tab,+ "data-testid": `sessions-tab-${config.value}`,+ onClick: () => onChange(config.value),+ }))}+ />{tab === "ended" && (<Tooltiplabel={diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsxindex 4bbc774aa82..9e07b69de43 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx@@ -16,6 +16,7 @@ import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { useUrlState } from "metabase/common/hooks/use-url-state";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useLocation } from "metabase/router";import { Center, Flex } from "metabase/ui";import type { CardId } from "metabase-types/api";@@ -29,7 +30,6 @@ import type {import {DEFAULT_FILTERS,DEFAULT_SORTING,- PAGE_SIZE,getErroringQuestions,getErroringQuestionsQuery,urlStateConfig,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.unit.spec.tsxindex 4640d792a65..3206513c2e9 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.unit.spec.tsx@@ -23,7 +23,6 @@ import {import { ErrorOverview } from "./ErrorOverview";import { createMockErroringCard } from "./mocks";import { type ErroringCard, SORT_COLUMNS } from "./types";-import { PAGE_SIZE } from "./utils";const COLUMN_NAMES = ["card_id", ...SORT_COLUMNS];const SEARCH_PLACEHOLDER = "Search by question, error, database, or collection";@@ -154,7 +153,7 @@ describe("ErrorOverview", () => {"metabase-enterprise.audit-app.pages.queries/bad-table",);expect(query.args).toEqual(["", "last_run_at", "desc"]);- expect(query.limit).toBe(PAGE_SIZE);+ expect(query.limit).toBe(25);expect(query.offset).toBe(0);// the QP schema rejects an explicit null database; the key must be absentexpect("database" in query).toBe(false);@@ -253,7 +252,7 @@ describe("ErrorOverview", () => {it("passes filter values to the query and resets to the first page", async () => {const { router } = await setup({- cards: Array.from({ length: PAGE_SIZE }, (_, index) => ({+ cards: Array.from({ length: 25 }, (_, index) => ({id: index + 1,})),total: 120,@@ -262,7 +261,7 @@ describe("ErrorOverview", () => {await waitFor(async () => {const query = await getLastDatasetQuery();- expect(query.offset).toBe(PAGE_SIZE * 2);+ expect(query.offset).toBe(50);});const rows = await screen.findAllByTestId("erroring-question");@@ -563,7 +562,7 @@ describe("ErrorOverview", () => {it("paginates showing the total count and syncs the page to the URL", async () => {const { router } = await setup({- cards: Array.from({ length: PAGE_SIZE }, (_, index) => ({+ cards: Array.from({ length: 25 }, (_, index) => ({id: index + 1,})),total: 120,@@ -586,7 +585,7 @@ describe("ErrorOverview", () => {});await waitFor(async () => {const query = await getLastDatasetQuery();- expect(query.offset).toBe(PAGE_SIZE);+ expect(query.offset).toBe(25);});await waitFor(() => {expect(router?.location.search).toBe("?page=1");@@ -595,7 +594,7 @@ describe("ErrorOverview", () => {it("reads the initial page from the URL", async () => {await setup({- cards: Array.from({ length: PAGE_SIZE }, (_, index) => ({+ cards: Array.from({ length: 25 }, (_, index) => ({id: index + 1,})),total: 120,@@ -604,7 +603,7 @@ describe("ErrorOverview", () => {await waitFor(async () => {const query = await getLastDatasetQuery();- expect(query.offset).toBe(PAGE_SIZE * 2);+ expect(query.offset).toBe(50);});});@@ -618,7 +617,7 @@ describe("ErrorOverview", () => {deferResponse: true,});- expect((await getLastDatasetQuery()).offset).toBe(2 * PAGE_SIZE);+ expect((await getLastDatasetQuery()).offset).toBe(50);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY + 50);});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/utils.tsindex db9e409ff2d..74a3a980625 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/utils.ts@@ -3,6 +3,7 @@ import {type UrlStateConfig,getFirstParamValue,} from "metabase/common/hooks/use-url-state";+import { PAGE_SIZE } from "metabase/monitor/constants";import type {Dataset,InternalDatasetQuery,@@ -15,8 +16,6 @@ import type {ErroringQuestionsSorting,} from "./types";-export const PAGE_SIZE = 50;-type UrlState = {page: number;};diff --git a/frontend/src/metabase-types/api/content-diagnostics.ts b/frontend/src/metabase-types/api/content-diagnostics.tsindex 9ba3292db01..e4a9ede0ac1 100644--- a/frontend/src/metabase-types/api/content-diagnostics.ts+++ b/frontend/src/metabase-types/api/content-diagnostics.ts@@ -8,6 +8,15 @@ import type { TransformId } from "./transform";import type { UserId } from "./user";import type { VisualizationDisplay } from "./visualization";+export interface ContentDiagnosticsCountsResponse {+ stale: number;+ duplicated: number;+ slow: number;+ empty: number;+ sparse: number;+ crowded: number;+}+export const CONTENT_DIAGNOSTICS_IMBALANCED_FINDING_TYPES = ["empty","sparse",diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.tsindex 16bc15365f4..1589b02cd88 100644--- a/frontend/src/metabase-types/api/dependencies.ts+++ b/frontend/src/metabase-types/api/dependencies.ts@@ -16,6 +16,20 @@ import type { SortDirection } from "./sorting";import type { ConcreteTableId, Table } from "./table";import type { Transform } from "./transform";+export type GetDependencyCountsRequest = {+ "breaking-types"?: DependencyType[];+ "breaking-card-types"?: CardType[];+ "breaking-include-personal-collections"?: boolean;+ "unreferenced-types"?: DependencyType[];+ "unreferenced-card-types"?: CardType[];+ "unreferenced-include-personal-collections"?: boolean;+};++export type DependencyCountsResponse = {+ breaking: number;+ unreferenced: number;+};+export type DependencyId = number;export const DEPENDENCY_TYPES = [diff --git a/frontend/src/metabase-types/api/notification.ts b/frontend/src/metabase-types/api/notification.tsindex 45f1192c685..8af2e24dd2f 100644--- a/frontend/src/metabase-types/api/notification.ts+++ b/frontend/src/metabase-types/api/notification.ts@@ -225,6 +225,12 @@ export type AdminNotificationListParams = {sort_direction?: SortDirection;};+export type AdminNotificationCountsResponse = {+ all: number;+ failing: number;+ ownerless: number;+};+export type AdminNotificationListResponse = {data: AdminNotification[];total: number;diff --git a/frontend/src/metabase-types/api/session-management.ts b/frontend/src/metabase-types/api/session-management.tsindex 86de58cc9b9..fd0f7dd8bd3 100644--- a/frontend/src/metabase-types/api/session-management.ts+++ b/frontend/src/metabase-types/api/session-management.ts@@ -97,6 +97,11 @@ export type SessionListParams = SessionFilters &"sort-direction"?: SortDirection;};+export type SessionCountsResponse = {+ active: number;+ ended: number;+};+export type SessionListResponse = PaginationResponse & {data: Session[];};diff --git a/frontend/src/metabase-types/api/task.ts b/frontend/src/metabase-types/api/task.tsindex 355d02aa201..cccbbb2ce7f 100644--- a/frontend/src/metabase-types/api/task.ts+++ b/frontend/src/metabase-types/api/task.ts@@ -35,6 +35,11 @@ export type ListTasksRequest = {} & PaginationRequest &Partial<SortingOptions<ListTasksSortColumn>>;+export type TaskCountsResponse = {+ tasks: number;+ runs: number;+};+export type ListTasksResponse = {data: Task[];} & PaginationResponse;diff --git a/frontend/src/metabase/api/notification.ts b/frontend/src/metabase/api/notification.tsindex 7efaef473e6..fe7734b9401 100644--- a/frontend/src/metabase/api/notification.ts+++ b/frontend/src/metabase/api/notification.ts@@ -1,6 +1,7 @@import _ from "underscore";import type {+ AdminNotificationCountsResponse,AdminNotificationDetail,AdminNotificationListParams,AdminNotificationListResponse,@@ -104,6 +105,13 @@ export const notificationApi = Api.injectEndpoints({body: _.omit(body, "creator"),}),}),+ getAdminNotificationCounts: builder.query<+ AdminNotificationCountsResponse,+ void+ >({+ query: () => ({ method: "GET", url: "/api/notification/admin/counts" }),+ providesTags: [adminNotificationListTag(), listTag("notification")],+ }),adminListNotifications: builder.query<AdminNotificationListResponse,AdminNotificationListParams | void@@ -180,6 +188,7 @@ export const {useUpdateNotificationMutation,useUnsubscribeFromNotificationMutation,useSendUnsavedNotificationMutation,+ useGetAdminNotificationCountsQuery,useAdminListNotificationsQuery,useLazyAdminListNotificationsQuery,useBulkNotificationActionMutation,diff --git a/frontend/src/metabase/api/task.ts b/frontend/src/metabase/api/task.tsindex b654e9558a6..fe3c1407071 100644--- a/frontend/src/metabase/api/task.ts+++ b/frontend/src/metabase/api/task.ts@@ -6,12 +6,14 @@ import type {ListTasksResponse,RunEntity,Task,+ TaskCountsResponse,TaskInfo,TaskRunExtended,} from "metabase-types/api";import { Api } from "./api";import {+ listTag,provideTaskListTags,provideTaskRunListTags,provideTaskRunTags,@@ -21,6 +23,10 @@ import {export const taskApi = Api.injectEndpoints({endpoints: (builder) => ({+ getTaskCounts: builder.query<TaskCountsResponse, void>({+ query: () => ({ method: "GET", url: "/api/task/counts" }),+ providesTags: [listTag("task"), listTag("task-run")],+ }),listTasks: builder.query<ListTasksResponse, ListTasksRequest | void>({query: (params) => ({method: "GET",@@ -83,6 +89,7 @@ export const taskApi = Api.injectEndpoints({});export const {+ useGetTaskCountsQuery,useListTasksQuery,useLazyListTasksQuery,useListUniqueTasksQuery,diff --git a/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx b/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsxindex 64086f478f2..a9dacbe03d0 100644--- a/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx+++ b/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx@@ -63,8 +63,9 @@ export const ListFilterPopover = ({onChange={setOpened}><Popover.Target>- <Indicator disabled={!hasActiveFilters} size={8} offset={8}>+ <Indicator disabled={!hasActiveFilters} size={8} offset={12}><Button+ size="lg"leftSection={<Icon name="filter" />}aria-label={t`Show filters`}onClick={handleTriggerClick}diff --git a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.module.css b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.module.cssindex b0cbf6b3618..cb5c9c42f6e 100644--- a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.module.css+++ b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.module.css@@ -1,4 +1,7 @@.tab {+ background-color: transparent;+ border: 0;+ cursor: pointer;border-radius: 999px;padding: 0.6rem 1rem;color: var(--mb-color-text-primary);diff --git a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.tsx b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.tsxindex 4dd0093724a..ee6b3cb06f3 100644--- a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.tsx+++ b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.tsx@@ -1,26 +1,67 @@import cx from "classnames";+import { type KeyboardEvent, useId } from "react";import { ForwardRefLink } from "metabase/common/components/Link";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useLocation } from "metabase/router";-import { Badge, Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";+import { Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";import type { IconName } from "metabase-types/api";import S from "./PillTabNavigation.module.css";+import { TabCountBadge, type TabCountState } from "./TabCountBadge";export type PillTab = {label: string;- to: string;icon?: IconName;isGated?: boolean;- count?: number;+ count?: TabCountState;isSelected?: boolean | ((pathname: string) => boolean);-};+ "data-testid"?: string;+} & (+ | { to: string; onClick?: () => void }+ | { to?: never; onClick: () => void }+);type PillTabNavigationProps = {tabs: PillTab[];+ "data-testid"?: string;};+function getFocusTargetIndex(key: string, index: number, count: number) {+ switch (key) {+ case "ArrowRight":+ return (index + 1) % count;+ case "ArrowLeft":+ return (index - 1 + count) % count;+ case "Home":+ return 0;+ case "End":+ return count - 1;+ default:+ return null;+ }+}++function handleTabKeyDown(event: KeyboardEvent<HTMLElement>) {+ const hasModifier =+ event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;+ if (hasModifier) {+ return;+ }+ const tabs = Array.from(+ event.currentTarget+ .closest("[data-pill-tab-navigation]")+ ?.querySelectorAll<HTMLElement>("[data-pill-tab]") ?? [],+ );+ const index = tabs.indexOf(event.currentTarget);+ const targetIndex = getFocusTargetIndex(event.key, index, tabs.length);+ if (tabs.length < 2 || index === -1 || targetIndex === null) {+ return;+ }+ event.preventDefault();+ tabs[targetIndex].focus();+}+function isTabSelected(tab: PillTab, pathname: string) {const { to, isSelected } = tab;return typeof isSelected === "function"@@ -28,37 +69,59 @@ function isTabSelected(tab: PillTab, pathname: string) {: (isSelected ?? to === pathname);}-export function PillTabNavigation({ tabs }: PillTabNavigationProps) {+export function PillTabNavigation({+ tabs,+ "data-testid": testId,+}: PillTabNavigationProps) {const { pathname } = useLocation();+ const countIdPrefix = useId();return (- <Flex component="nav" gap="xxs" wrap="wrap">- {tabs.map((tab) => {+ <Flex+ component="nav"+ gap="xxs"+ wrap="wrap"+ data-pill-tab-navigation+ data-testid={testId}+ >+ {tabs.map((tab, index) => {const selected = isTabSelected(tab, pathname);- return (- <Flex- key={tab.label}- component={ForwardRefLink}- to={tab.to}- align="center"- gap="xxs"- className={cx(S.tab, { [S.selected]: selected })}- aria-label={tab.label}- aria-current={selected ? "page" : undefined}- >+ const countId = `${countIdPrefix}-count-${index}`;+ const hasLoadedCount = tab.count?.status === "loaded";+ const tabProps = {+ align: "center",+ gap: "xxs",+ className: cx(S.tab, { [S.selected]: selected }),+ "aria-label": tab.label,+ "aria-describedby": hasLoadedCount ? countId : undefined,+ "aria-current": selected ? "page" : undefined,+ "data-testid": tab["data-testid"],+ onClick: tab.onClick,+ onKeyDown: handleTabKeyDown,+ "data-pill-tab": true,+ } as const;+ const content = (+ <>{tab.icon !== undefined && <FixedSizeIcon name={tab.icon} />}<Ellipsified className={S.label}>{tab.label}</Ellipsified>{tab.count !== undefined && (- <Badge- variant="light"- color="neutral"- c="text-secondary"- data-testid="pill-tab-count"- >- {tab.count}- </Badge>+ <TabCountBadge id={countId} count={tab.count} />)}{tab.isGated && <UpsellGem.New size={14} />}+ </>+ );+ return tab.to === undefined ? (+ <Flex key={tab.label} component="button" type="button" {...tabProps}>+ {content}+ </Flex>+ ) : (+ <Flex+ key={tab.label}+ component={ForwardRefLink}+ to={tab.to}+ {...tabProps}+ >+ {content}</Flex>);})}diff --git a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.unit.spec.tsx b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.unit.spec.tsxindex 495fd3a3655..e593654d784 100644--- a/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.unit.spec.tsx+++ b/frontend/src/metabase/common/components/PillTabNavigation/PillTabNavigation.unit.spec.tsx@@ -1,4 +1,6 @@-import { renderWithProviders, screen, within } from "__support__/ui";+import userEvent from "@testing-library/user-event";++import { fireEvent, renderWithProviders, screen, within } from "__support__/ui";import { Route } from "metabase/router";import { type PillTab, PillTabNavigation } from "./PillTabNavigation";@@ -8,10 +10,15 @@ const TABS: PillTab[] = [{ label: "Events", to: "/monitor/example/events" },];+interface SetupOpts {+ tabs?: PillTab[];+ initialRoute?: string;+}+function setup({tabs = TABS,initialRoute = "/monitor/example/usage",-}: { tabs?: PillTab[]; initialRoute?: string } = {}) {+}: SetupOpts = {}) {renderWithProviders(<Route path="*" element={<PillTabNavigation tabs={tabs} />} />,{ withRouter: true, initialRoute },@@ -19,6 +26,173 @@ function setup({}describe("PillTabNavigation", () => {+ it("renders a tab with onClick as a button that shows its selection and calls onClick on click and Enter", async () => {+ const onClick = jest.fn<void, []>();+ setup({+ tabs: [{ label: "Failing", onClick, isSelected: true }],+ });++ const tab = screen.getByRole("button", { name: "Failing" });+ expect(tab).toHaveAttribute("aria-current", "page");+ await userEvent.click(tab);+ expect(onClick).toHaveBeenCalledTimes(1);+ await userEvent.keyboard("{Enter}");+ expect(onClick).toHaveBeenCalledTimes(2);+ });++ it("moves focus between tabs with the arrow, Home and End keys", async () => {+ setup({+ tabs: [+ { label: "Usage", to: "/monitor/example/usage" },+ { label: "Events", to: "/monitor/example/events" },+ { label: "Failing", onClick: jest.fn<void, []>() },+ ],+ });+ const usage = screen.getByRole("link", { name: "Usage" });+ const events = screen.getByRole("link", { name: "Events" });+ const failing = screen.getByRole("button", { name: "Failing" });++ await userEvent.tab();+ expect(usage).toHaveFocus();+ await userEvent.keyboard("{ArrowRight}");+ expect(events).toHaveFocus();+ await userEvent.keyboard("{ArrowRight}");+ expect(failing).toHaveFocus();+ await userEvent.keyboard("{ArrowRight}");+ expect(usage).toHaveFocus();+ await userEvent.keyboard("{ArrowLeft}");+ expect(failing).toHaveFocus();+ await userEvent.keyboard("{Home}");+ expect(usage).toHaveFocus();+ await userEvent.keyboard("{End}");+ expect(failing).toHaveFocus();+ });++ it.each([+ { modifier: "altKey" },+ { modifier: "ctrlKey" },+ { modifier: "metaKey" },+ { modifier: "shiftKey" },+ ])("leaves $modifier + arrow keys to the browser", ({ modifier }) => {+ setup();+ const usage = screen.getByRole("link", { name: "Usage" });+ usage.focus();++ const isNotPrevented = fireEvent.keyDown(usage, {+ key: "ArrowRight",+ [modifier]: true,+ });++ expect(isNotPrevented).toBe(true);+ expect(usage).toHaveFocus();+ });++ it("leaves arrow keys to the browser when there is only one tab", () => {+ setup({ tabs: [{ label: "Usage", to: "/monitor/example/usage" }] });+ const usage = screen.getByRole("link", { name: "Usage" });+ usage.focus();++ expect(fireEvent.keyDown(usage, { key: "ArrowRight" })).toBe(true);+ expect(usage).toHaveFocus();+ });++ it("keeps every tab reachable with the Tab key", async () => {+ setup({ initialRoute: "/monitor/example/events" });++ await userEvent.tab();+ expect(screen.getByRole("link", { name: "Usage" })).toHaveFocus();+ await userEvent.tab();+ expect(screen.getByRole("link", { name: "Events" })).toHaveFocus();+ });++ it("shows a resolved zero count without hiding the tab", () => {+ setup({+ tabs: [+ {+ label: "Events",+ to: "/monitor/example/events",+ count: { status: "loaded", value: 0 },+ },+ ],+ });++ expect(+ within(screen.getByRole("link", { name: "Events" })).getByText("0"),+ ).toBeInTheDocument();+ });++ it("announces a loaded count as the tab's description, keeping the label as its name", () => {+ setup({+ tabs: [+ {+ label: "Failing",+ onClick: jest.fn<void, []>(),+ count: { status: "loaded", value: 3 },+ },+ { label: "Events", to: "/monitor/example/events" },+ ],+ });++ expect(+ screen.getByRole("button", { name: "Failing" }),+ ).toHaveAccessibleDescription("3");+ expect(+ screen.getByRole("link", { name: "Events" }),+ ).not.toHaveAccessibleDescription();+ });++ it("formats large counts with digit grouping", () => {+ setup({+ tabs: [+ {+ label: "Events",+ to: "/monitor/example/events",+ count: { status: "loaded", value: 37918 },+ },+ ],+ });++ expect(+ within(screen.getByRole("link", { name: "Events" })).getByText("37,918"),+ ).toBeInTheDocument();+ });++ it("shows a placeholder while the count loads without blocking navigation", () => {+ setup({+ tabs: [+ {+ label: "Events",+ to: "/monitor/example/events",+ count: { status: "loading" },+ },+ ],+ });++ const tab = screen.getByRole("link", { name: "Events" });+ expect(tab).toHaveAttribute("href", "/monitor/example/events");+ expect(within(tab).getByTestId("tab-count-skeleton")).toBeInTheDocument();+ expect(tab).not.toHaveAccessibleDescription();+ });++ it("omits a failed count without hiding the tab", () => {+ setup({+ tabs: [+ {+ label: "Events",+ to: "/monitor/example/events",+ count: { status: "error" },+ },+ ],+ });++ const tab = screen.getByRole("link", { name: "Events" });+ expect(within(tab).queryByText(/\d/)).not.toBeInTheDocument();+ expect(tab).not.toHaveAccessibleDescription();+ expect(+ within(tab).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument();+ });+it("renders each tab as a real link to its route", () => {setup();@@ -108,7 +282,11 @@ describe("PillTabNavigation", () => {setup({tabs: [{ label: "Usage", to: "/monitor/example/usage" },- { label: "Events", to: "/monitor/example/events", count: 0 },+ {+ label: "Events",+ to: "/monitor/example/events",+ count: { status: "loaded", value: 0 },+ },],});diff --git a/frontend/src/metabase/common/components/PillTabNavigation/TabCountBadge.tsx b/frontend/src/metabase/common/components/PillTabNavigation/TabCountBadge.tsxnew file mode 100644index 00000000000..63704b9a341--- /dev/null+++ b/frontend/src/metabase/common/components/PillTabNavigation/TabCountBadge.tsx@@ -0,0 +1,41 @@+import { match } from "ts-pattern";++import { Badge, Skeleton } from "metabase/ui";+import { formatNumber } from "metabase/utils/formatting";++export type TabCountState =+ | { status: "loading" }+ | { status: "error" }+ | { status: "loaded"; value: number };++type TabCountBadgeProps = {+ count: TabCountState;+ id?: string;+};++export function TabCountBadge({ count, id }: TabCountBadgeProps) {+ return match(count)+ .with({ status: "loading" }, () => (+ <Skeleton+ h={16}+ w="1.5rem"+ radius="xl"+ flex="none"+ data-testid="tab-count-skeleton"+ />+ ))+ .with({ status: "loaded" }, ({ value }) => (+ <Badge+ id={id}+ variant="light"+ size="xs"+ color="neutral"+ flex="none"+ data-testid="pill-tab-count"+ >+ {formatNumber(value)}+ </Badge>+ ))+ .with({ status: "error" }, () => null)+ .exhaustive();+}diff --git a/frontend/src/metabase/common/components/PillTabNavigation/index.ts b/frontend/src/metabase/common/components/PillTabNavigation/index.tsindex 193dba906bd..f5f935f2fbe 100644--- a/frontend/src/metabase/common/components/PillTabNavigation/index.ts+++ b/frontend/src/metabase/common/components/PillTabNavigation/index.ts@@ -1 +1,3 @@export * from "./PillTabNavigation";+export type { TabCountState } from "./TabCountBadge";+export { getTabCount } from "./utils";diff --git a/frontend/src/metabase/common/components/PillTabNavigation/utils.ts b/frontend/src/metabase/common/components/PillTabNavigation/utils.tsnew file mode 100644index 00000000000..c6c5b6b0afb--- /dev/null+++ b/frontend/src/metabase/common/components/PillTabNavigation/utils.ts@@ -0,0 +1,17 @@+import type { TabCountState } from "./TabCountBadge";++export function getTabCount({+ value,+ isError,+}: {+ value: number | undefined;+ isError: boolean;+}): TabCountState {+ if (isError) {+ return { status: "error" };+ }+ if (value !== undefined) {+ return { status: "loaded", value };+ }+ return { status: "loading" };+}diff --git a/frontend/src/metabase/common/components/PillTabNavigation/utils.unit.spec.ts b/frontend/src/metabase/common/components/PillTabNavigation/utils.unit.spec.tsnew file mode 100644index 00000000000..327912fe3ec--- /dev/null+++ b/frontend/src/metabase/common/components/PillTabNavigation/utils.unit.spec.ts@@ -0,0 +1,22 @@+import { getTabCount } from "./utils";++describe("getTabCount", () => {+ it("maps a known count to a loaded badge", () => {+ expect(getTabCount({ value: 42, isError: false })).toEqual({+ status: "loaded",+ value: 42,+ });+ });++ it.each([+ { value: undefined, isError: false, expected: { status: "loading" } },+ { value: 0, isError: false, expected: { status: "loaded", value: 0 } },+ { value: undefined, isError: true, expected: { status: "error" } },+ { value: 42, isError: true, expected: { status: "error" } },+ ])(+ "maps value=$value and isError=$isError to $expected",+ ({ value, isError, expected }) => {+ expect(getTabCount({ value, isError })).toEqual(expected);+ },+ );+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/constants.ts b/frontend/src/metabase/monitor/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/monitor/constants.tsrename to frontend/src/metabase/monitor/constants.tsdiff --git a/frontend/src/metabase/monitor/routes.unit.spec.tsx b/frontend/src/metabase/monitor/routes.unit.spec.tsxindex 229e92a3ded..44754d599dd 100644--- a/frontend/src/metabase/monitor/routes.unit.spec.tsx+++ b/frontend/src/metabase/monitor/routes.unit.spec.tsx@@ -1,5 +1,10 @@import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { lazyLoaders } from "__support__/lazy-routes";+import {+ setupContentDiagnosticsCountsEndpoint,+ setupDependencyCountsEndpoint,+ setupTaskCountsEndpoint,+} from "__support__/server-mocks";import { createMockSettingsState, createMockState } from "__support__/state";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { PLUGIN_AUDIT, reinitialize } from "metabase/plugins";@@ -174,6 +179,9 @@ const setup = ({deny = [],tokenFeatures,}: SetupOpts) => {+ setupContentDiagnosticsCountsEndpoint();+ setupDependencyCountsEndpoint();+ setupTaskCountsEndpoint();deny.forEach((guard) => mockDeniedGuards.add(guard));return renderWithProviders(diff --git a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsxindex 85b38cf6947..069fd38c1de 100644--- a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx+++ b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx@@ -17,6 +17,7 @@ import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyStateimport { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { MonitorTableCard } from "metabase/monitor/components/MonitorTableCard";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Outlet, useNavigate } from "metabase/router";import {ActionIcon,@@ -37,8 +38,6 @@ import { capitalize } from "metabase/utils/formatting";import { checkCanRefreshModelCache } from "metabase-lib/v1/metadata/utils/models";import type { ModelCacheRefreshStatus } from "metabase-types/api";-const PAGE_SIZE = 20;-const COLUMN_WIDTHS = [0.22, 0.16, 0.28, 0.14, 0.14, 0.06];export function ModelPersistenceLogJobs() {diff --git a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.unit.spec.tsxindex 6da87d045cd..1ea5fde780e 100644--- a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.unit.spec.tsx@@ -1,10 +1,12 @@import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";import { setupModelPersistenceEndpoints } from "__support__/server-mocks/persist";import {mockGetBoundingClientRect,renderWithProviders,screen,+ waitFor,} from "__support__/ui";import type { ModelCacheRefreshStatus } from "metabase-types/api";import { getMockModelCacheInfo } from "metabase-types/api/mocks/models";@@ -113,6 +115,39 @@ describe("ModelPersistenceLogJobs", () => {expect(screen.getByLabelText("refresh icon")).toBeInTheDocument();});+ it("requests the log in 25-row pages", async () => {+ await setup({+ logs: Array.from({ length: 26 }, (_, index) =>+ getMockModelCacheInfo({+ id: index + 1,+ card_id: index + 1,+ state: "persisted",+ }),+ ),+ });+ const getPagination = () =>+ screen.getByRole("navigation", { name: "pagination" });+ const getLastListParams = () => {+ const url = fetchMock.callHistory.lastCall("path:/api/persist")?.url;+ return new URL(url ?? "http://localhost").searchParams;+ };++ expect(await screen.findByTestId("pagination-total")).toHaveTextContent(+ "26",+ );+ expect(getPagination()).toHaveTextContent("1 - 25 of 26");+ expect(getLastListParams().get("limit")).toBe("25");+ expect(getLastListParams().get("offset")).toBe("0");++ await userEvent.click(screen.getByRole("button", { name: "Next page" }));++ await waitFor(() =>+ expect(getPagination()).toHaveTextContent("26 - 26 of 26"),+ );+ expect(getLastListParams().get("limit")).toBe("25");+ expect(getLastListParams().get("offset")).toBe("25");+ });+it("sorts client-side by Model when its header is clicked", async () => {await setup({logs: [diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsxindex 5e36f4632da..071bffdd800 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx@@ -5,18 +5,17 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { PaginationControls } from "metabase/common/components/PaginationControls";import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { useUrlState } from "metabase/common/hooks/use-url-state";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useLocation } from "metabase/router";import { Center, Flex, Group } from "metabase/ui";import { TaskPicker } from "../TaskPicker";import { TaskStatusPicker } from "../TaskStatusPicker";-import { TasksTabs } from "../TasksTabs";+import { TasksPageLayout } from "../TasksPageLayout";import { TasksTable } from "./TasksTable";import { urlStateConfig } from "./utils";-const PAGE_SIZE = 50;-export const TaskListPage = () => {const location = useLocation();const [@@ -62,7 +61,7 @@ export const TaskListPage = () => {const error = tasksError || databasesError;return (- <TasksTabs>+ <TasksPageLayout><Group gap="lg" align="center" wrap="nowrap"><TaskPickervalue={task}@@ -110,6 +109,6 @@ export const TaskListPage = () => {/></Flex>)}- </TasksTabs>+ </TasksPageLayout>);};diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsxindex 8186e9fa642..c774df9b81b 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx@@ -3,6 +3,7 @@ import fetchMock from "fetch-mock";import {setupDatabasesEndpoints,+ setupTaskCountsEndpoint,setupTasksEndpoints,setupUniqueTasksEndpoint,} from "__support__/server-mocks";@@ -41,6 +42,7 @@ const setup = ({}),tasksResponse = createMockTasksResponse(),}: SetupOpts = {}) => {+ setupTaskCountsEndpoint({ tasks: tasksResponse.total, runs: 0 });setupDatabasesEndpoints([createSampleDatabase()]);setupUniqueTasksEndpoint(["task-a", "task-b"]);mockGetBoundingClientRect({ width: 100, height: 100 });@@ -114,8 +116,8 @@ describe("TaskListPage", () => {it("should have working pagination controls if there's more than 1 page", async () => {const { router } = setup({tasksResponse: createMockTasksResponse({- total: 75,- limit: 50,+ total: 42,+ limit: 25,offset: 0,}),});@@ -127,7 +129,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);const previousPage = await screen.findByRole("button", {name: "Previous page",@@ -145,8 +147,8 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",]);await waitForLoaderToBeRemoved();expect(previousPage).toBeEnabled();@@ -158,9 +160,9 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);expect(screen.queryByTestId("loading-indicator")).not.toBeInTheDocument();expect(previousPage).toBeDisabled();@@ -173,7 +175,7 @@ describe("TaskListPage", () => {tasksResponse: createMockTasksResponse({data: [createMockTask()],total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -191,7 +193,7 @@ describe("TaskListPage", () => {const { router } = setup({tasksResponse: createMockTasksResponse({total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -203,7 +205,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);const previousPage = await screen.findByRole("button", {name: "Previous page",@@ -215,8 +217,8 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",]);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -230,9 +232,9 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",]);expect(previousPage).toBeDisabled();expect(nextPage).toBeEnabled();@@ -246,7 +248,7 @@ describe("TaskListPage", () => {const { router } = setup({tasksResponse: createMockTasksResponse({total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -258,7 +260,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);const previousPage = await screen.findByRole("button", {name: "Previous page",@@ -270,8 +272,8 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",]);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -285,9 +287,9 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success",]);expect(previousPage).toBeDisabled();expect(nextPage).toBeEnabled();@@ -302,7 +304,7 @@ describe("TaskListPage", () => {tasksResponse: createMockTasksResponse({data: [createMockTask()],total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -314,7 +316,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);const previousPage = await screen.findByRole("button", {name: "Previous page",@@ -328,8 +330,8 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",]);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -341,9 +343,9 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=asc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=25&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=asc",]);expect(previousPage).toBeDisabled();expect(nextPage).toBeEnabled();@@ -363,7 +365,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);await waitForLoaderToBeRemoved();@@ -389,8 +391,8 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",]);await waitForLoaderToBeRemoved();expect(router?.location.search).toEqual("");@@ -415,9 +417,9 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",]);await waitForLoaderToBeRemoved();expect(router?.location.search).toEqual("?task=task-b");@@ -433,10 +435,10 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success",]);await waitForLoaderToBeRemoved();act(() => {@@ -451,11 +453,11 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success",- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",]);expect(screen.queryByTestId("loading-indicator")).not.toBeInTheDocument();expect(router?.location.search).toEqual("?status=success");@@ -474,7 +476,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task")).toHaveLength(1);});expect(getLastTaskCallUrl()).toEqual(- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",);const startedAtHeader = await screen.findByRole("columnheader", {name: /Started at/,@@ -497,7 +499,7 @@ describe("TaskListPage", () => {).getByRole("img", { name: "chevronup icon" }),).toBeInTheDocument();expect(getLastTaskCallUrl()).toEqual(- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=asc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=asc",);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -513,7 +515,7 @@ describe("TaskListPage", () => {).toHaveAttribute("aria-sort", "descending");});expect(getLastTaskCallUrl()).toEqual(- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc",);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -545,7 +547,7 @@ describe("TaskListPage", () => {),).toBeInTheDocument();expect(getLastTaskCallUrl()).toEqual(- `http://localhost/api/task?limit=50&offset=0&sort_column=${column}&sort_direction=asc`,+ `http://localhost/api/task?limit=25&offset=0&sort_column=${column}&sort_direction=asc`,);act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);@@ -584,7 +586,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&task=task-b",]);await waitForLoaderToBeRemoved();@@ -611,7 +613,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc&status=success",+ "http://localhost/api/task?limit=25&offset=0&sort_column=started_at&sort_direction=desc&status=success",]);await waitForLoaderToBeRemoved();@@ -636,7 +638,7 @@ describe("TaskListPage", () => {expect(fetchMock.callHistory.calls("path:/api/task").map((call) => call.url),).toEqual([- "http://localhost/api/task?limit=50&offset=0&sort_column=duration&sort_direction=asc",+ "http://localhost/api/task?limit=25&offset=0&sort_column=duration&sort_direction=asc",]);});diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsxindex 074ce955d5b..a17c6b94da2 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx@@ -6,6 +6,7 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { PaginationControls } from "metabase/common/components/PaginationControls";import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { useUrlState } from "metabase/common/hooks/use-url-state";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useLocation } from "metabase/router";import { Center, Flex, Group } from "metabase/ui";@@ -14,10 +15,9 @@ import { TaskRunTypePicker } from "../RunTypePicker";import { TaskRunEntityPicker } from "../TaskRunEntityPicker";import { TaskRunDatePicker } from "../TaskRunStartedAtPicker";import { TaskRunStatusPicker } from "../TaskRunStatusPicker";-import { TasksTabs } from "../TasksTabs";+import { TasksPageLayout } from "../TasksPageLayout";import { TaskRunsTable } from "./TaskRunsTable";-import { PAGE_SIZE } from "./constants";import { urlStateConfig } from "./utils";export const TaskRunsPage = () => {@@ -70,7 +70,7 @@ export const TaskRunsPage = () => {const entityValue = entityType && entityId ? { entityType, entityId } : null;return (- <TasksTabs>+ <TasksPageLayout><Group gap="lg" align="center" wrap="wrap"><TaskRunTypePickervalue={runType}@@ -155,6 +155,6 @@ export const TaskRunsPage = () => {/></Flex>)}- </TasksTabs>+ </TasksPageLayout>);};diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsxindex e7509b063c9..e51cc12094f 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx@@ -1,7 +1,10 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { setupTaskRunsEndpoints } from "__support__/server-mocks";+import {+ setupTaskCountsEndpoint,+ setupTaskRunsEndpoints,+} from "__support__/server-mocks";import {act,mockGetBoundingClientRect,@@ -31,6 +34,7 @@ const setup = async ({}),initialRoute = PATHNAME,}: SetupOpts = {}) => {+ setupTaskCountsEndpoint({ tasks: 0, runs: taskRunsResponse.total });setupTaskRunsEndpoints(taskRunsResponse);mockGetBoundingClientRect({ width: 100, height: 100 });@@ -111,7 +115,7 @@ describe("TaskRunsPage", () => {taskRunsResponse: createMockTaskRunsResponse({data: [createMockTaskRun()],total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -154,6 +158,8 @@ describe("TaskRunsPage", () => {});const params = getLastRunsParams();+ expect(params.get("limit")).toBe("25");+ expect(params.get("offset")).toBe("0");expect(params.get("sort-column")).toBe("started_at");expect(params.get("sort-direction")).toBe("desc");});@@ -260,7 +266,7 @@ describe("TaskRunsPage", () => {taskRunsResponse: createMockTaskRunsResponse({data: [createMockTaskRun()],total: 75,- limit: 50,+ limit: 25,offset: 0,}),});@@ -275,7 +281,7 @@ describe("TaskRunsPage", () => {await userEvent.click(nextPage);await waitFor(() => {- expect(getLastRunsParams().get("offset")).toBe("50");+ expect(getLastRunsParams().get("offset")).toBe("25");});act(() => {jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/constants.ts b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/constants.tsdeleted file mode 100644index c0b65ab6b8e..00000000000--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/constants.ts+++ /dev/null@@ -1 +0,0 @@-export const PAGE_SIZE = 50;diff --git a/frontend/src/metabase/monitor/tools/components/TasksPageLayout/TasksPageLayout.tsx b/frontend/src/metabase/monitor/tools/components/TasksPageLayout/TasksPageLayout.tsxnew file mode 100644index 00000000000..def4bd1202a--- /dev/null+++ b/frontend/src/metabase/monitor/tools/components/TasksPageLayout/TasksPageLayout.tsx@@ -0,0 +1,24 @@+import type { ReactNode } from "react";+import { t } from "ttag";++import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { Flex, Stack } from "metabase/ui";++import { TasksTabs } from "../TasksTabs";++type TasksPageLayoutProps = {+ children: ReactNode;+};++export const TasksPageLayout = ({ children }: TasksPageLayoutProps) => (+ <Flex h="100%" wrap="nowrap">+ <MonitorMain>+ <Stack gap="xl">+ <MonitorHeaderTitle>{t`Background tasks`}</MonitorHeaderTitle>+ <TasksTabs />+ </Stack>+ {children}+ </MonitorMain>+ </Flex>+);diff --git a/frontend/src/metabase/monitor/tools/components/TasksPageLayout/index.ts b/frontend/src/metabase/monitor/tools/components/TasksPageLayout/index.tsnew file mode 100644index 00000000000..b6a41599859--- /dev/null+++ b/frontend/src/metabase/monitor/tools/components/TasksPageLayout/index.ts@@ -0,0 +1 @@+export { TasksPageLayout } from "./TasksPageLayout";diff --git a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsxindex 39e75d0c11f..67e92c61f7f 100644--- a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx+++ b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx@@ -1,34 +1,27 @@-import type { ReactNode } from "react";import { t } from "ttag";+import { useGetTaskCountsQuery } from "metabase/api";import {type PillTab,PillTabNavigation,+ getTabCount,} from "metabase/common/components/PillTabNavigation";-import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";-import { MonitorMain } from "metabase/monitor/components/MonitorLayout";-import { Flex, Stack } from "metabase/ui";import * as Urls from "metabase/urls";-type TasksTabsProps = {- children: ReactNode;-};--export const TasksTabs = ({ children }: TasksTabsProps) => {+export const TasksTabs = () => {+ const { currentData: counts, isError } = useGetTaskCountsQuery();const tabs: PillTab[] = [- { label: t`Tasks`, to: Urls.monitorTasksList() },- { label: t`Runs`, to: Urls.monitorTasksRuns() },+ {+ label: t`Tasks`,+ to: Urls.monitorTasksList(),+ count: getTabCount({ value: counts?.tasks, isError }),+ },+ {+ label: t`Runs`,+ to: Urls.monitorTasksRuns(),+ count: getTabCount({ value: counts?.runs, isError }),+ },];- return (- <Flex h="100%" wrap="nowrap">- <MonitorMain>- <Stack gap="xl">- <MonitorHeaderTitle>{t`Background tasks`}</MonitorHeaderTitle>- <PillTabNavigation tabs={tabs} />- </Stack>- {children}- </MonitorMain>- </Flex>- );+ return <PillTabNavigation tabs={tabs} />;};diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsxindex d13d43923b4..b0f8e49c2c0 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx@@ -4,8 +4,8 @@ import { useCallback, useEffect, useMemo, useState } from "react";import { t } from "ttag";import {- useAdminListNotificationsQuery,useBulkNotificationActionMutation,+ useGetAdminNotificationCountsQuery,useLazyAdminListNotificationsQuery,} from "metabase/api";import {@@ -13,8 +13,8 @@ import {BulkActionButton,} from "metabase/common/components/BulkActionBar";import { DebouncedSearchInput } from "metabase/common/components/DebouncedSearchInput";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PaginationControls } from "metabase/common/components/PaginationControls";+import { getTabCount } from "metabase/common/components/PillTabNavigation";import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useUrlState } from "metabase/common/hooks/use-url-state";@@ -22,6 +22,7 @@ import { SIDEBAR_WIDTH } from "metabase/monitor/components/DetailSidebar";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";+import { PAGE_SIZE } from "metabase/monitor/constants";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { useLocation, useNavigate, useParams } from "metabase/router";@@ -44,11 +45,10 @@ import {import {DEFAULT_SORT_COLUMN,DEFAULT_SORT_DIRECTION,- PAGE_SIZE,SORT_COLUMN_VALUES,} from "./constants";import type { RouteParams } from "./types";-import { buildListParams, getTabCount, urlStateConfig } from "./utils";+import { buildListParams, urlStateConfig } from "./utils";export const NotificationsAdminPage = () => {const location = useLocation();@@ -76,38 +76,10 @@ export const NotificationsAdminPage = () => {);const selectedCount = selectedNotifications.length;- const {- currentData: allCountData,- error: allCountError,- isFetching: isAllCountFetching,- } = useAdminListNotificationsQuery({- limit: 1,- offset: 0,- active: urlState.active ?? undefined,- });- const {- currentData: failingData,- error: failingError,- isFetching: isFailingFetching,- } = useAdminListNotificationsQuery({- limit: 1,- offset: 0,- active: urlState.active ?? undefined,- last_check_status: "failing",- });- const {- currentData: ownerlessData,- error: ownerlessError,- isFetching: isOwnerlessFetching,- } = useAdminListNotificationsQuery({- limit: 1,- offset: 0,- active: urlState.active ?? undefined,- creatorless: true,- });- const allCount = allCountData?.total ?? 0;- const failingCount = failingData?.total ?? 0;- const ownerlessCount = ownerlessData?.total ?? 0;+ const { currentData: counts, isError: isCountsError } =+ useGetAdminNotificationCountsQuery(undefined, {+ refetchOnMountOrArgChange: true,+ });const [bulkAction, { isLoading: isBulkLoading }] =useBulkNotificationActionMutation();@@ -276,18 +248,18 @@ export const NotificationsAdminPage = () => {);const isSidebarOpen = notificationId !== undefined;- const countError = failingError ?? ownerlessError;- const allTabCount = getTabCount(isAllCountFetching, allCountError, allCount);- const failingTabCount = getTabCount(- isFailingFetching,- failingError,- failingCount,- );- const ownerlessTabCount = getTabCount(- isOwnerlessFetching,- ownerlessError,- ownerlessCount,- );+ const allTabCount = getTabCount({+ value: counts?.all,+ isError: isCountsError,+ });+ const failingTabCount = getTabCount({+ value: counts?.failing,+ isError: isCountsError,+ });+ const ownerlessTabCount = getTabCount({+ value: counts?.ownerless,+ isError: isCountsError,+ });const { prevNotificationId, nextNotificationId, notificationSummary } =useMemo(() => {@@ -316,10 +288,6 @@ export const NotificationsAdminPage = () => {};}, [notificationId, notifications]);- if (countError) {- return <LoadingAndErrorWrapper error={countError} />;- }-return (<><Flex ref={containerRef} h="100%" wrap="nowrap">diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsxindex 6f05b96604e..7b6e4d6b1f5 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx@@ -1,5 +1,5 @@import userEvent from "@testing-library/user-event";-import fetchMock from "fetch-mock";+import fetchMock, { type CallLog } from "fetch-mock";import {findRequests,@@ -8,6 +8,9 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import {+ setupAdminListNotificationsEndpoint,+ setupAdminNotificationCountsEndpoint,+ setupAdminNotificationCountsErrorEndpoint,setupAdminNotificationDetailEndpoint,setupAdminNotificationDetailErrorEndpoint,setupBulkNotificationActionEndpoint,@@ -22,10 +25,14 @@ import {} from "__support__/ui";import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";import { MonitorContent } from "metabase/monitor/components/MonitorLayout/MonitorContent";+import { PAGE_SIZE } from "metabase/monitor/constants";import { Route } from "metabase/router";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";+import { defer } from "metabase/utils/promise";import type {AdminNotification,+ AdminNotificationCountsResponse,+ AdminNotificationListResponse,NotificationId,UserListResult,} from "metabase-types/api";@@ -42,7 +49,6 @@ import {} from "metabase-types/api/mocks";import { NotificationsAdminPage } from "./NotificationsAdminPage";-import { PAGE_SIZE } from "./constants";const PATHNAME = "/monitor/notifications";@@ -137,9 +143,12 @@ type SetupOpts = {cardDelay?: number;detailDelay?: number;detailErrorId?: NotificationId;- failingCountError?: boolean;- allCountError?: boolean;+ countsError?: boolean;+ countsDelay?: number;refetchDelay?: number;+ getListResponse?: (+ call: CallLog,+ ) => AdminNotificationListResponse | Promise<AdminNotificationListResponse>;};const setup = ({@@ -153,40 +162,38 @@ const setup = ({cardDelay,detailDelay,detailErrorId,- failingCountError = false,- allCountError = false,+ countsError = false,+ countsDelay,refetchDelay,+ getListResponse,}: SetupOpts = {}) => {let listCallCount = 0;- fetchMock.get("path:/api/notification/admin", (call) => {- const params = new URL(call.url).searchParams;- if (- params.get("limit") === "1" &&- params.get("last_check_status") === "failing"- ) {- return failingCountError- ? { status: 500, body: { message: "Count failed" } }- : { data: [], total: failingCount, limit: 1, offset: 0 };- }- if (params.get("limit") === "1" && params.get("creatorless") === "true") {- return { data: [], total: ownerlessCount, limit: 1, offset: 0 };- }- if (- params.get("limit") === "1" &&- !params.has("last_check_status") &&- !params.has("creatorless")- ) {- return allCountError- ? { status: 500, body: { message: "All count failed" } }- : { data: [], total: allCount, limit: 1, offset: 0 };+ if (countsError) {+ setupAdminNotificationCountsErrorEndpoint();+ } else {+ setupAdminNotificationCountsEndpoint(+ { all: allCount, failing: failingCount, ownerless: ownerlessCount },+ { delay: countsDelay, name: "admin-notification-counts" },+ );+ }+ setupAdminListNotificationsEndpoint((call) => {+ if (getListResponse) {+ return getListResponse(call);}- const page = { data: notifications, total, limit: PAGE_SIZE, offset: 0 };+ const page: AdminNotificationListResponse = {+ data: notifications,+ total,+ limit: PAGE_SIZE,+ offset: 0,+ };listCallCount += 1;// Keep every refetch except the initial load in flight, so tests can// observe the loading state the grid.return refetchDelay !== undefined && listCallCount > 1- ? new Promise((resolve) => setTimeout(() => resolve(page), refetchDelay))+ ? new Promise<AdminNotificationListResponse>((resolve) =>+ setTimeout(() => resolve(page), refetchDelay),+ ): page;});@@ -214,16 +221,19 @@ const setup = ({}return renderWithProviders(- <Route- path="/monitor/notifications"- element={- <MonitorContent>- <NotificationsAdminPage />- </MonitorContent>- }- >- <Route path=":notificationId" />- </Route>,+ <>+ <Route+ path="/monitor/notifications"+ element={+ <MonitorContent>+ <NotificationsAdminPage />+ </MonitorContent>+ }+ >+ <Route path=":notificationId" />+ </Route>+ <Route path="/outside" element={<div>Outside Alerts</div>} />+ </>,{ withRouter: true, initialRoute },);};@@ -236,24 +246,8 @@ const getListCalls = () =>new URL(call.url).searchParams.get("limit") === String(PAGE_SIZE),);-const getAllCountCalls = () =>- fetchMock.callHistory.calls("path:/api/notification/admin").filter((call) => {- const params = new URL(call.url).searchParams;- return (- params.get("limit") === "1" &&- !params.has("last_check_status") &&- !params.has("creatorless")- );- });--const getFailingCountCalls = () =>- fetchMock.callHistory.calls("path:/api/notification/admin").filter((call) => {- const params = new URL(call.url).searchParams;- return (- params.get("limit") === "1" &&- params.get("last_check_status") === "failing"- );- });+const getCountCalls = () =>+ fetchMock.callHistory.calls("path:/api/notification/admin/counts");const getBulkPosts = async () =>(await findRequests("POST")).filter((request) =>@@ -421,6 +415,59 @@ describe("NotificationsAdminPage", () => {expect(within(allTab).getByText("137")).toBeInTheDocument();});+ it("reuses the section counts when switching tabs repeatedly", async () => {+ const { router } = setup({+ allCount: 137,+ failingCount: 9,+ ownerlessCount: 33,+ });+ await waitForTableToLoad();+ expect(+ await within(+ screen.getByRole("button", { name: "All alerts" }),+ ).findByText("137"),+ ).toBeVisible();++ for (let visit = 0; visit < 2; visit++) {+ for (const [label, tab] of [+ ["Failing", "failing"],+ ["Ownerless", "ownerless"],+ ["All alerts", "all"],+ ]) {+ await userEvent.click(screen.getByRole("button", { name: label }));+ await waitFor(() => {+ expect(+ new URLSearchParams(router?.location.search).get("tab") ?? "all",+ ).toBe(tab);+ });+ await waitForTableToLoad();+ }+ }+ expect(getCountCalls()).toHaveLength(1);+ });++ it("refreshes cached counters when returning to Alerts", async () => {+ const { router } = setup({ allCount: 9 });+ await waitForTableToLoad();+ expect(+ await within(+ screen.getByRole("button", { name: "All alerts" }),+ ).findByText("9"),+ ).toBeVisible();+ await act(async () => router?.navigate("/outside"));+ await screen.findByText("Outside Alerts");+ fetchMock.modifyRoute("admin-notification-counts", {+ response: { all: 10, failing: 0, ownerless: 0 },+ });+ await act(async () => router?.navigate(PATHNAME));+ expect(+ await within(+ screen.getByRole("button", { name: "All alerts" }),+ ).findByText("10"),+ ).toBeVisible();+ expect(getCountCalls()).toHaveLength(2);+ });+it("pushes the selected tab to the URL", async () => {const { router } = setup({ failingCount: 2 });await waitForTableToLoad();@@ -467,47 +514,191 @@ describe("NotificationsAdminPage", () => {).toBeInTheDocument();});- it("counts all alerts with the active filter applied", async () => {- setup({ initialRoute: `${PATHNAME}?active=false` });- await waitForTableToLoad();+ it.each(["false", "all"])(+ "keeps counters on the default population when the table's active filter is %s",+ async (active) => {+ setup({ initialRoute: `${PATHNAME}?active=${active}`, allCount: 23 });+ await waitForTableToLoad();- const [countCall] = getAllCountCalls();- expect(new URL(countCall.url).searchParams.get("active")).toBe("false");- });+ expect(+ await within(+ screen.getByRole("button", { name: "All alerts" }),+ ).findByText("23"),+ ).toBeInTheDocument();+ expect(getCountCalls()).toHaveLength(1);+ expect(new URL(getCountCalls()[0].url).search).toBe("");+ expect(+ fetchMock.callHistory+ .calls("path:/api/notification/admin")+ .every(+ (call) =>+ new URL(call.url).searchParams.get("limit") ===+ String(PAGE_SIZE),+ ),+ ).toBe(true);+ },+ );- it("counts inactive failing alerts when the status filter includes them", async () => {- setup({ initialRoute: `${PATHNAME}?active=all` });+ it("keeps alert navigation usable when the count endpoint fails", async () => {+ setup({ countsError: true });await waitForTableToLoad();+ await waitFor(() =>+ expect(screen.queryAllByTestId("tab-count-skeleton")).toHaveLength(0),+ );+ await userEvent.click(screen.getByRole("button", { name: "Failing" }));+ await waitForTableToLoad();+ expect(screen.getByRole("button", { name: "Failing" })).toHaveAttribute(+ "aria-current",+ "page",+ );+ expect(getCountCalls()).toHaveLength(1);+ });- const [countCall] = getFailingCountCalls();- expect(new URL(countCall.url).searchParams.get("active")).toBeNull();+ it("does not wait for counters to show the alert table", async () => {+ setup({ countsDelay: 1000, allCount: 137 });+ await waitForTableToLoad();+ expect(getCountCalls()).toHaveLength(1);+ expect(screen.getByTestId("notification-row-1")).toBeInTheDocument();+ expect(screen.getByRole("button", { name: "Failing" })).toBeEnabled();+ act(() => jest.advanceTimersByTime(1000));+ expect(+ await within(+ screen.getByRole("button", { name: "All alerts" }),+ ).findByText("137"),+ ).toBeInTheDocument();});- it("shows count query errors", async () => {- setup({ failingCountError: true });+ it("refreshes counters after archiving and keeps the previous count until the response arrives", async () => {+ setup({ allCount: 1 });+ await waitForTableToLoad();+ const allTab = screen.getByRole("button", { name: "All alerts" });+ expect(await within(allTab).findByText("1")).toBeInTheDocument();+ const countsRefetch = defer<AdminNotificationCountsResponse>();+ fetchMock.modifyRoute("admin-notification-counts", {+ response: () => countsRefetch.promise,+ });- expect(await screen.findByText("Count failed")).toBeInTheDocument();+ await userEvent.click(+ screen.getByRole("checkbox", { name: "Select all" }),+ );+ await userEvent.click(+ within(screen.getByTestId("toast-card")).getByRole("button", {+ name: "Delete",+ }),+ );+ await userEvent.click(+ within(await screen.findByTestId("confirm-modal")).getByRole("button", {+ name: "Delete",+ }),+ );++ await waitFor(() => expect(getCountCalls()).toHaveLength(2));+ expect(within(allTab).getByText("1")).toBeInTheDocument();+ act(() => countsRefetch.resolve({ all: 0, failing: 0, ownerless: 0 }));+ expect(await within(allTab).findByText("0")).toBeInTheDocument();});+ });- it("keeps the page usable when only the all-count request fails", async () => {- setup({ allCountError: true, failingCount: 2 });+ describe("search, sorting and pagination", () => {+ it("shows a skeleton only initially and keeps rows under the loader while paging", async () => {+ const pending = defer<AdminNotificationListResponse>();+ const nextPage: AdminNotificationListResponse = {+ data: [notification2],+ total: 26,+ limit: 25,+ offset: 25,+ };+ setup({+ getListResponse: ({ url }) =>+ new URL(url).searchParams.get("offset") === "25"+ ? pending.promise+ : { ...nextPage, data: [notification1], offset: 0 },+ });+ expect(screen.getByTestId("tree-table-skeleton")).toBeVisible();await waitForTableToLoad();-- expect(screen.queryByText("All count failed")).not.toBeInTheDocument();+ await userEvent.click(screen.getByLabelText("Next page"));+ await waitFor(() => expect(getListCalls()).toHaveLength(2));+ expect(screen.getByTestId("notification-row-1")).toBeVisible();+ expect(screen.getByTestId("loading-overlay")).toBeVisible();expect(- within(screen.getByTestId("notifications-admin-tab-all")).queryByText(- /\d/,- ),+ screen.queryByTestId("tree-table-skeleton"),).not.toBeInTheDocument();+ expect(screen.getByTestId("pagination-total")).toHaveTextContent("26");+ await act(async () => pending.resolve(nextPage));expect(- within(screen.getByTestId("notifications-admin-tab-failing")).getByText(- "2",- ),+ await screen.findByTestId("notification-row-2"),).toBeInTheDocument();+ expect(+ screen.queryByTestId("notification-row-1"),+ ).not.toBeInTheDocument();});- });- describe("search, sorting and pagination", () => {+ it("pages Ownerless alerts by 25 rows and keeps its filters", async () => {+ const ownerless = Array.from({ length: 42 }, (_, index) =>+ createMockAdminNotification({+ id: index + 1,+ creator_id: null,+ creator: null,+ }),+ );+ const all = [+ ...ownerless,+ createMockAdminNotification({ id: 99, creator: ANN }),+ ];+ setup({+ ownerlessCount: 42,+ initialRoute: `${PATHNAME}?tab=ownerless`,+ getListResponse: ({ url }) => {+ const params = new URL(url).searchParams;+ const rows = params.get("creatorless") === "true" ? ownerless : all;+ const offset = Number(params.get("offset"));+ const limit = Number(params.get("limit"));+ return {+ data: rows.slice(offset, offset + limit),+ total: rows.length,+ limit,+ offset,+ };+ },+ });+ await waitForTableToLoad();+ expect(screen.getByTestId("pagination-total")).toHaveTextContent("42");+ expect(screen.getByTestId("notification-row-1")).toBeInTheDocument();++ await userEvent.click(screen.getByRole("button", { name: "Next page" }));++ expect(+ await screen.findByTestId("notification-row-26"),+ ).toBeInTheDocument();+ expect(+ screen.queryByTestId("notification-row-1"),+ ).not.toBeInTheDocument();+ expect(screen.getByRole("button", { name: "Next page" })).toBeDisabled();+ const params = new URL(getListCalls()[1].url).searchParams;+ expect(params.get("limit")).toBe("25");+ expect(params.get("offset")).toBe("25");+ expect(params.get("active")).toBe("true");+ expect(params.get("creatorless")).toBe("true");+ });++ it.each([0, 25])(+ "hides the pager when %i alerts fit on one page",+ async (total) => {+ setup({+ notifications: Array.from({ length: total }, (_, index) =>+ createMockAdminNotification({ id: index + 1 }),+ ),+ });+ await waitForTableToLoad();+ expect(+ screen.queryByTestId("pagination-total"),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole("button", { name: "Next page" }),+ ).not.toBeInTheDocument();+ },+ );+it("pushes the search query to the URL", async () => {const { router } = setup();await waitForTableToLoad();@@ -572,7 +763,7 @@ describe("NotificationsAdminPage", () => {await waitFor(() => {expect(- getListCalls().some((call) => call.url.includes("offset=50")),+ getListCalls().some((call) => call.url.includes("offset=25")),).toBe(true);});diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/constants.ts b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/constants.tsindex 7f6a56f5a5f..e72a5b79f24 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/constants.ts+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/constants.ts@@ -7,8 +7,6 @@ import type {import type { NotificationsTab, TabFilters } from "./types";-export const PAGE_SIZE = 50;-export const DEFAULT_TAB: NotificationsTab = "all";export const DEFAULT_ACTIVE: boolean | null = true;diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/types.ts b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/types.tsindex c2a6ccbc94a..3a1375cf82e 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/types.ts+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/types.ts@@ -12,11 +12,6 @@ export type RouteParams = {export type NotificationsTab = "all" | "failing" | "ownerless";-export type TabCountState =- | { status: "loading" }- | { status: "error" }- | { status: "loaded"; value: number };-export type NotificationsUrlState = {page: number;active: boolean | null;diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.ts b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.tsindex 827a281309b..e1d0180b851 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.ts+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.ts@@ -30,11 +30,7 @@ import {TAB_FILTERS,TAB_VALUES,} from "./constants";-import type {- NotificationsTab,- NotificationsUrlState,- TabCountState,-} from "./types";+import type { NotificationsTab, NotificationsUrlState } from "./types";const parsePage = (param: QueryParam): number => {const value = getFirstParamValue(param);@@ -203,20 +199,6 @@ export const buildListParams = (};};-export const getTabCount = (- isLoading: boolean,- error: unknown,- value: number,-): TabCountState => {- if (isLoading) {- return { status: "loading" };- }- if (error !== undefined) {- return { status: "error" };- }- return { status: "loaded", value };-};-export const getChannelLabel = (channel: NotificationChannelType): string =>match(channel).with("channel/email", () => t`Email`)diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.unit.spec.ts b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.unit.spec.tsindex a02797927d8..526a87817c8 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.unit.spec.ts+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/utils.unit.spec.ts@@ -1,7 +1,7 @@import { dayjs } from "metabase/dayjs";+import { PAGE_SIZE } from "metabase/monitor/constants";import type { NotificationChannelType } from "metabase-types/api";-import { PAGE_SIZE } from "./constants";import type { NotificationsUrlState } from "./types";import {buildListParams,diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsxindex c3655ee75d8..b309e1a3512 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx@@ -1,13 +1,14 @@-import { match } from "ts-pattern";import { t } from "ttag";-import { Badge, Icon, Skeleton, Tabs } from "metabase/ui";+import {+ PillTabNavigation,+ type TabCountState,+} from "metabase/common/components/PillTabNavigation";import type { IconName } from "metabase-types/api";import type {NotificationsTab,NotificationsUrlState,- TabCountState,} from "../NotificationsAdminPage/types";import { trackAlertsManagementTabClicked } from "../analytics";@@ -27,36 +28,6 @@ type TabConfig = {patch: Partial<NotificationsUrlState>;};-const TabCountBadge = ({- count,- isActive,-}: {- count: TabCountState;- isActive: boolean;-}) =>- match(count)- .with({ status: "loading" }, () => (- <Skeleton- h={16}- miw="1.5rem"- radius="xl"- data-testid="tab-count-skeleton"- />- ))- .with({ status: "loaded" }, ({ value }) => (- <Badge- variant="light"- size="xs"- color="neutral"- bg={isActive ? "background_surface-secondary-hover" : undefined}- c={isActive ? "text-primary-inverse" : undefined}- >- {value}- </Badge>- ))- .with({ status: "error" }, () => null)- .exhaustive();-export const NotificationsTabs = ({tab,allCount,@@ -96,39 +67,20 @@ export const NotificationsTabs = ({},];- const handleTabChange = (value: NotificationsTab | null) => {- const next = tabs.find((config) => config.value === value);- if (next !== undefined) {- trackAlertsManagementTabClicked(next.value);- onChange(next.patch);- }- };-return (- <Tabs- variant="pills"- value={tab}- onChange={handleTabChange}+ <PillTabNavigationdata-testid="notifications-admin-tabs"- >- <Tabs.List>- {tabs.map((config) => (- <Tabs.Tab- key={config.value}- value={config.value}- leftSection={<Icon name={config.icon} size={16} />}- rightSection={- <TabCountBadge- count={config.count}- isActive={config.value === tab}- />- }- data-testid={`notifications-admin-tab-${config.value}`}- >- {config.label}- </Tabs.Tab>- ))}- </Tabs.List>- </Tabs>+ tabs={tabs.map((config) => ({+ label: config.label,+ icon: config.icon,+ count: config.count,+ isSelected: config.value === tab,+ "data-testid": `notifications-admin-tab-${config.value}`,+ onClick: () => {+ trackAlertsManagementTabClicked(config.value);+ onChange(config.patch);+ },+ }))}+ />);};diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.unit.spec.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.unit.spec.tsxindex e4683fd4737..3871515e96c 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.unit.spec.tsx@@ -1,120 +1,92 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, within } from "__support__/ui";+import type { TabCountState } from "metabase/common/components/PillTabNavigation";++import type {+ NotificationsTab,+ NotificationsUrlState,+} from "../NotificationsAdminPage/types";+import { trackAlertsManagementTabClicked } from "../analytics";import { NotificationsTabs } from "./NotificationsTabs";jest.mock("../analytics", () => ({- trackAlertsManagementTabClicked: jest.fn(),+ trackAlertsManagementTabClicked: jest.fn<void, [NotificationsTab]>(),}));-describe("NotificationsTabs", () => {- it("defaults the Failing tab to sort by last_check so newly surfaced failures aren't buried at the bottom", async () => {- const onChange = jest.fn();- renderWithProviders(- <NotificationsTabs- tab="all"- allCount={{ status: "loaded", value: 3 }}- failingCount={{ status: "loaded", value: 3 }}- ownerlessCount={{ status: "loaded", value: 0 }}- onChange={onChange}- />,- );+interface SetupOpts {+ tab?: NotificationsTab;+ allCount?: TabCountState;+ failingCount?: TabCountState;+ ownerlessCount?: TabCountState;+}- await userEvent.click(screen.getByRole("tab", { name: /Failing/ }));+function setup({+ tab = "all",+ allCount = { status: "loaded", value: 5 },+ failingCount = { status: "loaded", value: 2 },+ ownerlessCount = { status: "loaded", value: 0 },+}: SetupOpts = {}) {+ const onChange = jest.fn<void, [Partial<NotificationsUrlState>]>();+ renderWithProviders(+ <NotificationsTabs+ tab={tab}+ allCount={allCount}+ failingCount={failingCount}+ ownerlessCount={ownerlessCount}+ onChange={onChange}+ />,+ { withRouter: true },+ );+ return { onChange };+}- expect(onChange).toHaveBeenCalledWith(- expect.objectContaining({- tab: "failing",- sort_column: "last_check",- sort_direction: "desc",- }),- );+describe("NotificationsTabs", () => {+ it("defaults Failing to last_check descending and clears the send-status filter", async () => {+ const { onChange } = setup();+ await userEvent.click(screen.getByRole("button", { name: "Failing" }));+ expect(onChange).toHaveBeenCalledTimes(1);+ expect(onChange).toHaveBeenCalledWith({+ tab: "failing",+ last_send_status: null,+ sort_column: "last_check",+ sort_direction: "desc",+ });+ expect(trackAlertsManagementTabClicked).toHaveBeenCalledTimes(1);+ expect(trackAlertsManagementTabClicked).toHaveBeenCalledWith("failing");});- it("always renders all three tabs, even when a tab's count is zero", () => {- renderWithProviders(- <NotificationsTabs- tab="all"- allCount={{ status: "loaded", value: 5 }}- failingCount={{ status: "loaded", value: 0 }}- ownerlessCount={{ status: "loaded", value: 0 }}- onChange={jest.fn()}- />,- );-- expect(- screen.getByTestId("notifications-admin-tab-all"),- ).toBeInTheDocument();- expect(- screen.getByTestId("notifications-admin-tab-failing"),- ).toBeInTheDocument();- expect(- screen.getByTestId("notifications-admin-tab-ownerless"),- ).toBeInTheDocument();+ it("clears the creator-active filter when switching to Ownerless", async () => {+ const { onChange } = setup();+ await userEvent.click(screen.getByRole("button", { name: "Ownerless" }));+ expect(onChange).toHaveBeenCalledWith({+ tab: "ownerless",+ creator_active: null,+ });});- it("shows the resolved count next to each tab", () => {- renderWithProviders(- <NotificationsTabs- tab="all"- allCount={{ status: "loaded", value: 5 }}- failingCount={{ status: "loaded", value: 2 }}- ownerlessCount={{ status: "loaded", value: 0 }}- onChange={jest.fn()}- />,+ it("marks the selected tab as the current page", () => {+ setup({ tab: "ownerless" });+ expect(screen.getByRole("button", { name: "Ownerless" })).toHaveAttribute(+ "aria-current",+ "page",);-- expect(- within(screen.getByTestId("notifications-admin-tab-failing")).getByText(- "2",- ),- ).toBeInTheDocument();expect(- within(screen.getByTestId("notifications-admin-tab-ownerless")).getByText(- "0",- ),- ).toBeInTheDocument();+ screen.getByRole("button", { name: "All alerts" }),+ ).not.toHaveAttribute("aria-current");});- it("drops the badge when a count fails to load", () => {- renderWithProviders(- <NotificationsTabs- tab="all"- allCount={{ status: "error" }}- failingCount={{ status: "loaded", value: 2 }}- ownerlessCount={{ status: "loaded", value: 0 }}- onChange={jest.fn()}- />,- );-+ it("maps each dataset count to its tab", () => {+ setup();expect(- within(screen.getByTestId("notifications-admin-tab-all")).queryByText(- /\d/,- ),- ).not.toBeInTheDocument();+ within(screen.getByRole("button", { name: "All alerts" })).getByText("5"),+ ).toBeInTheDocument();expect(- within(screen.getByTestId("notifications-admin-tab-failing")).getByText(- "2",- ),+ within(screen.getByRole("button", { name: "Failing" })).getByText("2"),).toBeInTheDocument();- });-- it("shows a loading placeholder instead of a count while it resolves", () => {- renderWithProviders(- <NotificationsTabs- tab="all"- allCount={{ status: "loading" }}- failingCount={{ status: "loading" }}- ownerlessCount={{ status: "loading" }}- onChange={jest.fn()}- />,- );-- const failingTab = screen.getByTestId("notifications-admin-tab-failing");expect(- within(failingTab).getByTestId("tab-count-skeleton"),+ within(screen.getByRole("button", { name: "Ownerless" })).getByText("0"),).toBeInTheDocument();- expect(within(failingTab).queryByText(/\d/)).not.toBeInTheDocument();});});diff --git a/frontend/src/metabase/monitor/tools/routes.unit.spec.tsx b/frontend/src/metabase/monitor/tools/routes.unit.spec.tsxnew file mode 100644index 00000000000..659bdce0fff--- /dev/null+++ b/frontend/src/metabase/monitor/tools/routes.unit.spec.tsx@@ -0,0 +1,141 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";++import {+ setupDatabasesEndpoints,+ setupTaskCountsEndpoint,+ setupTaskCountsErrorEndpoint,+ setupTaskRunsEndpoints,+ setupTasksEndpoints,+ setupUniqueTasksEndpoint,+} from "__support__/server-mocks";+import {+ act,+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";+import { Route } from "metabase/router";+import * as Urls from "metabase/urls";+import { defer } from "metabase/utils/promise";+import type {+ ListTaskRunsResponse,+ ListTasksResponse,+ TaskCountsResponse,+} from "metabase-types/api";+import { createMockTaskRun } from "metabase-types/api/mocks";++import { getTasksRoutes } from "./routes";++interface SetupOpts {+ countsError?: boolean;+ initialRoute?: string;+}++function setup({+ countsError = false,+ initialRoute = Urls.monitorTasksList(),+}: SetupOpts = {}) {+ if (countsError) {+ setupTaskCountsErrorEndpoint();+ } else {+ setupTaskCountsEndpoint({ tasks: 137, runs: 1 }, { name: "task-counts" });+ }+ const tasksResponse: ListTasksResponse = {+ data: [],+ total: 0,+ limit: 25,+ offset: 0,+ };+ const runsResponse: ListTaskRunsResponse = {+ data: [createMockTaskRun()],+ total: 1,+ limit: 25,+ offset: 0,+ };+ setupTasksEndpoints(tasksResponse);+ setupTaskRunsEndpoints(runsResponse);+ setupDatabasesEndpoints([]);+ setupUniqueTasksEndpoint([]);+ mockGetBoundingClientRect({ width: 100, height: 100 });++ return renderWithProviders(+ <Route path={Urls.monitorTasks()}>{getTasksRoutes()}</Route>,+ { withRouter: true, initialRoute },+ );+}++const getCountCalls = () =>+ fetchMock.callHistory.calls("path:/api/task/counts");+const getTasksTab = () => screen.getByRole("link", { name: "Tasks" });++async function switchToRuns() {+ await userEvent.click(screen.getByRole("link", { name: "Runs" }));+ expect(await screen.findByTestId("task-run")).toBeVisible();+}++async function switchToTasks() {+ await userEvent.click(getTasksTab());+ expect(await screen.findByText("No results")).toBeVisible();+}++describe("task section counts", () => {+ it("requests default counts independently of table filters and pagination", async () => {+ setup({ initialRoute: `${Urls.monitorTasksRuns()}?status=failed` });+ expect(await screen.findByTestId("task-run")).toBeVisible();+ expect(await within(getTasksTab()).findByText("137")).toBeVisible();+ expect(+ within(screen.getByRole("link", { name: "Runs" })).getByText("1"),+ ).toBeVisible();+ const calls = getCountCalls();+ expect(calls).toHaveLength(1);+ expect(new URL(calls[0].url).search).toBe("");+ const listCalls = fetchMock.callHistory.calls("path:/api/task/runs");+ expect(listCalls).toHaveLength(1);+ const params = new URL(listCalls[0].url).searchParams;+ expect(params.get("status")).toBe("failed");+ expect(params.get("offset")).toBe("0");+ expect(params.get("limit")).toBe("25");+ });++ it("does not block tab navigation while counts are pending", async () => {+ const pending = defer<TaskCountsResponse>();+ setup();+ fetchMock.modifyRoute("task-counts", { response: () => pending.promise });+ expect(await screen.findByText("No results")).toBeVisible();+ await switchToRuns();+ await switchToTasks();+ expect(getCountCalls()).toHaveLength(1);+ await act(async () => pending.resolve({ tasks: 137, runs: 1 }));+ expect(await within(getTasksTab()).findByText("137")).toBeVisible();+ });++ it("reuses loaded counts across tab switches", async () => {+ setup();+ expect(await screen.findByText("No results")).toBeVisible();+ expect(await within(getTasksTab()).findByText("137")).toBeVisible();+ for (let visit = 0; visit < 2; visit++) {+ await switchToRuns();+ await switchToTasks();+ }+ expect(getCountCalls()).toHaveLength(1);+ });++ it("keeps tab navigation working and hides badges when counts fail", async () => {+ setup({ countsError: true });+ expect(await screen.findByText("No results")).toBeVisible();+ await waitFor(() =>+ expect(fetchMock.callHistory.done("path:/api/task/counts")).toBe(true),+ );+ await switchToRuns();+ await switchToTasks();+ await waitFor(() =>+ expect(+ within(getTasksTab()).queryByTestId("tab-count-skeleton"),+ ).not.toBeInTheDocument(),+ );+ expect(getTasksTab()).toHaveTextContent(/^Tasks$/);+ });+});diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.tsxindex 45e576cb088..4461f4ed2ab 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.tsx@@ -21,7 +21,7 @@ export function TreeTableSkeleton({const getColumnWidth = (index: number) => `${columnWidths[index] * 100}%`;return (- <Stack gap={0} flex={1} mih={0}>+ <Stack gap={0} flex={1} mih={0} data-testid="tree-table-skeleton"><Flex h={HEADER_HEIGHT} align="center" className={S.header}>{showCheckboxes && (<Box w={CHECKBOX_COLUMN_WIDTH} className={S.checkboxColumn} />diff --git a/frontend/test/__support__/server-mocks/card.ts b/frontend/test/__support__/server-mocks/card.tsindex 80f5d02f80c..cc0720da93b 100644--- a/frontend/test/__support__/server-mocks/card.ts+++ b/frontend/test/__support__/server-mocks/card.ts@@ -31,6 +31,10 @@ export function setupCardEndpoints(card: Card) {});}+export function setupDeleteCardEndpoint(cardId: CardId) {+ fetchMock.delete(`path:/api/card/${cardId}`, 204);+}+export function setupUpdateCardEndpointWithError(cardId: CardId) {fetchMock.put(`path:/api/card/${cardId}`, { status: 500, body: {} });}diff --git a/frontend/test/__support__/server-mocks/content-diagnostics.ts b/frontend/test/__support__/server-mocks/content-diagnostics.tsindex b99084c3515..6d67349547e 100644--- a/frontend/test/__support__/server-mocks/content-diagnostics.ts+++ b/frontend/test/__support__/server-mocks/content-diagnostics.ts@@ -1,6 +1,7 @@-import fetchMock, { type CallLog } from "fetch-mock";+import fetchMock, { type UserRouteConfig } from "fetch-mock";import type {+ ContentDiagnosticsCountsResponse,InvalidateFindingsResponse,ListDuplicatedFindingsResponse,ListImbalancedFindingsResponse,@@ -8,7 +9,25 @@ import type {ListStaleFindingsResponse,} from "metabase-types/api";-type MockResponse<T> = T | ((call: CallLog) => T | Promise<T>);+import type { MockResponse } from "./types";++export function setupContentDiagnosticsCountsEndpoint(+ response: MockResponse<ContentDiagnosticsCountsResponse> = {+ stale: 0,+ duplicated: 0,+ slow: 0,+ empty: 0,+ sparse: 0,+ crowded: 0,+ },+ options?: UserRouteConfig,+) {+ fetchMock.get("path:/api/ee/content-diagnostics/counts", response, options);+}++export function setupContentDiagnosticsCountsErrorEndpoint() {+ fetchMock.get("path:/api/ee/content-diagnostics/counts", { status: 500 });+}export function setupInvalidateFindingsEndpoint(response: MockResponse<InvalidateFindingsResponse | Response>,diff --git a/frontend/test/__support__/server-mocks/database.ts b/frontend/test/__support__/server-mocks/database.tsindex 27efe835c99..2ae2ee99c76 100644--- a/frontend/test/__support__/server-mocks/database.ts+++ b/frontend/test/__support__/server-mocks/database.ts@@ -41,6 +41,18 @@ export function setupDatabaseEndpoints(db: Database) {setupUpdateDatabaseEndpoint(db);}+export function setupDatabaseMetadataEndpoint(db: Database) {+ fetchMock.get(`path:/api/database/${db.id}/metadata`, db, {+ name: `database-${db.id}-metadata`,+ });+}++export function setupDatabaseMetadataErrorEndpoint(databaseId: DatabaseId) {+ fetchMock.get(`path:/api/database/${databaseId}/metadata`, 500, {+ name: `database-${databaseId}-metadata`,+ });+}+export function setupUpdateDatabaseEndpoint(db: Database) {fetchMock.put(`path:/api/database/${db.id}`, async (call) => {const body = await call?.request?.json();diff --git a/frontend/test/__support__/server-mocks/dataset.ts b/frontend/test/__support__/server-mocks/dataset.tsindex 136ff84010e..0e105c831fc 100644--- a/frontend/test/__support__/server-mocks/dataset.ts+++ b/frontend/test/__support__/server-mocks/dataset.ts@@ -1,9 +1,22 @@-import fetchMock from "fetch-mock";+import fetchMock, { type UserRouteConfig } from "fetch-mock";-import type { CardQueryMetadata, ParameterValues } from "metabase-types/api";+import type {+ CardQueryMetadata,+ Dataset,+ ParameterValues,+} from "metabase-types/api";import type { MockDatasetOpts } from "metabase-types/api/mocks";import { createMockDataset } from "metabase-types/api/mocks";+import type { MockResponse } from "./types";++export function setupAdhocQueryEndpoint(+ response: MockResponse<Dataset | Response>,+ options?: UserRouteConfig,+) {+ fetchMock.post("path:/api/dataset", response, options);+}+export function setupAdhocQueryMetadataEndpoint(metadata: CardQueryMetadata) {fetchMock.post(`path:/api/dataset/query_metadata`, metadata, {name: "dataset-query-metadata",diff --git a/frontend/test/__support__/server-mocks/dependencies.ts b/frontend/test/__support__/server-mocks/dependencies.tsindex 512df991fb4..c58a53a550e 100644--- a/frontend/test/__support__/server-mocks/dependencies.ts+++ b/frontend/test/__support__/server-mocks/dependencies.ts@@ -1,12 +1,29 @@-import fetchMock from "fetch-mock";+import fetchMock, { type UserRouteConfig } from "fetch-mock";import type {+ DependencyCountsResponse,DependencyGraph,DependencyNode,ListBreakingGraphNodesResponse,ListUnreferencedGraphNodesResponse,} from "metabase-types/api";+import type { MockResponse } from "./types";++export function setupDependencyCountsEndpoint(+ response: MockResponse<DependencyCountsResponse> = {+ breaking: 0,+ unreferenced: 0,+ },+ options?: UserRouteConfig,+) {+ fetchMock.get("path:/api/ee/dependencies/counts", response, options);+}++export function setupDependencyCountsErrorEndpoint() {+ fetchMock.get("path:/api/ee/dependencies/counts", { status: 500 });+}+export function setupListGraphNodeDependentsEndpoint(nodes: DependencyNode[]) {fetchMock.get("path:/api/ee/dependencies/graph/dependents", nodes);}diff --git a/frontend/test/__support__/server-mocks/notification.ts b/frontend/test/__support__/server-mocks/notification.tsindex 9747a431313..07a9be43274 100644--- a/frontend/test/__support__/server-mocks/notification.ts+++ b/frontend/test/__support__/server-mocks/notification.ts@@ -1,7 +1,8 @@-import fetchMock from "fetch-mock";+import fetchMock, { type CallLog, type UserRouteConfig } from "fetch-mock";import type {AdminNotification,+ AdminNotificationCountsResponse,AdminNotificationDetail,AdminNotificationListResponse,ListNotificationsRequest,@@ -29,18 +30,38 @@ export const setupCreateNotificationEndpoint = () => {});};+export const setupAdminNotificationCountsEndpoint = (+ response: AdminNotificationCountsResponse,+ options?: UserRouteConfig,+) => {+ fetchMock.get("path:/api/notification/admin/counts", response, options);+};++export const setupAdminNotificationCountsErrorEndpoint = () => {+ fetchMock.get("path:/api/notification/admin/counts", { status: 500 });+};+export const setupAdminListNotificationsEndpoint = (- notifications: AdminNotification[] = [],+ response:+ | AdminNotification[]+ | ((+ call: CallLog,+ ) =>+ | AdminNotificationListResponse+ | Promise<AdminNotificationListResponse>) = [],overrides: Partial<AdminNotificationListResponse> = {},) => {- const response: AdminNotificationListResponse = {- data: notifications,- total: notifications.length,- limit: null,- offset: null,- ...overrides,- };- fetchMock.get("path:/api/notification/admin", response);+ const body =+ typeof response === "function"+ ? response+ : {+ data: response,+ total: response.length,+ limit: null,+ offset: null,+ ...overrides,+ };+ fetchMock.get("path:/api/notification/admin", body);};export const setupAdminNotificationDetailEndpoint = (diff --git a/frontend/test/__support__/server-mocks/persist.ts b/frontend/test/__support__/server-mocks/persist.tsindex c85031a099c..7a72d53192f 100644--- a/frontend/test/__support__/server-mocks/persist.ts+++ b/frontend/test/__support__/server-mocks/persist.ts@@ -1,15 +1,24 @@import fetchMock from "fetch-mock";-import type { ModelCacheRefreshStatus } from "metabase-types/api";+import type {+ ListPersistedInfoResponse,+ ModelCacheRefreshStatus,+} from "metabase-types/api";export function setupModelPersistenceEndpoints(persistedModels: ModelCacheRefreshStatus[],) {- fetchMock.get(`path:/api/persist`, {- data: persistedModels,- limit: 20,- offset: 0,- total: persistedModels.length,+ fetchMock.get(`path:/api/persist`, ({ url }) => {+ const params = new URL(url, "http://localhost").searchParams;+ const limit = Number(params.get("limit") ?? persistedModels.length);+ const offset = Number(params.get("offset") ?? 0);+ const response: ListPersistedInfoResponse = {+ data: persistedModels.slice(offset, offset + limit),+ limit,+ offset,+ total: persistedModels.length,+ };+ return response;});for (const persistedModel of persistedModels) {diff --git a/frontend/test/__support__/server-mocks/session-management.ts b/frontend/test/__support__/server-mocks/session-management.tsindex 772ad5ed234..11da38a33d2 100644--- a/frontend/test/__support__/server-mocks/session-management.ts+++ b/frontend/test/__support__/server-mocks/session-management.ts@@ -1,12 +1,24 @@-import fetchMock from "fetch-mock";+import fetchMock, { type UserRouteConfig } from "fetch-mock";import type {RevokeSessionsResponse,Session,+ SessionCountsResponse,SessionListResponse,} from "metabase-types/api";import { createMockRevokeSessionsResponse } from "metabase-types/api/mocks";+export function setupSessionCountsEndpoint(+ response: SessionCountsResponse = { active: 0, ended: 0 },+ options?: UserRouteConfig,+) {+ fetchMock.get("path:/api/ee/session-management/counts", response, options);+}++export function setupSessionCountsErrorEndpoint() {+ fetchMock.get("path:/api/ee/session-management/counts", { status: 500 });+}+export const setupListSessionsEndpoint = (sessions: Session[] = [],overrides: Partial<SessionListResponse> = {},diff --git a/frontend/test/__support__/server-mocks/task.ts b/frontend/test/__support__/server-mocks/task.tsindex 462967c57d6..8056d4bda8a 100644--- a/frontend/test/__support__/server-mocks/task.ts+++ b/frontend/test/__support__/server-mocks/task.ts@@ -4,10 +4,22 @@ import type {ListTaskRunsResponse,ListTasksResponse,Task,+ TaskCountsResponse,TaskInfo,TaskRunExtended,} from "metabase-types/api";+export function setupTaskCountsEndpoint(+ response: TaskCountsResponse = { tasks: 0, runs: 0 },+ options?: UserRouteConfig,+) {+ fetchMock.get("path:/api/task/counts", response, options);+}++export function setupTaskCountsErrorEndpoint() {+ fetchMock.get("path:/api/task/counts", { status: 500 });+}+export function setupTasksEndpoints(response: ListTasksResponse,options?: UserRouteConfig,diff --git a/frontend/test/__support__/server-mocks/types.ts b/frontend/test/__support__/server-mocks/types.tsnew file mode 100644index 00000000000..81c92633c2a--- /dev/null+++ b/frontend/test/__support__/server-mocks/types.ts@@ -0,0 +1,3 @@+import type { CallLog } from "fetch-mock";++export type MockResponse<T> = T | ((call: CallLog) => T | Promise<T>);diff --git a/src/metabase/notification/api/admin.clj b/src/metabase/notification/api/admin.cljindex af5d4cbe170..4d05136a718 100644--- a/src/metabase/notification/api/admin.clj+++ b/src/metabase/notification/api/admin.clj@@ -310,6 +310,17 @@:sort_column sort_column:sort_direction sort_direction}))+(api.macros/defendpoint :get "/counts" :- [:map {:closed true}+ [:all ms/IntGreaterThanOrEqualToZero]+ [:failing ms/IntGreaterThanOrEqualToZero]+ [:ownerless ms/IntGreaterThanOrEqualToZero]]+ "Count active alerts in the All, Failing, and Ownerless Monitor tabs."+ [_route-params _query-params _body _request]+ (api/check-superuser)+ {:all (notification.db/admin-notifications-count {:active true})+ :failing (notification.db/admin-notifications-count {:active true :last_check_status :failing})+ :ownerless (notification.db/admin-notifications-count {:active true :creatorless true})})+;; ---------------------------------------------------------------------------;; Detail endpoint helpers;; ---------------------------------------------------------------------------diff --git a/src/metabase/task_history/api.clj b/src/metabase/task_history/api.cljindex 74c0f0780af..158b06073ae 100644--- a/src/metabase/task_history/api.clj+++ b/src/metabase/task_history/api.clj@@ -188,6 +188,15 @@:started-at-start start:started-at-end end}))+(api.macros/defendpoint :get "/counts" :- [:map {:closed true}+ [:tasks ms/IntGreaterThanOrEqualToZero]+ [:runs ms/IntGreaterThanOrEqualToZero]]+ "Count all retained task history rows and task runs for the Monitor tabs."+ [_route-params _query-params _body _request]+ (perms/check-has-application-permission :monitoring)+ {:tasks (task-history/total nil)+ :runs (task-history.db/task-run-count (run-filters nil))})+(api.macros/defendpoint :get "/runs" :- ::TaskRunsResponse"List task runs with optional filters. Returns runs with hydrated entity names and task counts."[_diff --git a/test/metabase/notification/api/admin_test.clj b/test/metabase/notification/api/admin_test.cljindex 87279a46399..44ab34bd220 100644--- a/test/metabase/notification/api/admin_test.clj+++ b/test/metabase/notification/api/admin_test.clj@@ -6,6 +6,61 @@[metabase.util :as u][toucan2.core :as t2]))+(deftest counts-requires-superuser-test+ (testing "Alert counters are not visible to non-superusers"+ (mt/user-http-request :rasta :get 403 "notification/admin/counts")))++(deftest counts-test+ (testing "Counters include active alert rows, latest failed checks, and both kinds of ownerless alerts"+ (let [all-total (:total (mt/user-http-request :crowberto :get 200 "notification/admin" :active true))+ failing-total (:total (mt/user-http-request :crowberto :get 200 "notification/admin"+ :active true :last_check_status "failing"))+ ownerless-total (:total (mt/user-http-request :crowberto :get 200 "notification/admin"+ :active true :creatorless true))]+ (mt/with-temp [:model/User {deactivated-id :id} {:is_active false}+ :model/Card {card-id :id} {}+ :model/NotificationCard {payload-id :id} {:card_id card-id}+ :model/Notification {healthy-id :id} {:payload_type :notification/card+ :payload_id payload-id+ :active true+ :creator_id (mt/user->id :crowberto)}+ :model/Notification {failing-id :id} {:payload_type :notification/card+ :payload_id payload-id+ :active true+ :creator_id (mt/user->id :crowberto)}+ :model/Notification _ {:payload_type :notification/card+ :payload_id payload-id+ :active true+ :creator_id deactivated-id}+ :model/Notification {creatorless-id :id} {:payload_type :notification/card+ :payload_id payload-id+ :active true+ :creator_id (mt/user->id :crowberto)}+ :model/Notification {inactive-id :id} {:payload_type :notification/card+ :payload_id payload-id+ :active false+ :creator_id deactivated-id}+ :model/Notification _ {:payload_type :notification/system-event :active true}+ :model/TaskRun _ {:run_type :alert :entity_type :card :entity_id card-id+ :notification_id healthy-id :status :failed+ :started_at (t/minus (t/instant) (t/hours 1))+ :ended_at (t/minus (t/instant) (t/hours 1))}+ :model/TaskRun _ {:run_type :alert :entity_type :card :entity_id card-id+ :notification_id healthy-id :status :success+ :started_at (t/instant) :ended_at (t/instant)}+ :model/TaskRun _ {:run_type :alert :entity_type :card :entity_id card-id+ :notification_id failing-id :status :failed+ :started_at (t/instant) :ended_at (t/instant)}+ :model/TaskRun _ {:run_type :alert :entity_type :card :entity_id card-id+ :notification_id inactive-id :status :failed+ :started_at (t/instant) :ended_at (t/instant)}]+ ;; Legacy alerts can lack creators, but new alert validation requires a creator ID.+ (t2/query {:update :notification :set {:creator_id nil} :where [:= :id creatorless-id]})+ (is (= {:all (+ all-total 4), :failing (inc failing-total), :ownerless (+ ownerless-total 2)}+ (mt/user-http-request :crowberto :get 200 "notification/admin/counts")))+ (is (= {:all (+ all-total 4), :failing (inc failing-total), :ownerless (+ ownerless-total 2)}+ (mt/user-http-request :crowberto :get 200 "notification/admin/counts" :limit 1 :offset 100)))))))+(deftest list-stub-returns-shape-test(testing "GET /api/notification/admin returns :data + :total shape for superuser"(let [resp (mt/user-http-request :crowberto :get 200 "notification/admin")]diff --git a/test/metabase/task_history/api_test.clj b/test/metabase/task_history/api_test.cljindex ddd4ed5e904..dda2891552c 100644--- a/test/metabase/task_history/api_test.clj+++ b/test/metabase/task_history/api_test.clj@@ -24,6 +24,27 @@:ended_at (t/plus now (t/seconds idx))}))task-names)))+(deftest counts-perms-test+ (testing "Task counters require monitoring permission"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 "task/counts")))))++(deftest counts-test+ (testing "Counters count task rows and run rows independently, without pagination"+ (mt/with-temp [:model/Database {db-id :id} {}+ :model/TaskRun {run-id :id} {:run_type :sync+ :entity_type :database+ :entity_id db-id+ :status :started}]+ (let [task-count (t2/count :model/TaskHistory)+ run-count (t2/count :model/TaskRun)]+ (mt/with-temp [:model/TaskHistory _ {:status :success :run_id run-id}+ :model/TaskHistory _ {:status :failed :run_id run-id}]+ (is (= {:tasks (+ task-count 2), :runs run-count}+ (mt/user-http-request :crowberto :get 200 "task/counts")))+ (is (= {:tasks (+ task-count 2), :runs run-count}+ (mt/user-http-request :crowberto :get 200 "task/counts" :limit 1 :offset 100))))))))+(deftest list-perms-test(testing "Only superusers can query for TaskHistory"(is (= "You don't have permissions to do that."