From a9d888ad402ebb35da45df446997c426d6abee9d Mon Sep 17 00:00:00 2001
From: Elizabeth Thompson <eschutho@gmail.com>
Date: Wed, 19 May 2021 14:38:57 -0700
Subject: [PATCH] check limiting factor on query results (#14719)

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 9 ++++++---
 superset-frontend/src/SqlLab/types.ts                 | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 47363e0f1ee4..398e2f2caa51 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -527,6 +527,7 @@ export default class ResultSet extends React.PureComponent<
     let limitMessage;
     const limitReached = results?.displayLimitReached;
     const isAdmin = !!this.props.user?.roles.Admin;
+    const limit = queryLimit || results.query.limit;
     const displayMaxRowsReachedMessage = {
       withAdmin: t(
         `The number of results displayed is limited to %(rows)d by the configuration DISPLAY_MAX_ROWS. `,
@@ -535,7 +536,9 @@ export default class ResultSet extends React.PureComponent<
         t(
           `Please add additional limits/filters or download to csv to see more rows up to the`,
         ),
-        t(`the %(queryLimit)d limit.`, { queryLimit }),
+        t(`the %(limit)d limit.`, {
+          limit,
+        }),
       ),
       withoutAdmin: t(
         `The number of results displayed is limited to %(rows)d. `,
@@ -544,8 +547,8 @@ export default class ResultSet extends React.PureComponent<
         t(
           `Please add additional limits/filters, download to csv, or contact an admin`,
         ),
-        t(`to see more rows up to the the %(queryLimit)d limit.`, {
-          queryLimit,
+        t(`to see more rows up to the the %(limit)d limit.`, {
+          limit,
         }),
       ),
     };
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 61b677f3633d..593695919c58 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -52,6 +52,7 @@ export type Query = {
     data: Record<string, unknown>[];
     expanded_columns: Column[];
     selected_columns: Column[];
+    query: { limit: number };
   };
   resultsKey: string | null;
   schema: string;