Add explicit ignore_true parameter to Tables.load requests in admin p…

…anel to avoid counting the requests as a table view
metabase · Jul 8, 2022 · f887d0d · f887d0d
1 parent 4ca26ab
commit f887d0d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx b/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
@@ -133,6 +133,7 @@ class PartialQueryBuilder extends Component {
 export default _.compose(
   Tables.load({
     id: (state, props) => props.value && props.value["source-table"],
+    query: { ignore_view: true },
     wrapped: true,
   }),
   withTableMetadataLoaded,

diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataSchema/MetadataSchema.tsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataSchema/MetadataSchema.tsx
@@ -88,6 +88,7 @@ export default _.compose(
     id: (_state: State, { tableId }: { tableId: number }) => tableId,
     query: {
       ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
+      ignore_view: true,
     },
     wrapped: true,
   }),

diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataTable/MetadataTable.tsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataTable/MetadataTable.tsx
@@ -57,9 +57,7 @@ const MetadataTable = ({
     }
   };
 
-  const handleDescriptionChange: ChangeEventHandler<
-    HTMLInputElement
-  > = event => {
+  const handleDescriptionChange: ChangeEventHandler<HTMLInputElement> = event => {
     handlePropertyUpdate("description", event.target.value);
   };
 
@@ -171,6 +169,7 @@ export default _.compose(
     id: (_state: State, { tableId }: { tableId: number }) => tableId,
     query: {
       ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
+      ignore_view: true,
     },
     wrapped: true,
     selectorName: "getObjectUnfiltered",

diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.jsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.jsx
@@ -67,4 +67,5 @@ class RevisionHistory extends Component {
 
 export default Tables.load({
   id: (state, { object: { table_id } }) => table_id,
+  query: { ignore_view: true },
 })(RevisionHistory);
diff --git a/frontend/src/metabase/admin/datamodel/containers/TableSettingsApp.jsx b/frontend/src/metabase/admin/datamodel/containers/TableSettingsApp.jsx
@@ -82,6 +82,7 @@ const Nav = _.compose(
     id: (state, { tableId }) => tableId,
     query: {
       ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
+      ignore_view: true,
     },
     selectorName: "getObjectUnfiltered",
   }),

diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsx
@@ -88,5 +88,6 @@ class TableSelectorInner extends React.Component {
 
 const TableSelector = Tables.load({
   id: (state, props) => props.tableId,
+  query: { ignore_view: true },
   loadingAndErrorWrapper: false,
 })(TableSelectorInner);
diff --git a/src/metabase/api/table.clj b/src/metabase/api/table.clj
@@ -42,13 +42,14 @@
 
 (api/defendpoint GET "/:id"
   "Get `Table` with ID."
-  [id include_editable_data_model]
+  [id include_editable_data_model ignore_view]
   (let [api-perm-check-fn (if (Boolean/parseBoolean include_editable_data_model)
                             api/write-check
                             api/read-check)]
     (u/prog1 (-> (api-perm-check-fn Table id)
                  (hydrate :db :pk_field))
-             (events/publish-event! :table-read (assoc <> :actor_id api/*current-user-id*)))))
+             (when-not (Boolean/parseBoolean ignore_view)
+               (events/publish-event! :table-read (assoc <> :actor_id api/*current-user-id*))))))
 
 (defn- update-table!*
   "Takes an existing table and the changes, updates in the database and optionally calls `table/update-field-positions!`