Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Store the table of implicit actions without a model (#85386)

Alexander Polyankin6ae3ccbbf20a
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 8d327a7244f..1cab8dd4fc7 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -3339,6 +3339,7 @@
:model-imports #{:model/Action
:model/Card
:model/Field
+ :model/ImplicitAction
:model/QueryAction
:model/Table
:model/User}}
@@ -3425,9 +3426,11 @@
:model/FieldValues
:model/Table
:model/TableUserSettings}
- :model-imports #{:model/Card
+ :model-imports #{:model/Action
+ :model/Card
:model/Collection
:model/Database
+ :model/ImplicitAction
:model/Measure
:model/Segment
:model/Transform
@@ -3946,6 +3949,7 @@
:model/Field
:model/FieldUserSettings
:model/FieldValues
+ :model/ImplicitAction
:model/Measure
:model/NativeQuerySnippet
:model/QueryAction
diff --git a/e2e/test/scenarios/data-studio/data-actions.cy.spec.ts b/e2e/test/scenarios/data-studio/data-actions.cy.spec.ts
index 0c9531a0758..063e5ed8857 100644
--- a/e2e/test/scenarios/data-studio/data-actions.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-actions.cy.spec.ts
@@ -2,21 +2,14 @@ import { WRITABLE_DB_ID } from "e2e/support/cypress_data";
const { H } = cy;
-const SCHEMA = "Schema A";
-const TABLE = "Animals";
-const ACTION_NAME = "Rename animal";
-const ACTION_QUERY = `UPDATE "${SCHEMA}"."${TABLE}" SET name = {{new_name}} WHERE name = {{name}}`;
-
describe(
"scenarios > data studio > data actions",
{ tags: ["@external"] },
() => {
beforeEach(() => {
H.restore("postgres-writable");
- H.resetTestTable({ type: "postgres", table: "many_schemas" });
H.resetSnowplow();
cy.signInAsAdmin();
- H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: TABLE });
H.setActionsEnabledForDB(WRITABLE_DB_ID);
cy.intercept("POST", "/api/action").as("createAction");
@@ -28,60 +21,166 @@ describe(
H.expectNoBadSnowplowEvents();
});
- it("creates, edits, runs, and archives a data action", () => {
- cy.log("create an action");
- H.DataStudio.Actions.visitList();
- cy.findByRole("button", { name: /New/ }).click();
- H.popover()
- .findByRole("menuitem", { name: /Action/ })
- .click();
- H.NativeEditor.type(ACTION_QUERY);
- cy.findByRole("button", { name: "Save" }).click();
- H.modal().within(() => {
- cy.findByLabelText("Name").clear().type(ACTION_NAME);
- cy.findByRole("button", { name: "Save" }).click();
+ describe("query actions", () => {
+ const SCHEMA = "Schema A";
+ const TABLE = "Animals";
+ const ACTION_NAME = "Rename animal";
+ const ACTION_QUERY = `UPDATE "${SCHEMA}"."${TABLE}" SET name = {{new_name}} WHERE name = {{name}}`;
+
+ beforeEach(() => {
+ H.resetTestTable({ type: "postgres", table: "many_schemas" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: TABLE });
});
- cy.wait("@createAction");
- cy.findByTestId("action-definition").should("be.visible");
- H.expectUnstructuredSnowplowEvent({ event: "data_action_created" });
-
- cy.log("edit its query");
- cy.findByRole("link", { name: /Edit definition/ }).click();
- H.NativeEditor.type(" AND score > 0");
- cy.findByRole("button", { name: "Save" }).click();
- cy.wait("@updateAction");
- H.undoToast().should("contain.text", "Action updated");
- H.expectUnstructuredSnowplowEvent({ event: "data_action_query_updated" });
-
- cy.log("run it");
- cy.findByRole("link", { name: "Run" }).click();
- cy.findByRole("button", { name: /Run/ }).click();
- H.modal().within(() => {
- cy.findByLabelText("New Name").type("Goose");
- cy.findByLabelText("Name").type("Duck");
- cy.findByRole("button", { name: ACTION_NAME }).click();
+
+ it("creates, edits, runs, and archives a data action", () => {
+ cy.log("create an action");
+ H.DataStudio.Actions.visitList();
+ cy.findByRole("button", { name: /New/ }).click();
+ H.popover()
+ .findByRole("menuitem", { name: /SQL query/ })
+ .click();
+ H.NativeEditor.type(ACTION_QUERY);
+ cy.findByRole("button", { name: "Save" }).click();
+ H.modal().within(() => {
+ cy.findByLabelText("Name").clear().type(ACTION_NAME);
+ cy.findByRole("button", { name: "Save" }).click();
+ });
+ cy.wait("@createAction");
+ cy.findByTestId("action-definition").should("be.visible");
+ H.expectUnstructuredSnowplowEvent({ event: "data_action_created" });
+
+ cy.log("edit its query");
+ cy.findByRole("link", { name: /Edit definition/ }).click();
+ H.NativeEditor.type(" AND score > 0");
+ cy.findByRole("button", { name: "Save" }).click();
+ cy.wait("@updateAction");
+ H.undoToast().should("contain.text", "Action updated");
+ H.expectUnstructuredSnowplowEvent({
+ event: "data_action_query_updated",
+ });
+
+ cy.log("run it");
+ cy.findByRole("link", { name: "Run" }).click();
+ cy.findByRole("button", { name: /Run/ }).click();
+ H.modal().within(() => {
+ cy.findByLabelText("New Name").type("Goose");
+ cy.findByLabelText("Name").type("Duck");
+ cy.findByRole("button", { name: ACTION_NAME }).click();
+ });
+ cy.wait("@executeAction");
+ H.modal().should("not.exist");
+ H.expectUnstructuredSnowplowEvent({
+ event: "data_action_executed",
+ triggered_from: "data_studio",
+ });
+
+ cy.log("archive it");
+ cy.findByRole("button", { name: "Action options" }).click();
+ H.popover()
+ .findByRole("menuitem", { name: /Archive/ })
+ .click();
+ H.modal().findByRole("button", { name: "Archive" }).click();
+ cy.wait("@updateAction");
+ H.undoToastListContainer()
+ .findByText("Action archived")
+ .should("be.visible");
+ H.DataStudio.Library.libraryPage()
+ .findByText(ACTION_NAME)
+ .should("not.exist");
+ H.expectUnstructuredSnowplowEvent({ event: "data_action_archived" });
});
- cy.wait("@executeAction");
- H.modal().should("not.exist");
- H.expectUnstructuredSnowplowEvent({
- event: "data_action_executed",
- triggered_from: "data_studio",
+ });
+
+ describe("implicit actions", () => {
+ const TABLE = "scoreboard_actions";
+ const TABLE_DISPLAY_NAME = "Scoreboard Actions";
+ const ACTION_NAME = `Insert ${TABLE_DISPLAY_NAME}`;
+
+ beforeEach(() => {
+ H.resetTestTable({ type: "postgres", table: TABLE });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: TABLE });
});
- cy.log("archive it");
- cy.findByRole("button", { name: "Action options" }).click();
- H.popover()
- .findByRole("menuitem", { name: /Archive/ })
- .click();
- H.modal().findByRole("button", { name: "Archive" }).click();
- cy.wait("@updateAction");
- H.undoToastListContainer()
- .findByText("Action archived")
- .should("be.visible");
- H.DataStudio.Library.libraryPage()
- .findByText(ACTION_NAME)
- .should("not.exist");
- H.expectUnstructuredSnowplowEvent({ event: "data_action_archived" });
+ it("creates an action from a table, edits it, and runs it", () => {
+ cy.log("create an insert action from a table");
+ H.DataStudio.Actions.visitList();
+ cy.findByRole("button", { name: /New/ }).click();
+ H.popover().findByRole("menuitem", { name: /Table/ }).click();
+ H.entityPickerModal().within(() => {
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, /Writable Postgres/).click();
+ H.entityPickerModalItem(2, TABLE_DISPLAY_NAME).click();
+ cy.findByRole("button", { name: "Continue" }).click();
+ });
+ cy.findByTestId("implicit-action-definition").within(() => {
+ cy.findByText(TABLE_DISPLAY_NAME).should("be.visible");
+ cy.findByRole("radio", { name: "Insert" }).should("be.checked");
+ });
+ cy.findByRole("button", { name: "Save" }).click();
+ H.modal().within(() => {
+ cy.findByLabelText("Name").should("have.value", ACTION_NAME);
+ cy.findByRole("button", { name: "Save" }).click();
+ });
+ cy.wait("@createAction");
+ H.expectUnstructuredSnowplowEvent({ event: "data_action_created" });
+
+ cy.log("change its operation, then undo the change");
+ cy.findByTestId("action-definition")
+ .findByRole("radio", { name: "Update" })
+ .should("be.enabled")
+ .click({ force: true });
+ cy.wait("@updateAction")
+ .its("request.body")
+ .should("deep.include", { kind: "row/update" });
+ cy.findByTestId("action-definition")
+ .findByRole("radio", { name: "Update" })
+ .should("be.checked");
+ H.undoToast()
+ .should("contain.text", "Action operation updated")
+ .findByRole("button", { name: "Undo" })
+ .click();
+ cy.wait("@updateAction")
+ .its("request.body")
+ .should("deep.include", { kind: "row/create" });
+ H.undoToast().should("contain.text", "Change undone");
+ cy.findByTestId("action-definition")
+ .findByRole("radio", { name: "Insert" })
+ .should("be.checked");
+
+ cy.log("hide a field");
+ cy.findByRole("link", { name: "Fields" }).click();
+ cy.findByTestId("action-fields")
+ .findByRole("listitem", { name: "Status" })
+ .click();
+ cy.findByTestId("action-field-details")
+ .findByRole("switch", { name: /Show field/ })
+ .should("be.checked")
+ .and("be.enabled")
+ .click({ force: true });
+ cy.wait("@updateAction")
+ .its("response.body.visualization_settings.fields.status.hidden")
+ .should("eq", true);
+ cy.findByTestId("action-field-details")
+ .findByRole("switch", { name: /Show field/ })
+ .should("not.be.checked");
+
+ cy.log("run it");
+ cy.findByRole("link", { name: "Run" }).click();
+ cy.findByRole("button", { name: /Run/ }).click();
+ H.modal().within(() => {
+ cy.findByLabelText(/Team Name/).type("Ornery Otters");
+ cy.findByLabelText(/Score/).type("5");
+ cy.findByLabelText(/Status/).should("not.exist");
+ cy.findByRole("button", { name: "Save" }).click();
+ });
+ cy.wait("@executeAction");
+ H.modal().should("not.exist");
+ H.queryWritableDB(
+ `SELECT score, status FROM ${TABLE} WHERE team_name = 'Ornery Otters'`,
+ ).then(({ rows }) => {
+ expect(rows).to.deep.equal([{ score: 5, status: "active" }]);
+ });
+ });
});
},
);
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/typed_schema.clj b/enterprise/backend/src/metabase_enterprise/data_apps/typed_schema.clj
index 02caf069259..8ff1e9601c6 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/typed_schema.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/typed_schema.clj
@@ -166,7 +166,7 @@
(let [cards (data-apps.db/resource-cards collection-id)
action-ids (data-apps.db/resource-action-ids collection-id)
actions (when (seq action-ids)
- (let [by-id (u/index-by :id (actions/select-actions-for-ids nil action-ids))]
+ (let [by-id (u/index-by :id (actions/select-actions-for-ids action-ids))]
(keep by-id action-ids)))]
(str "// The queries and actions of the data app \"" slug "\", generated by Metabase from the questions and\n"
"// actions in the app's collection. Do not edit: after changing them, fetch it again with\n"
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
index 7d22eca30ec..edd3bf20669 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
@@ -26,8 +26,8 @@
(def ^:private Entity
"Any dependency-tracked entity `calculate-deps` accepts. A `:dashboard` entity arrives hydrated with `:dashcards`,
each of those in turn hydrated with `:series`; a query `:action` arrives with the `:dataset_query` of its
- QueryAction; a `:data-app` arrives with the `:card_ids` and `:action_ids` of its resource collection; every other
- entity is a plain row of its model."
+ QueryAction and an implicit one without a model with the `:table_id` of its ImplicitAction; a `:data-app` arrives
+ with the `:card_ids` and `:action_ids` of its resource collection; every other entity is a plain row of its model."
[:or
::queries.schema/card
:metabase.warehouse-schema.schema/table
@@ -211,9 +211,11 @@
table_id (conj table_id))})
(defmethod calculate-deps* :action
- [_ {action-type :type, model-id :model_id, query :dataset_query}]
+ [_ {action-type :type, model-id :model_id, table-id :table_id, query :dataset_query}]
(case action-type
- :implicit {:card #{model-id}}
+ :implicit (if model-id
+ {:card #{model-id}}
+ {:table (if table-id #{table-id} #{})})
:query (upstream-deps:query (lib-be/normalize-query query))))
(defmethod calculate-deps* :data-app
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/db.clj b/enterprise/backend/src/metabase_enterprise/dependencies/db.clj
index 82fb568ddf7..385f9fa1d32 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/db.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/db.clj
@@ -663,6 +663,11 @@
(t2/select-one (into [(deps.dependency-types/dependency-type->model entity-type)] columns)
:id id (entity-source entity-type)))
+(mu/defn implicit-action-table-ids
+ "The `:table_id` of the ImplicitActions of the Actions with `action-ids`, keyed by Action id."
+ [action-ids :- [:sequential ::lib.schema.id/action]]
+ (t2/select-fn->fn :action_id :table_id :model/ImplicitAction :action_id [:in action-ids]))
+
(mu/defn query-action-queries
"The `:dataset_query` of the QueryActions of the Actions with `action-ids`, keyed by Action id."
[action-ids :- [:sequential ::lib.schema.id/action]]
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/hooks.clj b/enterprise/backend/src/metabase_enterprise/dependencies/hooks.clj
index 2b02bbb45ae..db82d3d3229 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/hooks.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/hooks.clj
@@ -119,7 +119,7 @@
(:model/DashboardCard :model/DashboardTab) [:dashboard (:dashboard_id row)]
:model/DashboardCardSeries [:dashboard (some-> (:dashboardcard_id row)
dependencies.db/dashcard-dashboard-id)]
- :model/QueryAction [:action (:action_id row)]
+ (:model/QueryAction :model/ImplicitAction) [:action (:action_id row)]
(:model/Field :model/TableUserSettings) [:table (:table_id row)]
:model/FieldUserSettings [:table (some-> (:field_id row) dependencies.db/field-table-id)]
nil))
@@ -130,6 +130,7 @@
:model/DashboardCardSeries #{:card_id :dashboardcard_id}
:model/DashboardTab #{}
:model/QueryAction #{:dataset_query}
+ :model/ImplicitAction #{:table_id}
:model/Field field-columns
:model/TableUserSettings #{:display_name :visibility_type :data_layer :field_order}
:model/FieldUserSettings (conj field-columns :custom_position :nfc_path :json_unfolding)})
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency_status.clj b/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency_status.clj
index 7462b47f9a9..e63220f3023 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency_status.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency_status.clj
@@ -30,11 +30,15 @@
(t2/hydrate entities [:dashcards :series]))
(defmethod hydrate-for-deps :action [_ entities]
- (let [queries (when (seq entities)
- (dependencies.db/query-action-queries (mapv :id entities)))]
+ (let [action-ids (mapv :id entities)
+ queries (when (seq action-ids)
+ (dependencies.db/query-action-queries action-ids))
+ table-ids (when (seq action-ids)
+ (dependencies.db/implicit-action-table-ids action-ids))]
(mapv (fn [{:keys [id] :as action}]
(cond-> action
- (contains? queries id) (assoc :dataset_query (queries id))))
+ (contains? queries id) (assoc :dataset_query (queries id))
+ (contains? table-ids id) (assoc :table_id (table-ids id))))
entities)))
(defmethod hydrate-for-deps :data-app [_ entities]
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/invariants_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/invariants_test.clj
index 314d9af5064..98b04f1076c 100644
--- a/enterprise/backend/test/metabase_enterprise/data_apps/invariants_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/invariants_test.clj
@@ -112,13 +112,66 @@
(t2/update! :model/Action action-id {:collection_id collection-id})))
(is (= other-id (t2/select-one-fn :collection_id :model/Action :id action-id))))))))))))
-(deftest action-in-apps-collection-has-no-implicit-row-test
- (testing "an action in an app's collection is a query action, so it gets no implicit action row"
+(defn- insert-implicit-action!
+ "Insert an implicit action of no model named `action-name` that inserts into the Table with `table-id`, in the
+ collection with `collection-id`, as a load does."
+ [collection-id action-name table-id]
+ (let [action-id (t2/insert-returning-pk! :model/Action {:name action-name
+ :type :implicit
+ :collection_id collection-id
+ :creator_id (mt/user->id :crowberto)})]
+ (t2/insert! :model/ImplicitAction {:action_id action-id :kind "row/create" :table_id table-id})
+ action-id))
+
+(deftest implicit-action-in-apps-collection-writes-to-published-table-test
+ (testing "an implicit action of no model in an app's collection writes only to a table published to the Library"
+ (do-with-app-collection
+ (fn [collection-id]
+ (testing "an unpublished table is refused"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"published to the Library"
+ (t2/with-transaction [_conn]
+ (insert-implicit-action! collection-id "Unpublished" (mt/id :venues)))))
+ (is (not (t2/exists? :model/Action :collection_id collection-id :name "Unpublished"))))
+ (data-apps.tu/with-published-tables! [(mt/id :venues)]
+ (testing "a published table goes in"
+ (let [action-id (insert-implicit-action! collection-id "Published" (mt/id :venues))]
+ (is (= (mt/id :venues) (t2/select-one-fn :table_id :model/ImplicitAction :action_id action-id)))
+ (testing "and the action can't move to an unpublished table"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"published to the Library"
+ (t2/update! :model/ImplicitAction {:action_id action-id} {:table_id (mt/id :categories)})))
+ (is (= (mt/id :venues) (t2/select-one-fn :table_id :model/ImplicitAction :action_id action-id)))))))))))
+
+(deftest create-implicit-action-in-apps-collection-api-test
+ (testing "POST /api/action creates an implicit action of no model in an app's collection on a published table"
+ (mt/with-actions-enabled
+ (do-with-app-collection
+ (fn [collection-id]
+ (data-apps.tu/with-published-tables! [(mt/id :venues)]
+ (let [{action-id :id} (mt/user-http-request :crowberto :post 200 "action"
+ {:name "Add venue"
+ :type "implicit"
+ :kind "row/create"
+ :table_id (mt/id :venues)
+ :collection_id collection-id})]
+ (is (=? {:type :implicit
+ :model_id nil
+ :collection_id collection-id}
+ (t2/select-one :model/Action :id action-id)))
+ (is (= (mt/id :venues) (t2/select-one-fn :table_id :model/ImplicitAction :action_id action-id))))))))))
+
+(deftest moving-implicit-action-into-apps-collection-is-checked-test
+ (testing "an implicit action moved into an app's collection, as a pull may move one, needs a published table too"
(do-with-app-collection
(fn [collection-id]
- (let [action-id (insert-query-action! collection-id "Query" (lib/native-query (mt/metadata-provider) "SELECT 1"))]
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"can't have an implicit action"
- (t2/insert! :model/ImplicitAction {:action_id action-id :kind "row/create"}))))))))
+ (mt/with-model-cleanup [:model/Action]
+ (mt/with-temp [:model/Collection {other-id :id} {:namespace :data-actions}]
+ (let [action-id (insert-implicit-action! other-id "Elsewhere" (mt/id :venues))]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"published to the Library"
+ (t2/update! :model/Action action-id {:collection_id collection-id})))
+ (is (= other-id (t2/select-one-fn :collection_id :model/Action :id action-id)))
+ (data-apps.tu/with-published-tables! [(mt/id :venues)]
+ (t2/update! :model/Action action-id {:collection_id collection-id})
+ (is (= collection-id (t2/select-one-fn :collection_id :model/Action :id action-id)))))))))))
(deftest two-data-apps-cannot-share-collection-test
(testing "the database refuses a second app on a collection another app already owns"
@@ -232,7 +285,7 @@
:creator_id (mt/user->id :crowberto)})]
(t2/insert! :model/QueryAction {:action_id action-id :database_id (mt/id)
:dataset_query (lib/native-query (mt/metadata-provider) "SELECT 1")})
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"query action of no model"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"goes in the model's collection"
(t2/update! :model/Action action-id {:collection_id collection-id})))
(is (= model-coll (t2/select-one-fn :collection_id :model/Action :id action-id)))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
index 91a39a2a31f..c4b764d94d8 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
@@ -975,6 +975,26 @@
(is (= #{["action" readable-id "Create venue" [(:name readable-collection) nil]]}
(dependents :rasta))))))))))
+(deftest implicit-action-table-change-moves-its-dependency-test
+ (testing "changing the table of an implicit action without a model moves its dependency to the new table"
+ (mt/with-premium-features #{:dependencies}
+ (mt/with-temp [:model/Action {action-id :id} {:type :implicit, :name "Create venue"}
+ :model/ImplicitAction _ {:action_id action-id, :kind "row/create", :table_id (mt/id :venues)}]
+ (mt/with-model-cleanup [:model/Dependency :model/DependencyStatus]
+ (let [dependents (fn [table-key]
+ (->> (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph/dependents"
+ :id (mt/id table-key)
+ :type "table"
+ :dependent-types "action")
+ (map :id)
+ set))]
+ (deps.test/synchronously-run-dependency-job!)
+ (is (contains? (dependents :venues) action-id))
+ (t2/update! :model/ImplicitAction {:action_id action-id} {:table_id (mt/id :categories)})
+ (deps.test/synchronously-run-dependency-job!)
+ (is (contains? (dependents :categories) action-id))
+ (is (not (contains? (dependents :venues) action-id)))))))))
+
(deftest graph-measure-root-test
(testing "GET /api/ee/dependencies/graph with measure as root node"
(mt/with-test-user :crowberto
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj
index d04510c780d..4107304e7b8 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj
@@ -715,3 +715,9 @@
:model/ImplicitAction _ {:action_id action-id, :kind "row/create"}]
(is (= {:card #{model-id}}
(calculation/calculate-deps :action (actions/select-action :id action-id)))))))
+
+(deftest upstream-deps-implicit-action-without-model-test
+ (mt/with-temp [:model/Action {action-id :id} {:type :implicit, :name "Create venue"}
+ :model/ImplicitAction _ {:action_id action-id, :kind "row/create", :table_id (mt/id :venues)}]
+ (is (= {:table #{(mt/id :venues)}}
+ (calculation/calculate-deps :action (actions/select-action :id action-id))))))
diff --git a/enterprise/backend/test/metabase_enterprise/remote_sync/api_test.clj b/enterprise/backend/test/metabase_enterprise/remote_sync/api_test.clj
index 2aaca9cf0d2..21cc2b07293 100644
--- a/enterprise/backend/test/metabase_enterprise/remote_sync/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/remote_sync/api_test.clj
@@ -1050,26 +1050,6 @@
(is (remote-sync.task/successful? (push!)))
(is (nil? (repo-file "collections/main/synced/rename_venue.yaml"))))))))
-(deftest push-tracks-moving-an-action-between-models-test
- (testing "GHY-4722: moving an action to a model outside the synced collections removes its file on the next push, and moving it back writes the file again"
- (do-with-pushed-model-actions!
- (fn [{:keys [model push! repo-file]}]
- (mt/with-temp [:model/Collection {unsynced-id :id} {:name "Unsynced" :location "/"}]
- (let [action-id (t2/select-one-pk :model/Action :model_id (:id model) :name "Rename Venue")
- other (mt/user-http-request :crowberto :post 200 "card"
- {:name "Other Model"
- :type "model"
- :collection_id unsynced-id
- :display "table"
- :visualization_settings {}
- :dataset_query (mt/mbql-query venues)})]
- (mt/user-http-request :crowberto :put 200 (str "action/" action-id) {:model_id (:id other)})
- (is (remote-sync.task/successful? (push!)))
- (is (nil? (repo-file "collections/main/synced/rename_venue.yaml")))
- (mt/user-http-request :crowberto :put 200 (str "action/" action-id) {:model_id (:id model)})
- (is (remote-sync.task/successful? (push!)))
- (is (some? (repo-file "collections/main/synced/rename_venue.yaml")))))))))
-
(deftest turning-sync-on-again-tracks-untracked-actions-test
(testing "GHY-4722: turning sync on again for a collection tracks an action created while sync was off, and the next push writes it"
(do-with-pushed-model!
diff --git a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionDefinitionPage/DataAppActionDefinitionPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionDefinitionPage/DataAppActionDefinitionPage.tsx
index 2d23f33387f..68933358be2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionDefinitionPage/DataAppActionDefinitionPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionDefinitionPage/DataAppActionDefinitionPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
-import { ActionDefinitionContent } from "metabase/data-studio/actions/components/ActionDefinitionContent";
+import { QueryActionDefinitionContent } from "metabase/data-studio/actions/components/QueryActionDefinitionContent";
import { Center } from "metabase/ui";
import { DataAppActionHeader } from "../../components/DataAppActionHeader";
@@ -20,7 +20,7 @@ export function DataAppActionDefinitionPage() {
return (
<PageContainer data-testid="data-app-action-definition">
<DataAppActionHeader app={app} action={action} />
- <ActionDefinitionContent action={action} databases={databases} />
+ <QueryActionDefinitionContent action={action} databases={databases} />
</PageContainer>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionFieldsPage/DataAppActionFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionFieldsPage/DataAppActionFieldsPage.tsx
index 58cdcdb4537..86ac1d22a99 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionFieldsPage/DataAppActionFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppActionFieldsPage/DataAppActionFieldsPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
-import { ActionFieldsContent } from "metabase/data-studio/actions/components/ActionFieldsContent";
+import { QueryActionFieldsContent } from "metabase/data-studio/actions/components/ActionFieldsContent";
import { canEditActionQuery } from "metabase/data-studio/actions/utils";
import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
@@ -24,7 +24,7 @@ export function DataAppActionFieldsPage() {
return (
<PageContainer data-testid="data-app-action-fields" gap="lg" px={0} pb={0}>
<DataAppActionHeader app={app} action={action} px="3.5rem" />
- <ActionFieldsContent
+ <QueryActionFieldsContent
action={action}
fieldId={fieldId}
canChangeFieldType={canEditActionQuery(action, databases)}
diff --git a/frontend/src/metabase-types/api/actions.ts b/frontend/src/metabase-types/api/actions.ts
index f37f9b0a1e8..20261793d48 100644
--- a/frontend/src/metabase-types/api/actions.ts
+++ b/frontend/src/metabase-types/api/actions.ts
@@ -5,6 +5,7 @@ import type { DatabaseId } from "./database";
import type { BaseEntityId } from "./entity-id";
import type { Parameter, ParameterId, ParameterTarget } from "./parameters";
import type { NativeDatasetQuery, OpaqueDatasetQuery } from "./query";
+import type { TableId } from "./table";
import type { UserId, UserInfo } from "./user";
export type ListActionsRequest = {
@@ -13,28 +14,38 @@ export type ListActionsRequest = {
archived?: boolean;
};
-export interface CreateActionRequest {
+export type ImplicitActionKind = "row/create" | "row/update" | "row/delete";
+
+interface BaseCreateActionRequest {
collection_id?: CollectionId | null;
- database_id?: DatabaseId;
- dataset_query?: NativeDatasetQuery | OpaqueDatasetQuery;
description?: string | null;
- kind?: "row/create" | "row/update" | "row/delete";
model_id?: CardId | null;
name: string;
parameter_mappings?: Record<ParameterId, ParameterTarget>;
parameters?: WritebackParameter[];
- type?: "query" | "implicit";
visualization_settings?: ActionFormSettings;
}
-export interface UpdateActionRequest {
+export interface CreateQueryActionRequest extends BaseCreateActionRequest {
+ type: "query";
+ dataset_query: NativeDatasetQuery | OpaqueDatasetQuery;
+}
+
+export interface CreateImplicitActionRequest extends BaseCreateActionRequest {
+ type: "implicit";
+ kind: ImplicitActionKind;
+ table_id?: TableId;
+}
+
+export type CreateActionRequest =
+ | CreateQueryActionRequest
+ | CreateImplicitActionRequest;
+
+interface BaseUpdateActionRequest {
id: WritebackActionId;
archived?: boolean;
collection_id?: CollectionId | null;
- database_id?: DatabaseId;
- dataset_query?: NativeDatasetQuery | OpaqueDatasetQuery;
description?: string | null;
- kind?: "row/create" | "row/update" | "row/delete";
model_id?: CardId;
name?: string;
parameter_mappings?: Record<ParameterId, ParameterTarget>;
@@ -42,6 +53,22 @@ export interface UpdateActionRequest {
visualization_settings?: ActionFormSettings;
}
+export interface UpdateQueryActionRequest extends BaseUpdateActionRequest {
+ dataset_query?: NativeDatasetQuery | OpaqueDatasetQuery;
+ kind?: never;
+ table_id?: never;
+}
+
+export interface UpdateImplicitActionRequest extends BaseUpdateActionRequest {
+ kind?: ImplicitActionKind;
+ table_id?: TableId | null;
+ dataset_query?: never;
+}
+
+export type UpdateActionRequest =
+ | UpdateQueryActionRequest
+ | UpdateImplicitActionRequest;
+
export interface WritebackParameter extends Parameter {
target: ParameterTarget;
}
@@ -82,7 +109,8 @@ export interface QueryAction {
export interface ImplicitQueryAction {
type: "implicit";
- kind: "row/create" | "row/update" | "row/delete";
+ kind: ImplicitActionKind;
+ table_id: TableId | null;
}
export type WritebackQueryAction = WritebackActionBase & QueryAction;
diff --git a/frontend/src/metabase-types/api/mocks/actions.ts b/frontend/src/metabase-types/api/mocks/actions.ts
index c1c46cd602c..47914c16948 100644
--- a/frontend/src/metabase-types/api/mocks/actions.ts
+++ b/frontend/src/metabase-types/api/mocks/actions.ts
@@ -63,6 +63,7 @@ export const createMockImplicitQueryAction = ({
id: 1,
entity_id: createMockEntityId(),
kind: "row/create",
+ table_id: null,
name: "Create",
description: "",
model_id: 1,
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
index 199be47a7d5..e27381e83d6 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
@@ -71,14 +71,17 @@ export function ActionCreator({
useBeforeUnload(!isRouted && showUnsavedChangesWarning);
const handleCreate = async (values: CreateActionFormValues) => {
- if (action.type !== "query") {
+ if (action.type !== "query" || action.dataset_query == null) {
return; // only query action creation is supported now
}
+ const { dataset_query } = action;
try {
const createdAction = await createAction({
...action,
...values,
+ type: "query",
+ dataset_query,
visualization_settings: formSettings,
}).unwrap();
diff --git a/frontend/src/metabase/actions/types.ts b/frontend/src/metabase/actions/types.ts
index c7836dafca5..515203e5c9e 100644
--- a/frontend/src/metabase/actions/types.ts
+++ b/frontend/src/metabase/actions/types.ts
@@ -20,7 +20,7 @@ type BaseUpdateActionParams = {
};
export type CreateQueryActionParams = BaseCreateActionParams &
- Pick<WritebackQueryAction, "type" | "dataset_query" | "database_id">;
+ Pick<WritebackQueryAction, "type" | "dataset_query">;
export type UpdateQueryActionParams = Partial<CreateQueryActionParams> &
BaseUpdateActionParams;
diff --git a/frontend/src/metabase/api/action.ts b/frontend/src/metabase/api/action.ts
index 8c312427ca1..280d51ac2d6 100644
--- a/frontend/src/metabase/api/action.ts
+++ b/frontend/src/metabase/api/action.ts
@@ -59,7 +59,6 @@ export const actionApi = Api.injectEndpoints({
"id",
"archived",
"collection_id",
- "database_id",
"dataset_query",
"description",
"kind",
@@ -67,6 +66,7 @@ export const actionApi = Api.injectEndpoints({
"name",
"parameter_mappings",
"parameters",
+ "table_id",
"visualization_settings",
]),
}),
diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.ts
index 597889ac4a3..40d3814c56d 100644
--- a/frontend/src/metabase/api/tags/utils.ts
+++ b/frontend/src/metabase/api/tags/utils.ts
@@ -111,7 +111,12 @@ export function provideActionListTags(
export function provideActionTags(
action: WritebackAction,
): TagDescription<TagType>[] {
- return [idTag("action", action.id)];
+ return [
+ idTag("action", action.id),
+ ...(action.type === "implicit" && action.table_id != null
+ ? [idTag("table", action.table_id)]
+ : []),
+ ];
}
export function provideActivityItemListTags(
diff --git a/frontend/src/metabase/api/utils/readme.md b/frontend/src/metabase/api/utils/readme.md
index 83d422e9651..dbd99094c79 100644
--- a/frontend/src/metabase/api/utils/readme.md
+++ b/frontend/src/metabase/api/utils/readme.md
@@ -1,3 +1,3 @@
## API Utils
-This is for helpers and utilities to combine APIs and make them more ergonomic, it's not for building feature-specific behavior
\ No newline at end of file
+This is for helpers and utilities to combine APIs and make them more ergonomic, it's not for building feature-specific behavior
diff --git a/frontend/src/metabase/common/data-studio/components/TablePath/TablePath.tsx b/frontend/src/metabase/common/data-studio/components/TablePath/TablePath.tsx
new file mode 100644
index 00000000000..d1940653a62
--- /dev/null
+++ b/frontend/src/metabase/common/data-studio/components/TablePath/TablePath.tsx
@@ -0,0 +1,56 @@
+import { Children, Fragment, type ReactNode, isValidElement } from "react";
+
+import { Link } from "metabase/common/components/Link";
+import CS from "metabase/css/core/index.css";
+import { Group, Icon, Text } from "metabase/ui";
+import type { IconName } from "metabase-types/api";
+
+type TablePathProps = {
+ children: ReactNode;
+};
+
+export function TablePath({ children }: TablePathProps) {
+ const items = Children.toArray(children);
+
+ return (
+ <Group gap="sm">
+ {items.map((item, index) => (
+ <Fragment key={isValidElement(item) ? item.key : index}>
+ {index > 0 && <Icon name="chevronright" size={8} />}
+ {item}
+ </Fragment>
+ ))}
+ </Group>
+ );
+}
+
+type TablePathItemProps = {
+ label: string;
+ icon: IconName;
+ to?: string;
+ tooltip?: string;
+ "data-testid"?: string;
+};
+
+export function TablePathItem({
+ label,
+ icon,
+ to,
+ tooltip,
+ "data-testid": dataTestId,
+}: TablePathItemProps) {
+ return (
+ <Link
+ className={CS.link}
+ to={to ?? ""}
+ disabled={to == null}
+ data-testid={dataTestId}
+ tooltip={tooltip}
+ >
+ <Group gap="xxs">
+ <Icon name={icon} />
+ <Text c="inherit">{label}</Text>
+ </Group>
+ </Link>
+ );
+}
diff --git a/frontend/src/metabase/common/data-studio/components/TablePath/index.ts b/frontend/src/metabase/common/data-studio/components/TablePath/index.ts
new file mode 100644
index 00000000000..76bc4cd2b52
--- /dev/null
+++ b/frontend/src/metabase/common/data-studio/components/TablePath/index.ts
@@ -0,0 +1 @@
+export * from "./TablePath";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/index.ts
deleted file mode 100644
index a645543a723..00000000000
--- a/frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ActionDefinitionContent } from "./ActionDefinitionContent";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionDependenciesContent/ActionDependenciesContent.tsx b/frontend/src/metabase/data-studio/actions/components/ActionDependenciesContent/ActionDependenciesContent.tsx
index b534da45688..91f39868509 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionDependenciesContent/ActionDependenciesContent.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionDependenciesContent/ActionDependenciesContent.tsx
@@ -1,10 +1,10 @@
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Outlet } from "metabase/router";
import { Card } from "metabase/ui";
-import type { WritebackQueryAction } from "metabase-types/api";
+import type { WritebackAction } from "metabase-types/api";
type ActionDependenciesContentProps = {
- action: WritebackQueryAction;
+ action: WritebackAction;
baseUrl: string;
};
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionEditor/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionEditor/index.ts
deleted file mode 100644
index 1ed193b5e40..00000000000
--- a/frontend/src/metabase/data-studio/actions/components/ActionEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ActionEditor } from "./ActionEditor";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/index.ts
deleted file mode 100644
index b6d6f213aed..00000000000
--- a/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ActionEditorPane } from "./ActionEditorPane";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.tsx
index 431607032a3..63e437beca0 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.tsx
@@ -6,7 +6,6 @@ import { inputTypeHasOptions } from "metabase/actions/utils";
import { TitledSection } from "metabase/metadata/components";
import {
Alert,
- Code,
Icon,
SegmentedControl,
Select,
@@ -19,24 +18,27 @@ import {
import type { FieldSettings, FieldType } from "metabase-types/api";
import { getFieldSettingsForFieldType } from "../../../utils";
+import { ActionFieldSourceCode } from "../ActionFieldSourceCode";
import type { ActionField } from "../hooks";
import { getDefaultValueInputType, textToOptions } from "./utils";
type ActionFieldDetailsProps = {
field: ActionField;
- disabled: boolean;
+ canChangeSettings: boolean;
canChangeFieldType: boolean;
+ canChangeVisibility: boolean;
onChange: (patch: Partial<FieldSettings>) => void;
};
export function ActionFieldDetails({
field,
- disabled,
+ canChangeSettings,
canChangeFieldType,
+ canChangeVisibility,
onChange,
}: ActionFieldDetailsProps) {
- const { settings, variableName } = field;
+ const { settings, source } = field;
const inputTypes = useMemo(
() => getInputTypes()[settings.fieldType],
[settings.fieldType],
@@ -54,18 +56,20 @@ export function ActionFieldDetails({
<BlurTextInput
label={t`Display name`}
value={settings.title}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(title) => onChange({ title })}
/>
<BlurTextarea
label={t`Description`}
value={settings.description ?? ""}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(description) => onChange({ description })}
/>
<Stack gap="xs">
- <Text fw="bold">{t`SQL variable`}</Text>
- <Code w="fit-content">{`{{${variableName}}}`}</Code>
+ <Text fw="bold">
+ {source.type === "variable" ? t`SQL variable` : t`Column`}
+ </Text>
+ <ActionFieldSourceCode source={source} w="fit-content" />
</Stack>
</TitledSection>
<TitledSection>
@@ -81,7 +85,7 @@ export function ActionFieldDetails({
value,
label: name,
}))}
- disabled={disabled || !canChangeFieldType}
+ disabled={!canChangeFieldType}
onChange={(value) => {
const fieldType = getFieldTypes().find(
(option) => option.value === value,
@@ -96,7 +100,7 @@ export function ActionFieldDetails({
label={t`Input type`}
value={settings.inputType}
data={inputTypes.map(({ value, name }) => ({ value, label: name }))}
- disabled={disabled}
+ disabled={!canChangeSettings}
allowDeselect={false}
onChange={(value) => {
const inputType = inputTypes.find(
@@ -112,7 +116,7 @@ export function ActionFieldDetails({
label={t`Options`}
description={t`One option per line`}
value={(settings.valueOptions ?? []).join("\n")}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(value) =>
onChange({
valueOptions: textToOptions(value, settings.fieldType),
@@ -123,7 +127,7 @@ export function ActionFieldDetails({
<BlurTextInput
label={t`Placeholder`}
value={settings.placeholder ?? ""}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(placeholder) => onChange({ placeholder })}
/>
<BlurTextInput
@@ -133,7 +137,7 @@ export function ActionFieldDetails({
value={
settings.defaultValue != null ? String(settings.defaultValue) : ""
}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(value) =>
onChange({
defaultValue: parseDefaultValue(value, settings.fieldType),
@@ -146,7 +150,7 @@ export function ActionFieldDetails({
label={t`Required`}
description={t`People must fill in this field to run the action`}
checked={settings.required}
- disabled={disabled}
+ disabled={!canChangeSettings}
onChange={(event) =>
onChange({ required: event.currentTarget.checked })
}
@@ -155,7 +159,7 @@ export function ActionFieldDetails({
label={t`Show field`}
description={t`Hidden fields use their default value`}
checked={!settings.hidden}
- disabled={disabled}
+ disabled={!canChangeVisibility}
onChange={(event) =>
onChange({ hidden: !event.currentTarget.checked })
}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
index 9f9d6c6eaf0..a7ac3e68484 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
@@ -26,10 +26,11 @@ function setup({ settings, canChangeFieldType = true }: SetupOpts = {}) {
title: "Status",
...settings,
}),
- variableName: "status",
+ source: { type: "variable", name: "status" },
}}
- disabled={false}
+ canChangeSettings
canChangeFieldType={canChangeFieldType}
+ canChangeVisibility
onChange={onChange}
/>,
);
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
index ecfface47cf..dfb64790d5c 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
@@ -2,8 +2,9 @@ import cx from "classnames";
import { Link } from "metabase/common/components/Link";
import { Sortable } from "metabase/common/components/Sortable";
-import { Badge, Card, Code, Group, Icon, Stack, Text } from "metabase/ui";
+import { Badge, Card, Group, Icon, Stack, Text } from "metabase/ui";
+import { ActionFieldSourceCode } from "../../ActionFieldSourceCode";
import type { ActionField } from "../../hooks";
import S from "./ActionFieldItem.module.css";
@@ -22,7 +23,7 @@ export function ActionFieldItem({
isActive,
isDraggable,
}: ActionFieldItemProps) {
- const { parameter, settings, variableName } = field;
+ const { parameter, settings, source } = field;
const title = settings.title || parameter.name;
return (
@@ -64,7 +65,7 @@ export function ActionFieldItem({
</Text>
)}
<Group gap="sm">
- <Code>{`{{ ${variableName} }}`}</Code>
+ <ActionFieldSourceCode source={source} />
<Badge variant="light" color="neutral">
{getFieldSummary(settings)}
</Badge>
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldList.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldList.tsx
index 1ebcf6f4766..9b32a402f3a 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldList.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldList/ActionFieldList.tsx
@@ -14,7 +14,8 @@ import { ActionFieldItem } from "./ActionFieldItem";
type ActionFieldListProps = {
fields: ActionField[];
activeFieldId: string | undefined;
- readOnly: boolean;
+ description: string;
+ isDraggable: boolean;
getFieldUrl: (fieldId: string) => string;
onReorder: (fieldIds: string[]) => void;
};
@@ -24,14 +25,14 @@ const getFieldId = (field: ActionField) => field.parameter.id;
export function ActionFieldList({
fields,
activeFieldId,
- readOnly,
+ description,
+ isDraggable,
getFieldUrl,
onReorder,
}: ActionFieldListProps) {
const pointerSensor = useSensor(PointerSensor, {
activationConstraint: { distance: 15 },
});
- const isDraggable = !readOnly && fields.length > 1;
const handleSortEnd = ({ itemIds }: DragEndEvent) => {
onReorder(itemIds.map(String));
@@ -41,9 +42,7 @@ export function ActionFieldList({
<Stack gap="lg" py="xl">
<Stack gap="xs">
<Title order={4}>{t`Fields`}</Title>
- <Text c="text-secondary">
- {getFieldsDescription(fields.length, isDraggable)}
- </Text>
+ <Text c="text-secondary">{description}</Text>
</Stack>
<Stack gap="md" role="list">
<SortableList<ActionField>
@@ -65,12 +64,3 @@ export function ActionFieldList({
</Stack>
);
}
-
-function getFieldsDescription(fieldCount: number, isDraggable: boolean) {
- if (fieldCount === 0) {
- return t`This action has no variables in its SQL.`;
- }
- return isDraggable
- ? t`One field per {{variable}} in the SQL. Drag to reorder the form.`
- : t`One field per {{variable}} in the SQL.`;
-}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/ActionFieldSourceCode.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/ActionFieldSourceCode.tsx
new file mode 100644
index 00000000000..8503835f5a7
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/ActionFieldSourceCode.tsx
@@ -0,0 +1,18 @@
+import { Code, type CodeProps } from "metabase/ui";
+
+import type { ActionFieldSource } from "../hooks";
+
+type ActionFieldSourceCodeProps = {
+ source: ActionFieldSource;
+} & Omit<CodeProps, "children">;
+
+export function ActionFieldSourceCode({
+ source,
+ ...codeProps
+}: ActionFieldSourceCodeProps) {
+ return (
+ <Code {...codeProps}>
+ {source.type === "variable" ? `{{ ${source.name} }}` : source.name}
+ </Code>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/index.ts
new file mode 100644
index 00000000000..5f1e2870490
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldSourceCode/index.ts
@@ -0,0 +1 @@
+export { ActionFieldSourceCode } from "./ActionFieldSourceCode";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldsContent.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldsContent.tsx
index dcae4af5d56..8b34e5f40d2 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldsContent.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ActionFieldsContent.tsx
@@ -2,29 +2,39 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { Button, Flex, Group, Icon, Stack, Text } from "metabase/ui";
-import type { WritebackQueryAction } from "metabase-types/api";
+import type { FieldSettings } from "metabase-types/api";
import { ActionFieldDetails } from "./ActionFieldDetails";
import { ActionFieldEmptyState } from "./ActionFieldEmptyState";
import { ActionFieldList } from "./ActionFieldList";
import S from "./ActionFieldsContent.module.css";
-import { useActionFields } from "./hooks";
+import type { ActionField } from "./hooks";
type ActionFieldsContentProps = {
- action: WritebackQueryAction;
+ fields: ActionField[];
fieldId: string | undefined;
+ description: string;
+ canReorder: boolean;
+ canChangeSettings: boolean;
canChangeFieldType: boolean;
+ canChangeVisibility: boolean;
getFieldsUrl: (fieldId?: string) => string;
+ onUpdateField: (fieldId: string, patch: Partial<FieldSettings>) => void;
+ onReorderFields: (fieldIds: string[]) => void;
};
export function ActionFieldsContent({
- action,
+ fields,
fieldId,
+ description,
+ canReorder,
+ canChangeSettings,
canChangeFieldType,
+ canChangeVisibility,
getFieldsUrl,
+ onUpdateField,
+ onReorderFields,
}: ActionFieldsContentProps) {
- const readOnly = !action.can_write;
- const { fields, updateField, reorderFields } = useActionFields(action);
const field = fields.find((field) => field.parameter.id === fieldId);
return (
@@ -41,9 +51,10 @@ export function ActionFieldsContent({
<ActionFieldList
fields={fields}
activeFieldId={field?.parameter.id}
- readOnly={readOnly}
+ description={description}
+ isDraggable={canReorder}
getFieldUrl={getFieldsUrl}
- onReorder={reorderFields}
+ onReorder={onReorderFields}
/>
</Stack>
{field != null && (
@@ -79,15 +90,18 @@ export function ActionFieldsContent({
<ActionFieldDetails
key={field.parameter.id}
field={field}
- disabled={readOnly}
+ canChangeSettings={canChangeSettings}
canChangeFieldType={canChangeFieldType}
- onChange={(patch) => updateField(field.parameter.id, patch)}
+ canChangeVisibility={canChangeVisibility}
+ onChange={(patch) => onUpdateField(field.parameter.id, patch)}
/>
</Stack>
)}
{field == null && fields.length > 0 && (
<Flex align="center" flex="1" justify="center" miw={240}>
- <ActionFieldEmptyState readOnly={readOnly} />
+ <ActionFieldEmptyState
+ readOnly={!canChangeSettings && !canChangeVisibility}
+ />
</Flex>
)}
</Flex>
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ImplicitActionFieldsContent.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ImplicitActionFieldsContent.tsx
new file mode 100644
index 00000000000..9ee129a2226
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/ImplicitActionFieldsContent.tsx
@@ -0,0 +1,46 @@
+import { t } from "ttag";
+
+import { skipToken, useGetTableQuery } from "metabase/api";
+import type { WritebackImplicitQueryAction } from "metabase-types/api";
+
+import { ActionFieldsContent } from "./ActionFieldsContent";
+import { useImplicitActionFields } from "./hooks";
+
+type ImplicitActionFieldsContentProps = {
+ action: WritebackImplicitQueryAction;
+ fieldId: string | undefined;
+ getFieldsUrl: (fieldId?: string) => string;
+};
+
+export function ImplicitActionFieldsContent({
+ action,
+ fieldId,
+ getFieldsUrl,
+}: ImplicitActionFieldsContentProps) {
+ const { fields, updateField, reorderFields } =
+ useImplicitActionFields(action);
+ const { data: table } = useGetTableQuery(
+ action.table_id != null ? { id: action.table_id } : skipToken,
+ );
+
+ return (
+ <ActionFieldsContent
+ fields={fields}
+ fieldId={fieldId}
+ description={getFieldsDescription(fields.length, table?.display_name)}
+ canReorder={false}
+ canChangeSettings={false}
+ canChangeFieldType={false}
+ canChangeVisibility={action.can_write ?? false}
+ getFieldsUrl={getFieldsUrl}
+ onUpdateField={updateField}
+ onReorderFields={reorderFields}
+ />
+ );
+}
+
+function getFieldsDescription(fieldCount: number, tableName = "") {
+ return fieldCount === 0
+ ? t`${tableName} has no columns this action can write.`
+ : t`One field per column of ${tableName}.`;
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/QueryActionFieldsContent.tsx b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/QueryActionFieldsContent.tsx
new file mode 100644
index 00000000000..f636e4a2345
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/QueryActionFieldsContent.tsx
@@ -0,0 +1,48 @@
+import { t } from "ttag";
+
+import type { WritebackQueryAction } from "metabase-types/api";
+
+import { ActionFieldsContent } from "./ActionFieldsContent";
+import { useQueryActionFields } from "./hooks";
+
+type QueryActionFieldsContentProps = {
+ action: WritebackQueryAction;
+ fieldId: string | undefined;
+ canChangeFieldType: boolean;
+ getFieldsUrl: (fieldId?: string) => string;
+};
+
+export function QueryActionFieldsContent({
+ action,
+ fieldId,
+ canChangeFieldType,
+ getFieldsUrl,
+}: QueryActionFieldsContentProps) {
+ const { fields, updateField, reorderFields } = useQueryActionFields(action);
+ const readOnly = !action.can_write;
+ const canReorder = !readOnly && fields.length > 1;
+
+ return (
+ <ActionFieldsContent
+ fields={fields}
+ fieldId={fieldId}
+ description={getFieldsDescription(fields.length, canReorder)}
+ canReorder={canReorder}
+ canChangeSettings={!readOnly}
+ canChangeFieldType={!readOnly && canChangeFieldType}
+ canChangeVisibility={!readOnly}
+ getFieldsUrl={getFieldsUrl}
+ onUpdateField={updateField}
+ onReorderFields={reorderFields}
+ />
+ );
+}
+
+function getFieldsDescription(fieldCount: number, canReorder: boolean) {
+ if (fieldCount === 0) {
+ return t`This action has no variables in its SQL.`;
+ }
+ return canReorder
+ ? t`One field per {{variable}} in the SQL. Drag to reorder the form.`
+ : t`One field per {{variable}} in the SQL.`;
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/hooks.ts b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/hooks.ts
index 121efe76a99..b773e786ebb 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/hooks.ts
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/hooks.ts
@@ -11,7 +11,8 @@ import * as Lib from "metabase-lib";
import type {
ActionFormSettings,
FieldSettings,
- UpdateActionRequest,
+ UpdateQueryActionRequest,
+ WritebackImplicitQueryAction,
WritebackParameter,
WritebackQueryAction,
} from "metabase-types/api";
@@ -21,12 +22,16 @@ import {
getQueryParameters,
setTemplateTagFieldType,
} from "../../utils";
-import { useActionQuery } from "../ActionEditor/hooks";
+import { useActionQuery } from "../QueryActionEditor/hooks";
+
+export type ActionFieldSource =
+ | { type: "variable"; name: string }
+ | { type: "column"; name: string };
export type ActionField = {
parameter: WritebackParameter;
settings: FieldSettings;
- variableName: string;
+ source: ActionFieldSource;
};
type ActionFieldsResult = {
@@ -38,7 +43,7 @@ type ActionFieldsResult = {
reorderFields: (fieldIds: string[]) => Promise<void>;
};
-export function useActionFields(
+export function useQueryActionFields(
action: WritebackQueryAction,
): ActionFieldsResult {
const query = useActionQuery(action.dataset_query);
@@ -62,12 +67,18 @@ export function useActionFields(
const settings = formSettings.fields?.[parameter.id];
const tag = tags.find((tag) => tag.id === parameter.id);
return settings && tag
- ? [{ parameter, settings, variableName: tag.name }]
+ ? [
+ {
+ parameter,
+ settings,
+ source: { type: "variable" as const, name: tag.name },
+ },
+ ]
: [];
});
}, [query, formSettings]);
- const save = async (request: Omit<UpdateActionRequest, "id">) => {
+ const save = async (request: Omit<UpdateQueryActionRequest, "id">) => {
const { error } = await updateAction({ id: action.id, ...request });
if (error) {
sendErrorToast(t`Failed to update action fields`);
@@ -127,3 +138,61 @@ export function useActionFields(
return { fields, updateField, reorderFields };
}
+
+export function useImplicitActionFields(
+ action: WritebackImplicitQueryAction,
+): ActionFieldsResult {
+ const [updateAction] = useUpdateActionMutation();
+ const { sendErrorToast } = useMetadataToasts();
+
+ const formSettings = useMemo(
+ () => getDefaultFormSettings(action.visualization_settings),
+ [action.visualization_settings],
+ );
+
+ const fields = useMemo(
+ () =>
+ [...(action.parameters ?? [])]
+ .sort(sortActionParams(formSettings))
+ .flatMap((parameter) => {
+ const settings = formSettings.fields?.[parameter.id];
+ return settings
+ ? [
+ {
+ parameter,
+ settings,
+ source: { type: "column" as const, name: parameter.id },
+ },
+ ]
+ : [];
+ }),
+ [action.parameters, formSettings],
+ );
+
+ const updateField = async (
+ fieldId: string,
+ patch: Partial<FieldSettings>,
+ ) => {
+ const field = formSettings.fields?.[fieldId];
+ if (field == null || patch.hidden == null) {
+ return;
+ }
+ const { error } = await updateAction({
+ id: action.id,
+ visualization_settings: {
+ ...formSettings,
+ fields: {
+ ...formSettings.fields,
+ [fieldId]: { ...field, hidden: patch.hidden },
+ },
+ },
+ });
+ if (error) {
+ sendErrorToast(t`Failed to update action fields`);
+ }
+ };
+
+ const reorderFields = async () => undefined;
+
+ return { fields, updateField, reorderFields };
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/index.ts
index e2475d8aade..3fe07ee38ca 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/index.ts
+++ b/frontend/src/metabase/data-studio/actions/components/ActionFieldsContent/index.ts
@@ -1 +1,2 @@
-export { ActionFieldsContent } from "./ActionFieldsContent";
+export { QueryActionFieldsContent } from "./QueryActionFieldsContent";
+export { ImplicitActionFieldsContent } from "./ImplicitActionFieldsContent";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
index 438c02e3067..1116822aeb3 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
@@ -115,6 +115,7 @@ function ActionTabs({ actionId }: ActionTabsProps) {
pathname.startsWith(Urls.dataStudioActionFields(actionId)),
},
{ label: t`Run`, to: Urls.dataStudioActionRun(actionId) },
+ { label: t`Settings`, to: Urls.dataStudioActionSettings(actionId) },
...(PLUGIN_DEPENDENCIES.isEnabled
? [
{
@@ -123,7 +124,6 @@ function ActionTabs({ actionId }: ActionTabsProps) {
},
]
: []),
- { label: t`Settings`, to: Urls.dataStudioActionSettings(actionId) },
];
return <PillTabNavigation tabs={tabs} />;
}
diff --git a/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/ImplicitActionDefinitionContent.tsx b/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/ImplicitActionDefinitionContent.tsx
new file mode 100644
index 00000000000..757d0da0a12
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/ImplicitActionDefinitionContent.tsx
@@ -0,0 +1,176 @@
+import { useDisclosure } from "@mantine/hooks";
+import { t } from "ttag";
+
+import { skipToken, useGetTableQueryMetadataQuery } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import type { OmniPickerTableItem } from "metabase/common/components/Pickers";
+import {
+ TablePath,
+ TablePathItem,
+} from "metabase/common/data-studio/components/TablePath";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
+import {
+ Button,
+ Group,
+ Loader,
+ SegmentedControl,
+ Stack,
+ Text,
+} from "metabase/ui";
+import * as Urls from "metabase/urls";
+import type { ImplicitActionKind, Table, TableId } from "metabase-types/api";
+
+import {
+ getImplicitActionKindOption,
+ getImplicitActionKindOptions,
+ hasSinglePrimaryKey,
+} from "../../utils";
+import { ImplicitActionTablePickerModal } from "../ImplicitActionTablePickerModal";
+
+type ImplicitActionDefinitionContentProps = {
+ tableId: TableId | null;
+ kind: ImplicitActionKind;
+ readOnly?: boolean;
+ onChangeTable: (tableId: TableId) => void;
+ onChangeKind: (kind: ImplicitActionKind) => void;
+};
+
+export function ImplicitActionDefinitionContent({
+ tableId,
+ kind,
+ readOnly = false,
+ onChangeTable,
+ onChangeKind,
+}: ImplicitActionDefinitionContentProps) {
+ const [isPickerOpened, { open: openPicker, close: closePicker }] =
+ useDisclosure();
+ const {
+ currentData: table,
+ isFetching,
+ error,
+ } = useGetTableQueryMetadataQuery(
+ tableId != null ? { id: tableId } : skipToken,
+ );
+ const kindOptions = getImplicitActionKindOptions().map(
+ ({ value, label }) => ({ value, label }),
+ );
+
+ const handleKindChange = (value: string) => {
+ const option = kindOptions.find((option) => option.value === value);
+ if (option != null) {
+ onChangeKind(option.value);
+ }
+ };
+
+ const handleTableChange = (table: OmniPickerTableItem) => {
+ closePicker();
+ onChangeTable(table.id);
+ };
+
+ return (
+ <Stack gap="2.5rem" data-testid="implicit-action-definition">
+ <TitleSection
+ label={t`Table`}
+ description={t`The table this action writes to.`}
+ >
+ <Group p="xl" justify="space-between" wrap="nowrap">
+ <ImplicitActionTableInfo
+ table={table}
+ isLoading={table == null && isFetching}
+ error={error}
+ />
+ {!readOnly && <Button onClick={openPicker}>{t`Change table`}</Button>}
+ </Group>
+ {table != null && !hasSinglePrimaryKey(table) && (
+ <Text c="feedback-negative" px="xl" pb="xl">
+ {t`Actions can only write to a table with exactly one primary key.`}
+ </Text>
+ )}
+ </TitleSection>
+ <TitleSection
+ label={t`Operation`}
+ description={t`What the action does with one row of the table.`}
+ >
+ <Stack p="xl" gap="md" align="flex-start">
+ <SegmentedControl
+ value={kind}
+ data={kindOptions}
+ disabled={readOnly}
+ onChange={handleKindChange}
+ />
+ <Text c="text-secondary">
+ {getImplicitActionKindOption(kind).description}
+ </Text>
+ </Stack>
+ </TitleSection>
+ {isPickerOpened && (
+ <ImplicitActionTablePickerModal
+ tableId={tableId ?? undefined}
+ onChange={handleTableChange}
+ onClose={closePicker}
+ />
+ )}
+ </Stack>
+ );
+}
+
+type ImplicitActionTableInfoProps = {
+ table: Table | undefined;
+ isLoading: boolean;
+ error: unknown;
+};
+
+function ImplicitActionTableInfo({
+ table,
+ isLoading,
+ error,
+}: ImplicitActionTableInfoProps) {
+ if (isLoading) {
+ return <Loader size="sm" />;
+ }
+ if (error != null) {
+ return <Text c="feedback-negative">{getErrorMessage(error)}</Text>;
+ }
+ return <ImplicitActionTablePath table={table} />;
+}
+
+type ImplicitActionTablePathProps = {
+ table: Table | undefined;
+};
+
+function ImplicitActionTablePath({ table }: ImplicitActionTablePathProps) {
+ if (table == null) {
+ return <Text c="text-secondary">{t`No table`}</Text>;
+ }
+
+ return (
+ <TablePath>
+ {table.db != null && (
+ <TablePathItem
+ label={table.db.name}
+ icon="database"
+ to={Urls.dataStudioData({ databaseId: table.db_id })}
+ />
+ )}
+ {table.schema && (
+ <TablePathItem
+ label={table.schema}
+ icon="folder"
+ to={Urls.dataStudioData({
+ databaseId: table.db_id,
+ schemaName: table.schema,
+ })}
+ />
+ )}
+ <TablePathItem
+ label={table.display_name}
+ icon="table2"
+ to={Urls.dataStudioData({
+ databaseId: table.db_id,
+ schemaName: table.schema,
+ tableId: table.id,
+ })}
+ />
+ </TablePath>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/index.ts b/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/index.ts
new file mode 100644
index 00000000000..5a770fc907b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ImplicitActionDefinitionContent/index.ts
@@ -0,0 +1 @@
+export { ImplicitActionDefinitionContent } from "./ImplicitActionDefinitionContent";
diff --git a/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/ImplicitActionTablePickerModal.tsx b/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/ImplicitActionTablePickerModal.tsx
new file mode 100644
index 00000000000..05532928bd5
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/ImplicitActionTablePickerModal.tsx
@@ -0,0 +1,71 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { useListDatabasesQuery } from "metabase/api";
+import {
+ EntityPickerModal,
+ type OmniPickerItem,
+ type OmniPickerTableItem,
+} from "metabase/common/components/Pickers";
+import { hasActionsEnabled } from "metabase/common/utils/database";
+import type { DatabaseId, TableId } from "metabase-types/api";
+
+import { ACTION_TABLE_PICKER_OPTIONS } from "../../constants";
+
+const isTableItem = (item: OmniPickerItem): item is OmniPickerTableItem =>
+ item.model === "table" && "database_id" in item;
+
+type ImplicitActionTablePickerModalProps = {
+ tableId?: TableId;
+ onChange: (table: OmniPickerTableItem) => void;
+ onClose: () => void;
+};
+
+export function ImplicitActionTablePickerModal({
+ tableId,
+ onChange,
+ onClose,
+}: ImplicitActionTablePickerModalProps) {
+ const { data } = useListDatabasesQuery();
+ const enabledDatabaseIds = useMemo(
+ () =>
+ new Set<DatabaseId>(
+ (data?.data ?? []).filter(hasActionsEnabled).map(({ id }) => id),
+ ),
+ [data],
+ );
+
+ const isHiddenItem = (item: OmniPickerItem) => {
+ switch (item.model) {
+ case "database":
+ return !enabledDatabaseIds.has(item.id);
+ case "schema":
+ case "table":
+ return (
+ "database_id" in item &&
+ item.database_id != null &&
+ !enabledDatabaseIds.has(item.database_id)
+ );
+ default:
+ return false;
+ }
+ };
+
+ const handleChange = (item: OmniPickerItem) => {
+ if (isTableItem(item)) {
+ onChange(item);
+ }
+ };
+
+ return (
+ <EntityPickerModal
+ title={t`Pick a table for the action`}
+ models={["table"]}
+ value={tableId != null ? { model: "table", id: tableId } : undefined}
+ options={ACTION_TABLE_PICKER_OPTIONS}
+ isHiddenItem={isHiddenItem}
+ onChange={handleChange}
+ onClose={onClose}
+ />
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/index.ts b/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/index.ts
new file mode 100644
index 00000000000..be963eb1438
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/ImplicitActionTablePickerModal/index.ts
@@ -0,0 +1 @@
+export { ImplicitActionTablePickerModal } from "./ImplicitActionTablePickerModal";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/ActionDefinitionContent.tsx b/frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/QueryActionDefinitionContent.tsx
similarity index 76%
rename from frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/ActionDefinitionContent.tsx
rename to frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/QueryActionDefinitionContent.tsx
index dbe37bac95f..725c1f55143 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionDefinitionContent/ActionDefinitionContent.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/QueryActionDefinitionContent.tsx
@@ -6,27 +6,27 @@ import { getInitialUiState } from "metabase/querying/editor/components/QueryEdit
import { Button } from "metabase/ui";
import type { Database, WritebackQueryAction } from "metabase-types/api";
-import { ActionEditor } from "../ActionEditor";
-import { ActionEditorPane } from "../ActionEditorPane";
+import { QueryActionEditor } from "../QueryActionEditor";
+import { QueryActionEditorPane } from "../QueryActionEditorPane";
-type ActionDefinitionContentProps = {
+type QueryActionDefinitionContentProps = {
action: WritebackQueryAction;
databases: Database[];
canEdit?: boolean;
editUrl?: string;
};
-export function ActionDefinitionContent({
+export function QueryActionDefinitionContent({
action,
databases,
canEdit = false,
editUrl,
-}: ActionDefinitionContentProps) {
+}: QueryActionDefinitionContentProps) {
const [uiState, setUiState] = useState(getInitialUiState);
return (
- <ActionEditorPane>
- <ActionEditor
+ <QueryActionEditorPane>
+ <QueryActionEditor
datasetQuery={action.dataset_query}
uiState={uiState}
databases={databases}
@@ -47,6 +47,6 @@ export function ActionDefinitionContent({
onChangeDatasetQuery={() => undefined}
onChangeUiState={setUiState}
/>
- </ActionEditorPane>
+ </QueryActionEditorPane>
);
}
diff --git a/frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/index.ts b/frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/index.ts
new file mode 100644
index 00000000000..38550dc45ed
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionDefinitionContent/index.ts
@@ -0,0 +1 @@
+export { QueryActionDefinitionContent } from "./QueryActionDefinitionContent";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx b/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/QueryActionEditor.tsx
similarity index 94%
rename from frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx
rename to frontend/src/metabase/data-studio/actions/components/QueryActionEditor/QueryActionEditor.tsx
index 2b4a9a99f95..3f11ed13dbb 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/QueryActionEditor.tsx
@@ -10,7 +10,7 @@ import type { Database, DatasetQuery } from "metabase-types/api";
import { useActionQuery } from "./hooks";
-type ActionEditorProps = {
+type QueryActionEditorProps = {
datasetQuery: DatasetQuery;
uiState: QueryEditorUiState;
databases: Database[];
@@ -20,7 +20,7 @@ type ActionEditorProps = {
onChangeUiState: (uiState: QueryEditorUiState) => void;
};
-export function ActionEditor({
+export function QueryActionEditor({
datasetQuery,
uiState,
databases,
@@ -28,7 +28,7 @@ export function ActionEditor({
topBarInnerContent,
onChangeDatasetQuery,
onChangeUiState,
-}: ActionEditorProps) {
+}: QueryActionEditorProps) {
const query = useActionQuery(datasetQuery);
const uiOptions = useMemo(
(): QueryEditorUiOptions => ({
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionEditor/hooks.ts b/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/hooks.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/actions/components/ActionEditor/hooks.ts
rename to frontend/src/metabase/data-studio/actions/components/QueryActionEditor/hooks.ts
diff --git a/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/index.ts b/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/index.ts
new file mode 100644
index 00000000000..0c7a826d75f
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionEditor/index.ts
@@ -0,0 +1 @@
+export { QueryActionEditor } from "./QueryActionEditor";
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/ActionEditorPane.tsx b/frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/QueryActionEditorPane.tsx
similarity index 73%
rename from frontend/src/metabase/data-studio/actions/components/ActionEditorPane/ActionEditorPane.tsx
rename to frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/QueryActionEditorPane.tsx
index c4c722da3ab..c6e83688027 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/ActionEditorPane.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/QueryActionEditorPane.tsx
@@ -2,11 +2,13 @@ import type { ReactNode } from "react";
import { Box } from "metabase/ui";
-type ActionEditorPaneProps = {
+type QueryActionEditorPaneProps = {
children: ReactNode;
};
-export function ActionEditorPane({ children }: ActionEditorPaneProps) {
+export function QueryActionEditorPane({
+ children,
+}: QueryActionEditorPaneProps) {
return (
<Box
w="100%"
diff --git a/frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/index.ts b/frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/index.ts
new file mode 100644
index 00000000000..7301c4b5b83
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/components/QueryActionEditorPane/index.ts
@@ -0,0 +1 @@
+export { QueryActionEditorPane } from "./QueryActionEditorPane";
diff --git a/frontend/src/metabase/data-studio/actions/constants.ts b/frontend/src/metabase/data-studio/actions/constants.ts
index 2bb8b8190bf..44def764193 100644
--- a/frontend/src/metabase/data-studio/actions/constants.ts
+++ b/frontend/src/metabase/data-studio/actions/constants.ts
@@ -1,3 +1,5 @@
+import { t } from "ttag";
+
import type { EntityPickerOptions } from "metabase/common/components/Pickers";
import type { CollectionNamespace } from "metabase-types/api";
@@ -13,6 +15,16 @@ export const ACTION_COLLECTION_PICKER_OPTIONS: EntityPickerOptions = {
canCreateCollections: true,
};
+export const ACTION_TABLE_PICKER_OPTIONS: EntityPickerOptions = {
+ hasRecents: false,
+ hasLibrary: false,
+ hasDatabases: true,
+ hasRootCollection: false,
+ hasPersonalCollections: false,
+ hasConfirmButtons: true,
+ confirmButtonText: () => t`Continue`,
+};
+
export const ACTION_COLLECTION_NAMESPACES: CollectionNamespace[] = [
"data-actions",
];
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts
deleted file mode 100644
index 74fbcfb1314..00000000000
--- a/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { useActionDraft } from "./use-action-draft";
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts
index 8da18f5f6be..a91c6a8ad8d 100644
--- a/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts
@@ -29,7 +29,7 @@ export function useBuildActionTree({
data: actions,
isLoading: isLoadingActions,
error: actionsError,
- } = useListActionsQuery({ type: "query", archived });
+ } = useListActionsQuery({ archived });
const {
data: collections,
isLoading: isLoadingCollections,
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/index.ts
new file mode 100644
index 00000000000..fa4d76737c2
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/index.ts
@@ -0,0 +1 @@
+export { useQueryActionDraft } from "./use-query-action-draft";
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts b/frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/use-query-action-draft.ts
similarity index 66%
rename from frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/use-query-action-draft.ts
index 9b8e90ee419..5afc878875a 100644
--- a/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-query-action-draft/use-query-action-draft.ts
@@ -4,31 +4,34 @@ import { getDefaultFormSettings } from "metabase/actions/utils";
import * as Lib from "metabase-lib";
import type { ActionFormSettings, DatasetQuery } from "metabase-types/api";
-import { useActionQuery } from "../../components/ActionEditor/hooks";
-import { type ActionDefinition, getActionDefinition } from "../../utils";
+import { useActionQuery } from "../../components/QueryActionEditor/hooks";
+import {
+ type QueryActionDefinition,
+ getQueryActionDefinition,
+} from "../../utils";
-type UseActionDraftOptions = {
+type UseQueryActionDraftOptions = {
initialDatasetQuery: DatasetQuery;
formSettings?: ActionFormSettings;
};
-type ActionDraft = {
+type QueryActionDraft = {
datasetQuery: DatasetQuery;
- definition: ActionDefinition | null;
+ definition: QueryActionDefinition | null;
isDirty: boolean;
isValid: boolean;
setDatasetQuery: (datasetQuery: DatasetQuery) => void;
};
-export function useActionDraft({
+export function useQueryActionDraft({
initialDatasetQuery,
formSettings,
-}: UseActionDraftOptions): ActionDraft {
+}: UseQueryActionDraftOptions): QueryActionDraft {
const [datasetQuery, setDatasetQuery] = useState(initialDatasetQuery);
const query = useActionQuery(datasetQuery);
const definition = useMemo(
- () => getActionDefinition(query, getDefaultFormSettings(formSettings)),
+ () => getQueryActionDefinition(query, getDefaultFormSettings(formSettings)),
[query, formSettings],
);
const isDirty = !Lib.areLegacyQueriesEqual(datasetQuery, initialDatasetQuery);
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts b/frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts
index e33355dc172..a3d23442a41 100644
--- a/frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { skipToken, useGetActionQuery } from "metabase/api";
import { useParams } from "metabase/router";
import * as Urls from "metabase/urls";
-import type { WritebackQueryAction } from "metabase-types/api";
+import type { WritebackAction } from "metabase-types/api";
type RouteActionResult = {
- action: WritebackQueryAction | undefined;
+ action: WritebackAction | undefined;
isLoading: boolean;
error: unknown;
};
@@ -14,11 +14,12 @@ type RouteActionResult = {
export function useRouteAction(): RouteActionResult {
const params = useParams<{ actionId: string }>();
const actionId = Urls.extractEntityId(params.actionId);
- const { currentData, isFetching, error } = useGetActionQuery(
- actionId != null ? { id: actionId } : skipToken,
- );
- const action = currentData?.type === "query" ? currentData : undefined;
- const isLoading = currentData === undefined && isFetching;
+ const {
+ currentData: action,
+ isFetching,
+ error,
+ } = useGetActionQuery(actionId != null ? { id: actionId } : skipToken);
+ const isLoading = action === undefined && isFetching;
const isNotFound = !isLoading && error === undefined && action === undefined;
return {
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/ActionQueryPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.tsx
similarity index 54%
rename from frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/ActionQueryPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.tsx
index 36caa89442a..6c29ae6b18a 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/ActionQueryPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo, useRef, useState } from "react";
import { t } from "ttag";
import { useUpdateActionMutation } from "metabase/api";
-import { getErrorMessage } from "metabase/api/utils";
+import { findErrorMessage, getErrorMessage } from "metabase/api/utils";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
@@ -13,39 +13,58 @@ import { getInitialUiState } from "metabase/querying/editor/components/QueryEdit
import { type Location, useLocation, useNavigate } from "metabase/router";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
-import type { Database, WritebackQueryAction } from "metabase-types/api";
+import type {
+ Database,
+ ImplicitActionKind,
+ TableId,
+ UpdateImplicitActionRequest,
+ WritebackImplicitQueryAction,
+ WritebackQueryAction,
+} from "metabase-types/api";
import { trackDataActionQueryUpdated } from "../../analytics";
-import { ActionDefinitionContent } from "../../components/ActionDefinitionContent";
-import { ActionEditor } from "../../components/ActionEditor";
-import { ActionEditorPane } from "../../components/ActionEditorPane";
import { ActionHeader } from "../../components/ActionHeader";
+import { ImplicitActionDefinitionContent } from "../../components/ImplicitActionDefinitionContent";
+import { QueryActionDefinitionContent } from "../../components/QueryActionDefinitionContent";
+import { QueryActionEditor } from "../../components/QueryActionEditor";
+import { QueryActionEditorPane } from "../../components/QueryActionEditorPane";
import { useActionDatabases } from "../../hooks/use-action-databases";
-import { useActionDraft } from "../../hooks/use-action-draft";
+import { useQueryActionDraft } from "../../hooks/use-query-action-draft";
import { useRouteAction } from "../../hooks/use-route-action";
import { canEditActionQuery } from "../../utils";
-export function ActionQueryPage() {
+export function ActionDefinitionPage() {
+ const { action, isLoading, error } = useRouteAction();
+
+ if (isLoading || error != null || action == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return action.type === "implicit" ? (
+ <ImplicitActionDefinitionPage key={action.id} action={action} />
+ ) : (
+ <QueryActionDefinitionPage key={action.id} action={action} />
+ );
+}
+
+type QueryActionDefinitionPageProps = {
+ action: WritebackQueryAction;
+};
+
+function QueryActionDefinitionPage({ action }: QueryActionDefinitionPageProps) {
const { pathname } = useLocation();
const isEditRoute = pathname.endsWith("/edit");
- const {
- action,
- isLoading: isLoadingAction,
- error: actionError,
- } = useRouteAction();
- const {
- databases,
- isLoading: isLoadingDatabases,
- error: databasesError,
- } = useActionDatabases();
+ const { databases, isLoading, error } = useActionDatabases();
const editableDatabases = useMemo(
() => databases.filter(hasNativeWritePermissions),
[databases],
);
- const isLoading = isLoadingAction || isLoadingDatabases;
- const error = actionError ?? databasesError;
- if (isLoading || error != null || action == null) {
+ if (isLoading || error != null) {
return (
<Center h="100%">
<LoadingAndErrorWrapper loading={isLoading} error={error} />
@@ -56,13 +75,13 @@ export function ActionQueryPage() {
const canEditQuery = canEditActionQuery(action, databases);
return isEditRoute && canEditQuery ? (
- <ActionEditPage
+ <QueryActionEditPage
key={action.id}
action={action}
databases={editableDatabases}
/>
) : (
- <ActionDefinitionPage
+ <QueryActionViewPage
action={action}
databases={editableDatabases}
canEditQuery={canEditQuery}
@@ -70,24 +89,24 @@ export function ActionQueryPage() {
);
}
-type ActionPageProps = {
+type QueryActionEditPageProps = {
action: WritebackQueryAction;
databases: Database[];
};
-type ActionDefinitionPageProps = ActionPageProps & {
+type QueryActionViewPageProps = QueryActionEditPageProps & {
canEditQuery: boolean;
};
-function ActionDefinitionPage({
+function QueryActionViewPage({
action,
databases,
canEditQuery,
-}: ActionDefinitionPageProps) {
+}: QueryActionViewPageProps) {
return (
<PageContainer data-testid="action-definition">
<ActionHeader action={action} />
- <ActionDefinitionContent
+ <QueryActionDefinitionContent
action={action}
databases={databases}
canEdit={canEditQuery}
@@ -97,8 +116,8 @@ function ActionDefinitionPage({
);
}
-function ActionEditPage({ action, databases }: ActionPageProps) {
- const draft = useActionDraft({
+function QueryActionEditPage({ action, databases }: QueryActionEditPageProps) {
+ const draft = useQueryActionDraft({
initialDatasetQuery: action.dataset_query,
formSettings: action.visualization_settings,
});
@@ -152,15 +171,15 @@ function ActionEditPage({ action, databases }: ActionPageProps) {
/>
}
/>
- <ActionEditorPane>
- <ActionEditor
+ <QueryActionEditorPane>
+ <QueryActionEditor
datasetQuery={draft.datasetQuery}
uiState={uiState}
databases={databases}
onChangeDatasetQuery={draft.setDatasetQuery}
onChangeUiState={setUiState}
/>
- </ActionEditorPane>
+ </QueryActionEditorPane>
</PageContainer>
<LeaveRouteConfirmModal
isEnabled={draft.isDirty}
@@ -169,3 +188,69 @@ function ActionEditPage({ action, databases }: ActionPageProps) {
</>
);
}
+
+type ImplicitActionDefinitionPageProps = {
+ action: WritebackImplicitQueryAction;
+};
+
+function ImplicitActionDefinitionPage({
+ action,
+}: ImplicitActionDefinitionPageProps) {
+ const [updateAction] = useUpdateActionMutation();
+ const { sendSuccessToast, sendErrorToast, sendUndoToast } =
+ useMetadataToasts();
+
+ const handleUpdate = async (
+ changes: Omit<UpdateImplicitActionRequest, "id">,
+ previous: Omit<UpdateImplicitActionRequest, "id">,
+ message: string,
+ ) => {
+ const { error } = await updateAction({ id: action.id, ...changes });
+ if (error) {
+ const errorMessage = findErrorMessage(error);
+ sendErrorToast(
+ errorMessage
+ ? t`Failed to update action: ${errorMessage}`
+ : t`Failed to update action`,
+ );
+ return;
+ }
+ sendSuccessToast(message, async () => {
+ const { error } = await updateAction({ id: action.id, ...previous });
+ sendUndoToast(error);
+ });
+ };
+
+ const handleTableChange = (table_id: TableId) => {
+ if (table_id !== action.table_id && action.table_id != null) {
+ handleUpdate(
+ { table_id },
+ { table_id: action.table_id },
+ t`Action table updated`,
+ );
+ }
+ };
+
+ const handleKindChange = (kind: ImplicitActionKind) => {
+ if (kind !== action.kind) {
+ handleUpdate(
+ { kind },
+ { kind: action.kind },
+ t`Action operation updated`,
+ );
+ }
+ };
+
+ return (
+ <PageContainer data-testid="action-definition">
+ <ActionHeader action={action} />
+ <ImplicitActionDefinitionContent
+ tableId={action.table_id}
+ kind={action.kind}
+ readOnly={!action.can_write}
+ onChangeTable={handleTableChange}
+ onChangeKind={handleKindChange}
+ />
+ </PageContainer>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.unit.spec.tsx
new file mode 100644
index 00000000000..cc8f76bcc8b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/ActionDefinitionPage.unit.spec.tsx
@@ -0,0 +1,219 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupActionEndpoints,
+ setupCollectionByIdEndpoint,
+ setupDatabaseListEndpoint,
+ setupTableQueryMetadataEndpoint,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { ROOT_COLLECTION } from "metabase/common/collections/constants";
+import { Route } from "metabase/router";
+import type { WritebackImplicitQueryAction } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockDatabase,
+ createMockField,
+ createMockImplicitQueryAction,
+ createMockTable,
+} from "metabase-types/api/mocks";
+
+import { ActionDefinitionPage } from "./ActionDefinitionPage";
+
+type TablePickerMockProps = {
+ onChange: (table: { id: number }) => void;
+};
+
+jest.mock("../../components/ImplicitActionTablePickerModal", () => ({
+ ImplicitActionTablePickerModal: ({ onChange }: TablePickerMockProps) => (
+ <button onClick={() => onChange({ id: 20 })}>Pick Orders</button>
+ ),
+}));
+
+const DATABASE = createMockDatabase({
+ id: 1,
+ name: "Shop",
+ settings: { "database-enable-actions": true },
+});
+
+const TABLE = createMockTable({
+ id: 10,
+ db_id: 1,
+ db: DATABASE,
+ schema: "public",
+ display_name: "Customers",
+ fields: [
+ createMockField({
+ id: 100,
+ table_id: 10,
+ name: "ID",
+ semantic_type: "type/PK",
+ }),
+ ],
+});
+
+type SetupOpts = {
+ action: WritebackImplicitQueryAction;
+};
+
+const OTHER_TABLE = createMockTable({
+ id: 20,
+ db_id: 1,
+ db: DATABASE,
+ schema: "public",
+ display_name: "Orders",
+ fields: [
+ createMockField({
+ id: 200,
+ table_id: 20,
+ name: "ID",
+ semantic_type: "type/PK",
+ }),
+ ],
+});
+
+function setup({ action }: SetupOpts) {
+ setupActionEndpoints(action);
+ setupTableQueryMetadataEndpoint(TABLE);
+ setupTableQueryMetadataEndpoint(OTHER_TABLE);
+ setupDatabaseListEndpoint([DATABASE]);
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection(ROOT_COLLECTION)],
+ });
+
+ renderWithProviders(
+ <Route
+ path="/data-studio/data-actions/:actionId"
+ element={<ActionDefinitionPage />}
+ />,
+ {
+ withRouter: true,
+ withUndos: true,
+ initialRoute: `/data-studio/data-actions/${action.id}`,
+ },
+ );
+}
+
+async function getLastUpdate() {
+ return fetchMock.callHistory.lastCall("action-2-put")?.request?.json();
+}
+
+describe("ActionDefinitionPage", () => {
+ it("should show the table and the operation of a table action", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: TABLE.id,
+ kind: "row/update",
+ can_write: true,
+ }),
+ });
+
+ expect(await screen.findByText("Customers")).toBeInTheDocument();
+ expect(screen.getByText("Shop")).toBeInTheDocument();
+ expect(screen.getByRole("radio", { name: "Update" })).toBeChecked();
+ expect(
+ screen.getByText(
+ "Changes one row, found by its primary key. Empty fields keep their value.",
+ ),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByRole("button", { name: "Change table" }),
+ ).toBeInTheDocument();
+ });
+
+ it("should save a new operation right away and undo it from the toast", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: TABLE.id,
+ kind: "row/create",
+ can_write: true,
+ }),
+ });
+
+ await userEvent.click(await screen.findByRole("radio", { name: "Delete" }));
+
+ await waitFor(async () =>
+ expect(await getLastUpdate()).toEqual({ id: 2, kind: "row/delete" }),
+ );
+ await userEvent.click(await screen.findByRole("button", { name: "Undo" }));
+ await waitFor(async () =>
+ expect(await getLastUpdate()).toEqual({ id: 2, kind: "row/create" }),
+ );
+ });
+
+ it("should save a new table right away and undo it from the toast", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: TABLE.id,
+ kind: "row/create",
+ can_write: true,
+ }),
+ });
+
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Change table" }),
+ );
+ await userEvent.click(screen.getByRole("button", { name: "Pick Orders" }));
+
+ await waitFor(async () =>
+ expect(await getLastUpdate()).toEqual({
+ id: 2,
+ table_id: OTHER_TABLE.id,
+ }),
+ );
+ await userEvent.click(await screen.findByRole("button", { name: "Undo" }));
+ await waitFor(async () =>
+ expect(await getLastUpdate()).toEqual({ id: 2, table_id: TABLE.id }),
+ );
+ });
+
+ it("should show the server's reason when a change can't be saved", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: TABLE.id,
+ kind: "row/create",
+ can_write: true,
+ }),
+ });
+ fetchMock.modifyRoute("action-2-put", {
+ response: {
+ status: 400,
+ body: "An implicit action needs a table with exactly one primary key.",
+ },
+ });
+
+ await userEvent.click(await screen.findByRole("radio", { name: "Delete" }));
+
+ expect(
+ await screen.findByText(
+ "Failed to update action: An implicit action needs a table with exactly one primary key.",
+ ),
+ ).toBeInTheDocument();
+ });
+
+ it("should not let a user who can't write the action change it", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: TABLE.id,
+ can_write: false,
+ }),
+ });
+
+ expect(await screen.findByText("Customers")).toBeInTheDocument();
+ expect(screen.getByRole("radio", { name: "Insert" })).toBeDisabled();
+ expect(
+ screen.queryByRole("button", { name: "Change table" }),
+ ).not.toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/index.ts
new file mode 100644
index 00000000000..0e0b9d940af
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionDefinitionPage/index.ts
@@ -0,0 +1 @@
+export { ActionDefinitionPage } from "./ActionDefinitionPage";
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
index 6adfcd07482..553d709a3bd 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
@@ -3,8 +3,15 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContai
import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
+import type {
+ WritebackImplicitQueryAction,
+ WritebackQueryAction,
+} from "metabase-types/api";
-import { ActionFieldsContent } from "../../components/ActionFieldsContent";
+import {
+ ImplicitActionFieldsContent,
+ QueryActionFieldsContent,
+} from "../../components/ActionFieldsContent";
import { ActionHeader } from "../../components/ActionHeader";
import { useActionDatabases } from "../../hooks/use-action-databases";
import { useRouteAction } from "../../hooks/use-route-action";
@@ -12,18 +19,7 @@ import { canEditActionQuery } from "../../utils";
export function ActionFieldsPage() {
const { fieldId } = useParams<{ fieldId?: string }>();
- const {
- action,
- isLoading: isLoadingAction,
- error: actionError,
- } = useRouteAction();
- const {
- databases,
- isLoading: isLoadingDatabases,
- error: databasesError,
- } = useActionDatabases();
- const isLoading = isLoadingAction || isLoadingDatabases;
- const error = actionError ?? databasesError;
+ const { action, isLoading, error } = useRouteAction();
if (isLoading || error != null || action == null) {
return (
@@ -33,10 +29,36 @@ export function ActionFieldsPage() {
);
}
+ return action.type === "implicit" ? (
+ <ImplicitActionFieldsPage action={action} fieldId={fieldId} />
+ ) : (
+ <QueryActionFieldsPage action={action} fieldId={fieldId} />
+ );
+}
+
+type QueryActionFieldsPageProps = {
+ action: WritebackQueryAction;
+ fieldId: string | undefined;
+};
+
+function QueryActionFieldsPage({
+ action,
+ fieldId,
+}: QueryActionFieldsPageProps) {
+ const { databases, isLoading, error } = useActionDatabases();
+
+ if (isLoading || error != null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
return (
<PageContainer data-testid="action-fields" gap="lg" px={0} pb={0}>
<ActionHeader action={action} px="3.5rem" />
- <ActionFieldsContent
+ <QueryActionFieldsContent
action={action}
fieldId={fieldId}
canChangeFieldType={canEditActionQuery(action, databases)}
@@ -47,3 +69,26 @@ export function ActionFieldsPage() {
</PageContainer>
);
}
+
+type ImplicitActionFieldsPageProps = {
+ action: WritebackImplicitQueryAction;
+ fieldId: string | undefined;
+};
+
+function ImplicitActionFieldsPage({
+ action,
+ fieldId,
+}: ImplicitActionFieldsPageProps) {
+ return (
+ <PageContainer data-testid="action-fields" gap="lg" px={0} pb={0}>
+ <ActionHeader action={action} px="3.5rem" />
+ <ImplicitActionFieldsContent
+ action={action}
+ fieldId={fieldId}
+ getFieldsUrl={(fieldId) =>
+ Urls.dataStudioActionFields(action.id, fieldId)
+ }
+ />
+ </PageContainer>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
index 503207ed12b..fee8b31a856 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
@@ -1,33 +1,45 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
import {
setupActionEndpoints,
setupCollectionByIdEndpoint,
setupDatabaseListEndpoint,
+ setupTableEndpoints,
} from "__support__/server-mocks";
import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { Route } from "metabase/router";
-import type { Database, WritebackQueryAction } from "metabase-types/api";
+import type { Database, Table, WritebackAction } from "metabase-types/api";
import {
+ createMockActionParameter,
createMockCollection,
createMockDatabase,
+ createMockFieldSettings,
+ createMockImplicitQueryAction,
createMockNativeDatasetQuery,
createMockNativeQuery,
createMockQueryAction,
+ createMockTable,
createMockTemplateTag,
} from "metabase-types/api/mocks";
import { ActionFieldsPage } from "./ActionFieldsPage";
type SetupOpts = {
- action: WritebackQueryAction;
+ action: WritebackAction;
database: Database;
+ table?: Table;
fieldId?: string;
};
-function setup({ action, database, fieldId = "status" }: SetupOpts) {
+function setup({ action, database, table, fieldId = "status" }: SetupOpts) {
setupActionEndpoints(action);
+ if (table) {
+ setupTableEndpoints(table);
+ }
setupDatabaseListEndpoint([database]);
setupCollectionByIdEndpoint({
collections: [createMockCollection(ROOT_COLLECTION)],
@@ -91,6 +103,54 @@ const TWO_VARIABLE_DATASET_QUERY = createMockNativeDatasetQuery({
});
describe("ActionFieldsPage", () => {
+ it("should only let a user change whether a table action's field is shown", async () => {
+ setup({
+ action: createMockImplicitQueryAction({
+ id: 2,
+ model_id: null,
+ table_id: 10,
+ database_id: 1,
+ can_write: true,
+ parameters: [createMockActionParameter({ id: "email", name: "Email" })],
+ visualization_settings: {
+ type: "form",
+ fields: {
+ email: createMockFieldSettings({ id: "email", title: "Email" }),
+ },
+ },
+ }),
+ database: createMockDatabase({
+ id: 1,
+ native_permissions: "write",
+ settings: { "database-enable-actions": true },
+ }),
+ table: createMockTable({ id: 10, display_name: "Customers" }),
+ fieldId: "email",
+ });
+
+ expect(
+ await screen.findByText("One field per column of Customers."),
+ ).toBeInTheDocument();
+ expect(screen.getByText("Column")).toBeInTheDocument();
+ expect(screen.getByLabelText("Display name")).toBeDisabled();
+ expect(screen.getByRole("radio", { name: "Text" })).toBeDisabled();
+ expect(screen.getByRole("switch", { name: /Required/ })).toBeDisabled();
+
+ await userEvent.click(screen.getByRole("switch", { name: /Show field/ }));
+
+ const request = await fetchMock.callHistory
+ .lastCall("action-2-put")
+ ?.request?.json();
+ expect(request).toEqual({
+ id: 2,
+ visualization_settings: expect.objectContaining({
+ fields: {
+ email: expect.objectContaining({ id: "email", hidden: true }),
+ },
+ }),
+ });
+ });
+
it("should let a user who can edit the action change every field setting", async () => {
setup({
action: createMockQueryAction({
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx
index 19632ef8253..237142c8bb0 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx
@@ -1,3 +1,4 @@
+import { useDisclosure } from "@mantine/hooks";
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
@@ -7,6 +8,7 @@ import {
type CollectionRowModalState,
} from "metabase/common/collections/components/CollectionRowModal";
import { ForwardRefLink } from "metabase/common/components/Link";
+import type { OmniPickerTableItem } from "metabase/common/components/Pickers";
import { getUserIsAdmin } from "metabase/current-user";
import { LibraryTreePage } from "metabase/data-studio/common/components/LibraryTreePage";
import { useErrorHandling } from "metabase/data-studio/common/hooks/use-error-handling";
@@ -18,9 +20,11 @@ import {
} from "metabase/data-studio/common/utils";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
+import { useNavigate } from "metabase/router";
import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
import * as Urls from "metabase/urls";
+import { ImplicitActionTablePickerModal } from "../../components/ImplicitActionTablePickerModal";
import {
ACTION_COLLECTION_NAMESPACES,
ACTION_COLLECTION_PICKER_OPTIONS,
@@ -109,6 +113,9 @@ function ActionRowMenu({ item: { data }, onOpenModal }: ActionRowMenuProps) {
function ActionsCreateMenu() {
const dispatch = useDispatch();
+ const navigate = useNavigate();
+ const [isPickerOpened, { open: openPicker, close: closePicker }] =
+ useDisclosure();
const handleNewCollectionClick = useCallback(() => {
dispatch(
@@ -120,26 +127,50 @@ function ActionsCreateMenu() {
);
}, [dispatch]);
+ const handleTableChange = useCallback(
+ (table: OmniPickerTableItem) => {
+ closePicker();
+ navigate(Urls.newDataStudioImplicitAction(table.id));
+ },
+ [closePicker, navigate],
+ );
+
return (
- <Menu position="bottom-end">
- <Menu.Target>
- <Button size="lg" leftSection={<Icon name="add" />}>{t`New`}</Button>
- </Menu.Target>
- <Menu.Dropdown>
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioAction()}
- leftSection={<FixedSizeIcon name="bolt" />}
- >
- {t`Action`}
- </Menu.Item>
- <Menu.Item
- leftSection={<FixedSizeIcon name="folder" />}
- onClick={handleNewCollectionClick}
- >
- {t`Collection`}
- </Menu.Item>
- </Menu.Dropdown>
- </Menu>
+ <>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button size="lg" leftSection={<Icon name="add" />}>{t`New`}</Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Label>{t`Create your action with…`}</Menu.Label>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="table2" />}
+ onClick={openPicker}
+ >
+ {t`Table`}
+ </Menu.Item>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioAction()}
+ leftSection={<FixedSizeIcon name="sql" />}
+ >
+ {t`SQL query`}
+ </Menu.Item>
+ <Menu.Divider />
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="folder" />}
+ onClick={handleNewCollectionClick}
+ >
+ {t`Collection`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ {isPickerOpened && (
+ <ImplicitActionTablePickerModal
+ onChange={handleTableChange}
+ onClose={closePicker}
+ />
+ )}
+ </>
);
}
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx
index d307a29b2ef..13990d6428e 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx
@@ -3,6 +3,8 @@ import userEvent from "@testing-library/user-event";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import {
setupActionsEndpoints,
+ setupCollectionByIdEndpoint,
+ setupCollectionItemsEndpoint,
setupCollectionsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
@@ -100,7 +102,21 @@ describe("ActionListPage", () => {
expect(
screen.getAllByRole("menuitem").map((item) => item.textContent),
- ).toEqual(["Action", "Collection"]);
+ ).toEqual(["Table", "SQL query", "Collection"]);
+ });
+
+ it("opens a table picker to create an action from a table", async () => {
+ setup({});
+ const collection = createMockCollection({ id: 1 });
+ setupCollectionByIdEndpoint({ collections: [collection] });
+ setupCollectionItemsEndpoint({ collection, collectionItems: [] });
+
+ await userEvent.click(await screen.findByRole("button", { name: /New/ }));
+ await userEvent.click(screen.getByRole("menuitem", { name: /Table/ }));
+
+ expect(
+ await screen.findByText("Pick a table for the action"),
+ ).toBeInTheDocument();
});
it("does not offer non-admins to create anything", async () => {
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/index.ts
deleted file mode 100644
index 54cd84a4917..00000000000
--- a/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ActionQueryPage } from "./ActionQueryPage";
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
index acfb23a6588..fa8bd292ea8 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
@@ -27,7 +27,7 @@ import {
Tooltip,
} from "metabase/ui";
import * as Urls from "metabase/urls";
-import type { WritebackQueryAction } from "metabase-types/api";
+import type { WritebackAction } from "metabase-types/api";
import { ActionHeader } from "../../components/ActionHeader";
import { useActionDatabase } from "../../hooks/use-action-database";
@@ -80,12 +80,12 @@ export function ActionSettingsPage() {
}
type SectionProps = {
- action: WritebackQueryAction;
+ action: WritebackAction;
readOnly?: boolean;
};
type PublicSharingSectionProps = {
- action: WritebackQueryAction;
+ action: WritebackAction;
canMakePublic: boolean;
};
diff --git a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
index 0caed550da2..e68dc72dad8 100644
--- a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
@@ -65,7 +65,6 @@ export function CreateActionModal({
}: NewActionValues) => {
const action = await createAction({
...definition,
- type: "query",
name,
description: description || null,
collection_id,
diff --git a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
index b51eed21756..fc3fd6b480c 100644
--- a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
@@ -2,6 +2,7 @@ import { useDisclosure } from "@mantine/hooks";
import { useCallback, useMemo, useRef, useState } from "react";
import { t } from "ttag";
+import { useGetTableQueryMetadataQuery } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
@@ -14,21 +15,39 @@ import {
} from "metabase/common/data-studio/components/PaneHeader";
import { hasNativeWritePermissions } from "metabase/common/utils/database";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
-import { type Location, useNavigate } from "metabase/router";
+import { type Location, useNavigate, useSearchParams } from "metabase/router";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
import Question from "metabase-lib/v1/Question";
-import type { Database, WritebackAction } from "metabase-types/api";
+import type {
+ Database,
+ ImplicitActionKind,
+ TableId,
+ WritebackAction,
+} from "metabase-types/api";
-import { ActionEditor } from "../../components/ActionEditor";
-import { ActionEditorPane } from "../../components/ActionEditorPane";
+import { ImplicitActionDefinitionContent } from "../../components/ImplicitActionDefinitionContent";
+import { QueryActionEditor } from "../../components/QueryActionEditor";
+import { QueryActionEditorPane } from "../../components/QueryActionEditorPane";
import { ACTION_NAME_MAX_LENGTH } from "../../constants";
import { useActionDatabases } from "../../hooks/use-action-databases";
-import { useActionDraft } from "../../hooks/use-action-draft";
+import { useQueryActionDraft } from "../../hooks/use-query-action-draft";
+import { getImplicitActionName, hasSinglePrimaryKey } from "../../utils";
import { CreateActionModal } from "./CreateActionModal";
export function NewActionPage() {
+ const [searchParams] = useSearchParams();
+ const tableId = Urls.extractEntityId(searchParams.get("table") ?? undefined);
+
+ return tableId != null ? (
+ <NewImplicitActionPage key={tableId} initialTableId={tableId} />
+ ) : (
+ <NewQueryActionPage />
+ );
+}
+
+function NewQueryActionPage() {
const { databases, isLoading, error } = useActionDatabases();
const editableDatabases = useMemo(
() => databases.filter(hasNativeWritePermissions),
@@ -53,14 +72,14 @@ export function NewActionPage() {
);
}
- return <NewActionPageBody databases={editableDatabases} />;
+ return <NewQueryActionPageBody databases={editableDatabases} />;
}
-type NewActionPageBodyProps = {
+type NewQueryActionPageBodyProps = {
databases: Database[];
};
-function NewActionPageBody({ databases }: NewActionPageBodyProps) {
+function NewQueryActionPageBody({ databases }: NewQueryActionPageBodyProps) {
const initialDatasetQuery = useMemo(
() =>
Question.create({
@@ -69,7 +88,7 @@ function NewActionPageBody({ databases }: NewActionPageBodyProps) {
}).datasetQuery(),
[databases],
);
- const draft = useActionDraft({ initialDatasetQuery });
+ const draft = useQueryActionDraft({ initialDatasetQuery });
const [name, setName] = useState("");
const [uiState, setUiState] = useState(getInitialUiState);
const [isModalOpened, { open: openModal, close: closeModal }] =
@@ -117,15 +136,15 @@ function NewActionPageBody({ databases }: NewActionPageBodyProps) {
</DataStudioBreadcrumbs>
}
/>
- <ActionEditorPane>
- <ActionEditor
+ <QueryActionEditorPane>
+ <QueryActionEditor
datasetQuery={draft.datasetQuery}
uiState={uiState}
databases={databases}
onChangeDatasetQuery={draft.setDatasetQuery}
onChangeUiState={setUiState}
/>
- </ActionEditorPane>
+ </QueryActionEditorPane>
</PageContainer>
{isModalOpened && draft.definition != null && (
<CreateActionModal
@@ -143,3 +162,88 @@ function NewActionPageBody({ databases }: NewActionPageBodyProps) {
</>
);
}
+
+const DEFAULT_KIND: ImplicitActionKind = "row/create";
+
+type NewImplicitActionPageProps = {
+ initialTableId: TableId;
+};
+
+function NewImplicitActionPage({ initialTableId }: NewImplicitActionPageProps) {
+ const [tableId, setTableId] = useState(initialTableId);
+ const [kind, setKind] = useState(DEFAULT_KIND);
+ const [name, setName] = useState("");
+ const { currentData: table } = useGetTableQueryMetadataQuery({ id: tableId });
+ const [isModalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure();
+ const navigate = useNavigate();
+ const isSavedRef = useRef(false);
+ const defaultName =
+ table != null ? getImplicitActionName(kind, table.display_name) : "";
+ const isDirty =
+ name.trim().length > 0 ||
+ kind !== DEFAULT_KIND ||
+ tableId !== initialTableId;
+
+ const handleCreate = (action: WritebackAction) => {
+ isSavedRef.current = true;
+ navigate(Urls.dataStudioAction(action.id));
+ };
+
+ const isLocationAllowed = useCallback(
+ (location?: Location) => !location || isSavedRef.current,
+ [],
+ );
+
+ return (
+ <>
+ <PageContainer data-testid="new-implicit-action">
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={defaultName || t`New action`}
+ maxLength={ACTION_NAME_MAX_LENGTH}
+ isOptional
+ onChange={setName}
+ />
+ }
+ icon="bolt"
+ actions={
+ <PaneHeaderActions
+ isValid={table != null && hasSinglePrimaryKey(table)}
+ isDirty
+ onSave={openModal}
+ onCancel={() => navigate(Urls.dataStudioActions())}
+ />
+ }
+ breadcrumbs={
+ <DataStudioBreadcrumbs>
+ <Link to={Urls.dataStudioActions()}>{t`Data actions`}</Link>
+ {t`New action`}
+ </DataStudioBreadcrumbs>
+ }
+ />
+ <ImplicitActionDefinitionContent
+ tableId={tableId}
+ kind={kind}
+ onChangeTable={setTableId}
+ onChangeKind={setKind}
+ />
+ </PageContainer>
+ {isModalOpened && (
+ <CreateActionModal
+ definition={{ type: "implicit", kind, table_id: tableId }}
+ defaultName={name.trim() || defaultName}
+ defaultCollectionId={null}
+ onCreate={handleCreate}
+ onClose={closeModal}
+ />
+ )}
+ <LeaveRouteConfirmModal
+ isEnabled={isDirty}
+ isLocationAllowed={isLocationAllowed}
+ />
+ </>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.unit.spec.tsx
new file mode 100644
index 00000000000..2be9c3b9985
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.unit.spec.tsx
@@ -0,0 +1,136 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupActionsEndpoints,
+ setupCollectionsEndpoints,
+ setupDatabaseListEndpoint,
+ setupTableQueryMetadataEndpoint,
+ setupTableQueryMetadataEndpointError,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
+import { ROOT_COLLECTION } from "metabase/common/collections/constants";
+import { Route } from "metabase/router";
+import type { Table } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockDatabase,
+ createMockField,
+ createMockTable,
+} from "metabase-types/api/mocks";
+
+import { NewActionPage } from "./NewActionPage";
+
+const DATABASE = createMockDatabase({
+ id: 1,
+ name: "Shop",
+ native_permissions: "write",
+ settings: { "database-enable-actions": true },
+});
+
+const TABLE = createMockTable({
+ id: 10,
+ db_id: 1,
+ db: DATABASE,
+ schema: "public",
+ display_name: "Customers",
+ fields: [
+ createMockField({
+ id: 100,
+ table_id: 10,
+ name: "ID",
+ semantic_type: "type/PK",
+ }),
+ ],
+});
+
+type SetupOpts = {
+ table?: Table;
+ tableError?: string;
+};
+
+function setup({ table = TABLE, tableError }: SetupOpts = {}) {
+ if (tableError != null) {
+ setupTableQueryMetadataEndpointError(table.id, tableError);
+ } else {
+ setupTableQueryMetadataEndpoint(table);
+ }
+ setupDatabaseListEndpoint([DATABASE]);
+ setupActionsEndpoints([]);
+ setupCollectionsEndpoints({
+ collections: [],
+ rootCollection: createMockCollection({
+ ...ROOT_COLLECTION,
+ namespace: "data-actions",
+ }),
+ });
+
+ renderWithProviders(
+ <>
+ <Route path="/data-studio/actions/new" element={<NewActionPage />} />
+ <Route path="*" element={<div />} />
+ </>,
+ {
+ withRouter: true,
+ initialRoute: `/data-studio/actions/new?table=${table.id}`,
+ },
+ );
+}
+
+describe("NewActionPage", () => {
+ it("should open a table action that inserts into the picked table", async () => {
+ setup();
+
+ expect(await screen.findByText("Customers")).toBeInTheDocument();
+ expect(screen.getByRole("radio", { name: "Insert" })).toBeChecked();
+ expect(screen.getByPlaceholderText("Insert Customers")).toBeInTheDocument();
+ });
+
+ it("should create a table action with the picked operation", async () => {
+ setup();
+
+ await userEvent.click(await screen.findByRole("radio", { name: "Delete" }));
+ expect(
+ await screen.findByPlaceholderText("Delete Customers"),
+ ).toBeInTheDocument();
+
+ await userEvent.click(screen.getByRole("button", { name: "Save" }));
+ expect(await screen.findByLabelText("Name")).toHaveValue(
+ "Delete Customers",
+ );
+ await userEvent.click(
+ within(screen.getByRole("dialog")).getByRole("button", { name: "Save" }),
+ );
+
+ await waitFor(() =>
+ expect(
+ JSON.parse(
+ String(fetchMock.callHistory.lastCall("action-post")?.options?.body),
+ ),
+ ).toMatchObject({
+ type: "implicit",
+ kind: "row/delete",
+ table_id: TABLE.id,
+ name: "Delete Customers",
+ }),
+ );
+ });
+
+ it("should not save an action for a table without a single primary key", async () => {
+ setup({ table: createMockTable({ ...TABLE, fields: [] }) });
+
+ expect(
+ await screen.findByText(
+ "Actions can only write to a table with exactly one primary key.",
+ ),
+ ).toBeInTheDocument();
+ expect(screen.getByRole("button", { name: "Save" })).toBeDisabled();
+ });
+
+ it("should say why the table can't be loaded", async () => {
+ setup({ tableError: "Table not found" });
+
+ expect(await screen.findByText("Table not found")).toBeInTheDocument();
+ expect(screen.getByRole("button", { name: "Save" })).toBeDisabled();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/actions/routes.tsx b/frontend/src/metabase/data-studio/actions/routes.tsx
index 3a02e078229..a9b33331f8f 100644
--- a/frontend/src/metabase/data-studio/actions/routes.tsx
+++ b/frontend/src/metabase/data-studio/actions/routes.tsx
@@ -25,9 +25,9 @@ const newActionPage = () =>
);
const actionQueryPage = () =>
- import(/* webpackChunkName: "data-actions" */ "./pages/ActionQueryPage").then(
- ({ ActionQueryPage }) => ({ Component: ActionQueryPage }),
- );
+ import(
+ /* webpackChunkName: "data-actions" */ "./pages/ActionDefinitionPage"
+ ).then(({ ActionDefinitionPage }) => ({ Component: ActionDefinitionPage }));
const actionFieldsPage = () =>
import(
diff --git a/frontend/src/metabase/data-studio/actions/utils.ts b/frontend/src/metabase/data-studio/actions/utils.ts
index 6161dcf7d80..799c01202c7 100644
--- a/frontend/src/metabase/data-studio/actions/utils.ts
+++ b/frontend/src/metabase/data-studio/actions/utils.ts
@@ -1,3 +1,6 @@
+import { match } from "ts-pattern";
+import { c, t } from "ttag";
+
import { getInputTypes } from "metabase/actions/constants";
import {
getDefaultFieldSettings,
@@ -9,26 +12,82 @@ import {
} from "metabase/common/utils/database";
import * as Lib from "metabase-lib";
import { getTemplateTagParameters } from "metabase-lib/v1/parameters/utils/template-tags";
+import { isPK } from "metabase-lib/v1/types/utils/isa";
import type {
ActionFormSettings,
- CreateActionRequest,
+ CreateQueryActionRequest,
Database,
FieldSettings,
FieldType,
FieldValueOptions,
+ ImplicitActionKind,
+ Table,
+ TableId,
TemplateTag,
TemplateTagType,
WritebackAction,
WritebackParameter,
} from "metabase-types/api";
-export type ActionDefinition = Required<
+export type QueryActionDefinition = Required<
Pick<
- CreateActionRequest,
- "database_id" | "dataset_query" | "parameters" | "visualization_settings"
+ CreateQueryActionRequest,
+ "type" | "dataset_query" | "parameters" | "visualization_settings"
>
>;
+export type ImplicitActionDefinition = {
+ type: "implicit";
+ kind: ImplicitActionKind;
+ table_id: TableId;
+};
+
+export type ActionDefinition = QueryActionDefinition | ImplicitActionDefinition;
+
+export type ImplicitActionKindOption = {
+ value: ImplicitActionKind;
+ label: string;
+ description: string;
+};
+
+export function getImplicitActionKindOptions(): ImplicitActionKindOption[] {
+ return [
+ {
+ value: "row/create",
+ label: t`Insert`,
+ description: t`Adds a new row. The form asks for every column the database does not fill in.`,
+ },
+ {
+ value: "row/update",
+ label: t`Update`,
+ description: t`Changes one row, found by its primary key. Empty fields keep their value.`,
+ },
+ {
+ value: "row/delete",
+ label: t`Delete`,
+ description: t`Removes one row, found by its primary key.`,
+ },
+ ];
+}
+
+export function getImplicitActionKindOption(
+ kind: ImplicitActionKind,
+): ImplicitActionKindOption {
+ const options = getImplicitActionKindOptions();
+ return options.find((option) => option.value === kind) ?? options[0];
+}
+
+export function getImplicitActionName(
+ kind: ImplicitActionKind,
+ tableName: string,
+) {
+ return match(kind)
+ .with("row/create", () => c("{0} is a table name").t`Insert ${tableName}`)
+ .with("row/update", () => c("{0} is a table name").t`Update ${tableName}`)
+ .with("row/delete", () => c("{0} is a table name").t`Delete ${tableName}`)
+ .exhaustive();
+}
+
const TAG_TYPE_BY_FIELD_TYPE: Record<FieldType, TemplateTagType> = {
string: "text",
number: "number",
@@ -129,16 +188,15 @@ export function setTemplateTagFieldType(
return Lib.withTemplateTags(query, tags);
}
-export function getActionDefinition(
+export function getQueryActionDefinition(
query: Lib.Query,
formSettings: ActionFormSettings,
-): ActionDefinition | null {
- const databaseId = Lib.databaseID(query);
- if (databaseId == null) {
+): QueryActionDefinition | null {
+ if (Lib.databaseID(query) == null) {
return null;
}
return {
- database_id: databaseId,
+ type: "query",
dataset_query: Lib.toJsQuery(query),
parameters: getQueryParameters(query),
visualization_settings: getFieldSettingsFromQuery(query, formSettings),
@@ -202,3 +260,7 @@ export function getFieldSettingsForFieldType(
defaultValue: cleanFieldValue(fieldSettings.defaultValue, fieldType),
};
}
+
+export function hasSinglePrimaryKey(table: Table): boolean {
+ return (table.fields ?? []).filter(isPK).length === 1;
+}
diff --git a/frontend/src/metabase/querying/action-creator/QueryActionContextProvider/QueryActionContextProvider.tsx b/frontend/src/metabase/querying/action-creator/QueryActionContextProvider/QueryActionContextProvider.tsx
index 75835a6324c..2db8d4dd543 100644
--- a/frontend/src/metabase/querying/action-creator/QueryActionContextProvider/QueryActionContextProvider.tsx
+++ b/frontend/src/metabase/querying/action-creator/QueryActionContextProvider/QueryActionContextProvider.tsx
@@ -55,8 +55,6 @@ function convertQuestionToAction(
// Unjustified type cast. FIXME
dataset_query: cleanQuestion.datasetQuery() as NativeDatasetQuery,
// Unjustified type cast. FIXME
- database_id: question.databaseId() as DatabaseId,
- // Unjustified type cast. FIXME
parameters: parameters as WritebackParameter[],
visualization_settings: formSettings,
};
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
index 79e378ab1b0..ec853743d3c 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
@@ -8,14 +8,17 @@ import {
useUpdateTransformMutation,
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
+import {
+ TablePath,
+ TablePathItem,
+} from "metabase/common/data-studio/components/TablePath";
import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useMetadataToasts } from "metabase/common/hooks";
-import CS from "metabase/css/core/index.css";
import { UserInput } from "metabase/metadata/components";
import { TransformOwnerAvatar } from "metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar";
import { Button, Divider, Group, Icon, Loader, Stack, Text } from "metabase/ui";
import * as Urls from "metabase/urls";
-import type { IconName, Transform, UserId } from "metabase-types/api";
+import type { Transform, UserId } from "metabase-types/api";
import { isTransformRunning, sourceDatabaseId } from "../../../utils";
@@ -99,88 +102,45 @@ function TargetInfo({ transform }: TargetInfoProps) {
);
return (
- <Group gap="sm">
+ <TablePath>
{database != null && (
- <>
- <TargetItemLink
- label={database.name}
- icon="database"
- to={Urls.dataModel({ databaseId: database.id })}
- data-testid="database-link"
- />
- <TargetItemDivider />
- </>
+ <TablePathItem
+ label={database.name}
+ icon="database"
+ to={Urls.dataModel({ databaseId: database.id })}
+ data-testid="database-link"
+ />
)}
{database != null && target.schema !== null && (
- <>
- <TargetItemLink
- label={target.schema}
- icon="folder"
- to={
- table || targetSchemaExists
- ? Urls.dataModel({
- databaseId: database.id,
- schemaName: target.schema,
- })
- : undefined
- }
- tooltip={
- table?.schema != null || targetSchemaExists
- ? undefined
- : t`This schema will be created when the transform runs`
- }
- data-testid="schema-link"
- />
- <TargetItemDivider />
- </>
- )}
- <Group gap="xxs">
- <TargetItemLink
- label={target.name}
- icon="table2"
- to={table ? Urls.queryBuilderTable(table.id, table.db_id) : undefined}
- data-testid="table-link"
+ <TablePathItem
+ label={target.schema}
+ icon="folder"
+ to={
+ table || targetSchemaExists
+ ? Urls.dataModel({
+ databaseId: database.id,
+ schemaName: target.schema,
+ })
+ : undefined
+ }
+ tooltip={
+ table?.schema != null || targetSchemaExists
+ ? undefined
+ : t`This schema will be created when the transform runs`
+ }
+ data-testid="schema-link"
/>
- </Group>
- </Group>
- );
-}
-
-type TargetItemLinkProps = {
- label: string;
- icon: IconName;
- to?: string;
- tooltip?: string;
- "data-testid"?: string;
-};
-
-function TargetItemLink({
- label,
- icon,
- to,
- tooltip,
- "data-testid": dataTestId,
-}: TargetItemLinkProps) {
- return (
- <Link
- className={CS.link}
- to={to ?? ""}
- disabled={to == null}
- data-testid={dataTestId}
- tooltip={tooltip}
- >
- <Group gap="xxs">
- <Icon name={icon} />
- <Text c="inherit">{label}</Text>
- </Group>
- </Link>
+ )}
+ <TablePathItem
+ label={target.name}
+ icon="table2"
+ to={table ? Urls.queryBuilderTable(table.id, table.db_id) : undefined}
+ data-testid="table-link"
+ />
+ </TablePath>
);
}
-function TargetItemDivider() {
- return <Icon name="chevronright" size={8} />;
-}
-
type EditTargetButtonProps = {
transform: Transform;
};
diff --git a/frontend/src/metabase/urls/data-studio.ts b/frontend/src/metabase/urls/data-studio.ts
index 7f5d02190b7..a00b93ac025 100644
--- a/frontend/src/metabase/urls/data-studio.ts
+++ b/frontend/src/metabase/urls/data-studio.ts
@@ -425,6 +425,10 @@ export function newDataStudioAction() {
return `${dataStudioActions()}/new`;
}
+export function newDataStudioImplicitAction(tableId: TableId) {
+ return `${newDataStudioAction()}?table=${tableId}`;
+}
+
export function dataStudioArchivedActions() {
return `${dataStudioActions()}/archived`;
}
diff --git a/resources/migrations/065/20261023_implicit_action_table_id.yaml b/resources/migrations/065/20261023_implicit_action_table_id.yaml
new file mode 100644
index 00000000000..ced405e09dd
--- /dev/null
+++ b/resources/migrations/065/20261023_implicit_action_table_id.yaml
@@ -0,0 +1,41 @@
+## An implicit action writes to one table. An action without a model stores it here; an action of a model leaves it
+## empty and reads its model's table when it runs.
+
+databaseChangeLog:
+ - changeSet:
+ id: v65.2026-10-23T00:00:00
+ author: ranquild
+ comment: Add implicit_action.table_id
+ changes:
+ - addColumn:
+ tableName: implicit_action
+ columns:
+ - column:
+ name: table_id
+ type: int
+ remarks: The table the implicit action writes to
+
+ - changeSet:
+ id: v65.2026-10-23T00:00:02
+ author: ranquild
+ comment: Index implicit_action.table_id
+ changes:
+ - createIndex:
+ tableName: implicit_action
+ indexName: idx_implicit_action_table_id
+ columns:
+ - column:
+ name: table_id
+
+ - changeSet:
+ id: v65.2026-10-23T00:00:03
+ author: ranquild
+ comment: Add a foreign key from implicit_action.table_id to metabase_table
+ changes:
+ - addForeignKeyConstraint:
+ baseTableName: implicit_action
+ baseColumnNames: table_id
+ referencedTableName: metabase_table
+ referencedColumnNames: id
+ constraintName: fk_implicit_action_table_id
+ onDelete: CASCADE
diff --git a/src/metabase/actions/actions.clj b/src/metabase/actions/actions.clj
index 7f8afb5aaf1..793446c4b1a 100644
--- a/src/metabase/actions/actions.clj
+++ b/src/metabase/actions/actions.clj
@@ -279,7 +279,8 @@
[:user-id {:optional true} [:maybe ms/PositiveInt]]
[:action-id {:optional true} [:maybe ms/PositiveInt]]
[:dashboard-id {:optional true} [:maybe ms/PositiveInt]]
- [:context {:optional true} [:maybe [:enum :action-execute :public-action-execute]]]])
+ [:context {:optional true} [:maybe [:enum :action-execute :public-action-execute]]]
+ [:check-access {:optional true} [:maybe [:=> [:cat] :any]]]])
;; TODO rename this to just perform-action! and rename the legacy entry point to clearly deprecate it.
(mu/defn perform-action-v2!
@@ -291,7 +292,7 @@
arg-map-or-maps :- [:or ::actions.args/any-arg-map [:sequential ::actions.args/any-arg-map]]
;; `action-id`, `dashboard-id` and `audit-context` are attribution for the audit row; the scope maps are closed
;; schemas, so they ride along as kwargs instead.
- & {:keys [policy existing-context user-id action-id dashboard-id]
+ & {:keys [policy existing-context user-id action-id dashboard-id check-access]
audit-context :context}
:- [:maybe PerformActionOpts]]
(when (and existing-context user-id)
@@ -363,6 +364,7 @@
:scope (actions.scope/normalize-scope scope)}
:inputs arg-maps}
(fn [{:keys [outputs]}] {:result_rows (count outputs)})
+ (some-> check-access (apply []))
(check-permissions policy arg-maps)
(if-not driver
(perform-action-internal! action-kw context arg-maps)
diff --git a/src/metabase/actions/core.clj b/src/metabase/actions/core.clj
index 9af2c735fdc..d73339a2514 100644
--- a/src/metabase/actions/core.clj
+++ b/src/metabase/actions/core.clj
@@ -54,6 +54,7 @@
fetch-values]
[metabase.actions.models
check-action-databases-enabled
+ check-implicit-action-table-pk
check-implicit-actions-supported
dashcard->action
insert!
diff --git a/src/metabase/actions/db.clj b/src/metabase/actions/db.clj
index 7c9424d9ae3..0067cffe317 100644
--- a/src/metabase/actions/db.clj
+++ b/src/metabase/actions/db.clj
@@ -11,14 +11,17 @@
[toucan2.core :as t2]))
(defn- action-database-joins
- "The joins from `action` to the Database `db` of its query, or of its model Card for an implicit action."
+ "The joins from `action` to the Database `db` of its query, or for an implicit action of its model Card or its table."
[]
- [[(t2/table-name :model/QueryAction) :qa] [:= :qa.action_id :action.id]
- [(t2/table-name :model/Card) :card] [:and [:= :card.id :action.model_id] [:= :action.type "implicit"]]
- [(t2/table-name :model/Database) :db] [:= :db.id [:coalesce :qa.database_id :card.database_id]]])
+ [[(t2/table-name :model/QueryAction) :qa] [:= :qa.action_id :action.id]
+ [(t2/table-name :model/Card) :card] [:and [:= :card.id :action.model_id] [:= :action.type "implicit"]]
+ [(t2/table-name :model/ImplicitAction) :ia] [:= :ia.action_id :action.id]
+ [(t2/table-name :model/Table) :tbl] [:= :tbl.id :ia.table_id]
+ [(t2/table-name :model/Database) :db] [:= :db.id [:coalesce :qa.database_id :card.database_id :tbl.db_id]]])
(mu/defn database-for-action
- "The Database the Action with `action-id` runs against: its query's, or its model's for an implicit action, or nil."
+ "The Database the Action with `action-id` runs against: its query's, or its model's or table's for an implicit action,
+ or nil."
[action-id :- ::lib.schema.id/action]
(t2/select-one :model/Database {:select [:db.*]
:from [[(t2/table-name :model/Action) :action]]
@@ -192,6 +195,22 @@
[action-id :- ::lib.schema.id/action]
(t2/select-one :model/QueryAction :action_id action-id))
+(mu/defn implicit-action-table-id
+ "The Table id of the ImplicitAction of the Action with `action-id`, or nil."
+ [action-id :- ::lib.schema.id/action]
+ (t2/select-one-fn :table_id [:model/ImplicitAction :table_id] :action_id action-id))
+
+(mu/defn table-published? :- :boolean
+ "Whether the Table with `table-id` is published to the Library."
+ [table-id :- ::lib.schema.id/table]
+ (some? (t2/select-one-fn :id [:model/Table :id] :id table-id :is_published true
+ {:from [(warehouse-schema-overlay/table-query)]})))
+
+(mu/defn tables-with-fields
+ "The Tables with `table-ids`, with their Fields hydrated."
+ [table-ids :- [:sequential ::lib.schema.id/table]]
+ (t2/hydrate (tables table-ids) :fields))
+
(mu/defn implicit-actions
"The ImplicitActions of the Actions with `action-ids`."
[action-ids :- [:sequential ::lib.schema.id/action]]
diff --git a/src/metabase/actions/execution.clj b/src/metabase/actions/execution.clj
index eb1c678fab3..e59065797a1 100644
--- a/src/metabase/actions/execution.clj
+++ b/src/metabase/actions/execution.clj
@@ -27,8 +27,7 @@
[metabase.util.i18n :refer [tru]]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
- [metabase.util.malli.schema :as ms]
- [toucan2.core :as t2]))
+ [metabase.util.malli.schema :as ms]))
(def ^:private RequestParameters
"Parameters as passed in from an endpoint, of shape `{<parameter-id> <value>}`."
@@ -92,10 +91,12 @@
e)))))))
(mu/defn- implicit-action-table
- [card-id :- ::lib.schema.id/card]
- (let [query (actions.db/card-query card-id)
- {:keys [table-id]} (query/query->database-and-table-ids query)]
- (t2/hydrate (actions.db/table table-id) :fields)))
+ "The Table, with its Fields, that the implicit `action` writes to: its model's source Table when it has a model."
+ [{model-id :model_id, table-id :table_id} :- ::actions.schema/action]
+ (let [table-id (if model-id
+ (:table-id (query/query->database-and-table-ids (actions.db/card-query model-id)))
+ table-id)]
+ (first (when table-id (actions.db/tables-with-fields [table-id])))))
(defn- execute-custom-action! [action request-parameters opts]
(actions/check-actions-enabled action)
@@ -143,13 +144,16 @@
(mu/defn- build-implicit-query :- [:map
[:query ::mbql.s/Query]
[:row-parameters ::actions.args/row]
+ [:pk-column :string]
[:prefetch-parameters {:optional true} [:maybe ::parameters.schema/parameters]]]
- [{:keys [model_id parameters] :as _action} :- ::actions.schema/action
+ [{:keys [parameters] :as action} :- ::actions.schema/action
implicit-action :- ImplicitActionKind
request-parameters :- RequestParameters]
(let [{database-id :db_id
- table-id :id :as table} (implicit-action-table model_id)
- table-fields (:fields table)
+ table-id :id :as table} (implicit-action-table action)
+ table-fields (if (:model_id action)
+ (:fields table)
+ (action/table-action-fields table))
pk-fields (filterv #(isa? (:semantic_type %) :type/PK) table-fields)
slug->field-name (->> table-fields
(map (juxt (comp u/slugify :name) :name))
@@ -180,18 +184,16 @@
(cond-> {:query {:database database-id,
:type :query,
:query {:source-table table-id}}
- :row-parameters row-parameters}
+ :row-parameters row-parameters
+ :pk-column pk-field-name}
requires-pk?
(assoc-in [:query :query :filter]
[:= [:field (:id pk-field) nil] (get simple-parameters pk-field-name)])
requires-pk?
- (assoc :prefetch-parameters [{;; parameter ID here is not really important but let's generate something
- ;; consistent rather than random to make this easier to test
- :id "metabase.actions.execution/prefetch-parameters-pk"
+ (assoc :prefetch-parameters [{:id "metabase.actions.execution/prefetch-parameters-pk"
:target [:dimension [:field (:id pk-field) nil]]
- ;; :type/UUID derives from :type/Text, so UUIDs are handled as strings
:type (if (isa? (:base_type pk-field) :type/Number)
:number/=
:string/=)
@@ -201,11 +203,17 @@
(let [k (keyword (:kind action-instance))]
(legacy->current k k)))
+(defn- with-parameter-columns-only
+ "`result` of the implicit `action` with its `:created-row` limited to the primary key column `pk-column` and the
+ columns the action has parameters for, as its form and prefill are, which leaves out the sensitive columns."
+ [result {:keys [parameters]} pk-column]
+ (let [columns (into #{(u/slugify pk-column)} (map :id) parameters)]
+ (m/update-existing result :created-row #(m/filter-keys (comp columns u/slugify name) %))))
+
(defn- execute-implicit-action!
- [action request-parameters opts]
- (let [model-id (:model_id action)
- implicit-action (parse-implicit-action action)
- {:keys [query row-parameters]} (build-implicit-query action implicit-action request-parameters)
+ [{model-id :model_id, :as action} request-parameters opts]
+ (let [implicit-action (parse-implicit-action action)
+ {:keys [query row-parameters pk-column]} (build-implicit-query action implicit-action request-parameters)
_ (api/check (or (= implicit-action :model.row/delete) (seq row-parameters))
400
(tru "Implicit parameters must be provided."))
@@ -216,11 +224,15 @@
(= implicit-action :model.row/update)
(assoc :update-row row-parameters))]
(binding [qp.perms/*card-id* model-id]
- (actions/perform-action! implicit-action arg-map {:scope {:model-id model-id}
- :policy :model-action
- :action-id (:id action)
- :dashboard-id (:dashboard-id opts)
- :context (:context opts :action-execute)}))))
+ (-> (actions/perform-action! implicit-action arg-map {:scope (if model-id
+ {:model-id model-id}
+ {:table-id (:table_id action)})
+ :policy :model-action
+ :action-id (:id action)
+ :dashboard-id (:dashboard-id opts)
+ :context (:context opts :action-execute)
+ :check-access #(check-action-read-perms action)})
+ (with-parameter-columns-only action pk-column)))))
(mu/defn execute-action!
"Execute the given action with the given parameters of shape `{<parameter-id> <value>}."
@@ -279,17 +291,18 @@
(api/check (contains? #{:model.row/update :model.row/delete} (parse-implicit-action action))
400
(tru "Values can only be fetched for actions that require a Primary Key."))
+ (check-action-read-perms action)
(let [implicit-action (parse-implicit-action action)
- {:keys [prefetch-parameters]} (build-implicit-query action implicit-action request-parameters)
+ {:keys [query prefetch-parameters]} (build-implicit-query action implicit-action request-parameters)
info {:executed-by api/*current-user-id*
:context :action
:action-id (:id action)}
- card (actions.db/card (:model_id action))
- ;; prefilling a form with day old data would be bad
result (model-persistence/with-persisted-substituion-disabled
(qp/process-query
(qp/userland-query
- (qp.card/query-for-card card prefetch-parameters nil nil)
+ (if-let [model-id (:model_id action)]
+ (qp.card/query-for-card (actions.db/card model-id) prefetch-parameters nil nil)
+ query)
info)))
;; only expose values for fields that are not hidden
hidden-param-ids (keep #(when (:hidden %) (:id %))
diff --git a/src/metabase/actions/models.clj b/src/metabase/actions/models.clj
index 5bd936f4778..d66dbcf5bba 100644
--- a/src/metabase/actions/models.clj
+++ b/src/metabase/actions/models.clj
@@ -16,7 +16,6 @@
[metabase.permissions.core :as perms]
[metabase.public-sharing.core :as public-sharing]
[metabase.queries.models.query :as query]
- [metabase.queries.schema :as queries.schema]
[metabase.remote-sync.core :as remote-sync]
[metabase.search.core :as search]
[metabase.util :as u]
@@ -51,6 +50,8 @@
(derive :hook/search-index)
(derive :hook/dependencies))
+(derive :model/ImplicitAction :hook/dependencies)
+
(methodical/defmethod t2/primary-keys :model/QueryAction [_model] [:action_id])
(methodical/defmethod t2/primary-keys :model/ImplicitAction [_model] [:action_id])
@@ -105,7 +106,8 @@
"Throws a 400 when `action` is implicit and its model's query does not support implicit actions."
[{model-id :model_id, :as action}]
(when (and (implicit? action)
- (not (query/supports-implicit-actions? (some-> model-id actions.db/card-query))))
+ model-id
+ (not (query/supports-implicit-actions? (actions.db/card-query model-id))))
(throw (ex-info (tru "Implicit actions are not supported for models with clauses.")
{:status-code 400}))))
@@ -141,10 +143,18 @@
(collection/check-allowed-content :action collection-id)
(check-model-less-collection action))
+(defn- model-collection-error
+ "The 400 for an action of a model put in a Collection other than its model's."
+ []
+ (ex-info (tru "A model''s action goes in the model''s collection.") {:status-code 400}))
+
(defn- set-model-collection
- "`action` with the `:collection_id` of its model Card."
- [{model-id :model_id, :as action}]
- (assoc action :collection_id (actions.db/card-collection-id model-id)))
+ "`action` with the `:collection_id` of its model Card; throws a 400 when it is given another Collection."
+ [{model-id :model_id, collection-id :collection_id, :as action}]
+ (let [model-collection-id (actions.db/card-collection-id model-id)]
+ (when (and (some? collection-id) (not= collection-id model-collection-id))
+ (throw (model-collection-error)))
+ (assoc action :collection_id model-collection-id)))
(defn- query-card-ids
"The IDs of the Cards the native `query` reads through card template tags."
@@ -175,12 +185,12 @@
(str/join ", " (sort outside)))))))))
(defn- check-data-app-action
- "Throws unless `action`, when it is in a data app's collection, is a query action of no model that is neither
- archived nor public and whose parameters take no values from a card."
+ "Throws unless `action`, when it is in a data app's collection, is a query or implicit action of no model that is
+ neither archived nor public and whose parameters take no values from a card."
[{collection-id :collection_id, :as action}]
(when (and (some? collection-id) (perms/data-app-collection? collection-id))
- (when (or (not= :query (keyword (:type action))) (:model_id action))
- (throw (data-app-action-error (tru "An action in a data app''s collection must be a query action of no model."))))
+ (when (or (not (#{:query :implicit} (keyword (:type action)))) (:model_id action))
+ (throw (data-app-action-error (tru "An action in a data app''s collection must be a query or implicit action of no model."))))
(when (:archived action)
(throw (data-app-action-error (tru "An action in a data app''s collection can''t be archived."))))
(when (:public_uuid action)
@@ -188,11 +198,22 @@
(when (some #(= "card" (some-> (:values_source_type %) name)) (:parameters action))
(throw (data-app-action-error (tru "An action in a data app''s collection can''t take a parameter''s values from a card."))))))
+(defn- check-data-app-action-table
+ "Throws when an implicit action in the Collection with `collection-id`, a data app's, writes to the Table with
+ `table-id` while that table is not published to the Library; a load skips this, as it may publish the table later."
+ [collection-id table-id]
+ (when (and (some? collection-id)
+ (some? table-id)
+ (not mi/*deserializing?*)
+ (perms/data-app-collection? collection-id)
+ (not (actions.db/table-published? table-id)))
+ (throw (data-app-action-error (tru "An implicit action in a data app''s collection can write only to a table published to the Library.")))))
+
(t2/define-before-insert :model/Action
[{model-id :model_id, :as action}]
(u/prog1 (cond-> (public-sharing/add-public-uuid-prefix action)
model-id set-model-collection)
- (when (implicit? action)
+ (when (and (implicit? action) model-id)
(check-implicit-action-model model-id))
(check-collection-content <>)
(check-data-app-action <>)))
@@ -200,21 +221,28 @@
(t2/define-before-update :model/Action
[{model-id :model_id, :as action}]
(let [changed? (fn [k] (contains? (t2/changes action) k))]
- (u/prog1 (cond-> (public-sharing/add-public-uuid-prefix-if-changed action)
- (and model-id (changed? :model_id))
- set-model-collection)
- (when (and (implicit? action) (or (changed? :type) (changed? :model_id)))
+ (when (and (changed? :model_id) (not mi/*deserializing?*))
+ (throw (ex-info (tru "An action''s model can''t be changed.") {:status-code 400})))
+ (when (and model-id
+ (changed? :collection_id)
+ (not= (:collection_id action) (actions.db/card-collection-id model-id)))
+ (throw (model-collection-error)))
+ (u/prog1 (public-sharing/add-public-uuid-prefix-if-changed action)
+ (when (and (implicit? action) model-id (changed? :type))
(check-implicit-action-model model-id)
(check-implicit-actions-supported action))
- (when (some #(contains? (t2/changes <>) %) [:collection_id :model_id])
+ (when (contains? (t2/changes <>) :collection_id)
(check-collection-content <>))
- (when (some #(contains? (t2/changes <>) %) [:collection_id :model_id :type :archived :public_uuid :parameters])
+ (when (some #(contains? (t2/changes <>) %) [:collection_id :type :archived :public_uuid :parameters])
(check-data-app-action <>))
(when (contains? (t2/changes <>) :collection_id)
- (check-data-app-action-query (:collection_id <>) (:dataset_query (actions.db/query-action (:id <>))))))))
+ (check-data-app-action-query (:collection_id <>) (:dataset_query (actions.db/query-action (:id <>))))
+ (when (implicit? <>)
+ (check-data-app-action-table (:collection_id <>) (actions.db/implicit-action-table-id (:id <>))))))))
(defn- set-query-database
- "`query-action` with the `:database_id` of its query, when it has one."
+ "`query-action` with the `:database_id` of its query, when it has one, as a row copied whole may hold its query
+ undecoded."
[{query :dataset_query, :as query-action}]
(if-let [database-id (when (map? query) (:database query))]
(assoc query-action :database_id database-id)
@@ -231,19 +259,61 @@
(when (contains? (t2/changes query-action) :dataset_query)
(check-data-app-action-query (actions.db/action-collection-id (:action_id <>)) (:dataset_query <>)))))
+(defn- check-implicit-action-table
+ "Throws a 400 unless `implicit-action` has a Table exactly when its Action has no model, as an action of a model writes
+ to the table its model reads when it runs."
+ [{table-id :table_id, action-id :action_id}]
+ (if (actions.db/action-model-id action-id)
+ (when (some? table-id)
+ (throw (ex-info (tru "An action of a model writes to the model''s table, so it can''t be given one.")
+ {:status-code 400})))
+ (when (nil? table-id)
+ (throw (ex-info (tru "An implicit action needs a table.") {:status-code 400})))))
+
+(defn table-action-fields
+ "The fields of `table` that an implicit action without a model uses, those a new model on it returns, which leaves out
+ sensitive and retired fields."
+ [table]
+ (remove #(#{:sensitive :retired} (keyword (:visibility_type %))) (:fields table)))
+
+(defn check-implicit-action-table-pk
+ "Throws a 400 when `action` is an implicit action without a model whose Table lacks exactly one usable primary key,
+ which the API checks rather than a hook as a load can bring the table's fields after the action."
+ [{model-id :model_id, table-id :table_id, :as action}]
+ (when (and (implicit? action) (nil? model-id) table-id)
+ (let [fields (table-action-fields (first (actions.db/tables-with-fields [table-id])))]
+ (when-not (= 1 (count (filter #(isa? (:semantic_type %) :type/PK) fields)))
+ (throw (ex-info (tru "An implicit action needs a table with exactly one primary key.") {:status-code 400}))))))
+
+(defn- check-model-less-implicit-action-table
+ "Throws a 400 when the Table of `implicit-action`, an action without a model, is not published to the Library while
+ the action is in a data app's collection."
+ [{table-id :table_id, action-id :action_id}]
+ (when table-id
+ (check-data-app-action-table (actions.db/action-collection-id action-id) table-id)))
+
+(t2/define-before-update :model/ImplicitAction
+ [implicit-action]
+ (u/prog1 implicit-action
+ (when (contains? (t2/changes implicit-action) :table_id)
+ (check-implicit-action-table implicit-action)
+ (check-model-less-implicit-action-table implicit-action))))
+
(t2/define-before-insert :model/ImplicitAction
[implicit-action]
(u/prog1 implicit-action
- (when-let [collection-id (actions.db/action-collection-id (:action_id implicit-action))]
- (when (perms/data-app-collection? collection-id)
- (throw (data-app-action-error (tru "An action in a data app''s collection is a query action, so it can''t have an implicit action.")))))))
+ (check-implicit-action-table implicit-action)
+ (check-model-less-implicit-action-table implicit-action)))
(defn- action-database-ids
- "The ids of the Databases `action` runs against: its query's, or its model's for an implicit action."
- [{model-id :model_id, query :dataset_query, :keys [database_id], :as action}]
+ "The ids of the Databases `action` runs against: its query's, or for an implicit action its model's or its table's."
+ [{model-id :model_id, action-id :id, table-id :table_id, query :dataset_query, :as action}]
(case (keyword (:type action))
- :implicit [(:database_id (actions.db/card-scope-columns model-id))]
- :query [(or (:database query) database_id)]
+ :implicit [(if model-id
+ (:database_id (actions.db/card-scope-columns model-id))
+ (some-> (or table-id (some-> action-id actions.db/implicit-action-table-id))
+ actions.db/table-database-id))]
+ :query [(:database query)]
[]))
(defn check-action-databases-enabled
@@ -332,8 +402,7 @@
(mu/defn- update*!
[{:keys [id] :as updates} :- ::actions.schema/action.for-update
existing-action :- ::actions.schema/action]
- (let [updates (cond-> (assoc updates :type (or (:type updates) (:type existing-action)))
- (get updates :model_id (:model_id existing-action)) (dissoc :collection_id))]
+ (let [updates (assoc updates :type (or (:type updates) (:type existing-action)))]
(t2/with-transaction [_conn]
;; the query row first: a move into a data app's collection checks the query the action then holds
(when-let [type-row (not-empty (cond-> (apply dissoc updates :id action-columns)
@@ -384,7 +453,7 @@
(map (fn [action]
(let [implicit-action (get implicit-actions-by-action-id (:id action))]
(merge action
- (select-keys implicit-action [:kind]))))
+ (select-keys implicit-action [:kind :table_id]))))
actions))))
(defn- select-actions-matching-options
@@ -422,59 +491,70 @@
[fields]
(empty? (m/filter-vals #(not= % 1) (frequencies (map (comp u/slugify :name) fields)))))
-(defn- implicit-action-parameters
- "Returns a map of card-id -> implicit-parameters for the given models"
+(defn- field-implicit-parameter
+ "The parameter of an implicit action for writing `field`."
+ [field]
+ {:id (u/slugify (:name field))
+ :display-name (:display_name field)
+ :target [:variable [:template-tag (u/slugify (:name field))]]
+ :type (condp #(isa? %2 %1) (:base_type field)
+ :type/Number :number
+ :type/Temporal :date
+ :type/Boolean :boolean
+ :text)
+ :required (:database_required field)
+ :is-auto-increment (:database_is_auto_increment field)
+ ::field-id (:id field)
+ ::pk? (isa? (:semantic_type field) :type/PK)})
+
+(def ^:private unwritable-field?
+ "Whether an implicit action can't write `field`: an unfolded JSON field, a structured or JSON parent field, or a field of
+ an unknown type."
+ (some-fn :nfc_path
+ (comp #(isa? % :type/Structured) :effective_type)
+ (comp #{:type/*} :effective_type)))
+
+(defn- model-implicit-parameters
+ "Returns a map of model Card id -> implicit parameters: the writable fields of each model's source Table that the model
+ returns, under the model's display names, skipping a Table whose column names clash once slugified."
[cards]
- (let [card-by-table-id (into {}
- (for [card cards
- :let [{:keys [table-id]} (query/query->database-and-table-ids (:dataset_query card))]
- :when table-id]
- [table-id card]))
- tables (when-let [table-ids (seq (keys card-by-table-id))]
- (t2/hydrate (actions.db/tables table-ids) :fields))]
+ (let [card-id->table-id (into {}
+ (for [card cards
+ :let [{:keys [table-id]} (query/query->database-and-table-ids (:dataset_query card))]
+ :when table-id]
+ [(:id card) table-id]))
+ table-by-id (when (seq card-id->table-id)
+ (m/index-by :id (actions.db/tables-with-fields (vec (distinct (vals card-id->table-id))))))]
(into {}
- (for [table tables
- :let [fields (:fields table)]
- ;; Skip tables for have conflicting slugified columns i.e. table has "name" and "NAME" columns.
- :when (unique-field-slugs? fields)
- :let [card (get card-by-table-id (:id table))
- id->metadata (m/index-by :id (:result_metadata card))
- parameters (->> fields
- ;; get display_name from metadata
- (keep (fn [field]
- (when-let [metadata (id->metadata (:id field))]
- (assoc field :display_name (:display_name metadata)))))
- ;; remove exploded json fields and any structured field
- (remove (some-fn
- ;; exploded json fields can't be recombined in sql yet
- :nfc_path
- ;; their parents, a json field, nor things like cidr, macaddr, xml, etc
- (comp #(isa? % :type/Structured) :effective_type)
- ;; or things which we don't recognize
- (comp #{:type/*} :effective_type)))
- (map (fn [field]
- {:id (u/slugify (:name field))
- :display-name (:display_name field)
- :target [:variable [:template-tag (u/slugify (:name field))]]
- ;; TODO (Cam 8/12/25) -- Field base type is NOT a valid parameter types!
- ;; See [[metabase.lib.schema.parameter/types]].
- :type (let [base-type (:base_type field)]
- (condp #(isa? %2 %1) base-type
- :type/Number :number
- :type/Temporal :date
- :type/Boolean :boolean
- :text))
- :required (:database_required field)
- :is-auto-increment (:database_is_auto_increment field)
- ::field-id (:id field)
- ::pk? (isa? (:semantic_type field) :type/PK)})))]]
- [(:id card) parameters]))))
-
-(defn- select-actions-implicit-params [action model-id->implicit-parameters]
- (let [model-id (:model_id action)
- saved-params (m/index-by :id (:parameters action))
+ (for [card cards
+ :let [fields (:fields (get table-by-id (get card-id->table-id (:id card))))]
+ :when (and (seq fields) (unique-field-slugs? fields))
+ :let [id->metadata (m/index-by :id (:result_metadata card))]]
+ [(:id card)
+ (->> fields
+ (keep (fn [field]
+ (when-let [metadata (id->metadata (:id field))]
+ (assoc field :display_name (:display_name metadata)))))
+ (remove unwritable-field?)
+ (map field-implicit-parameter))]))))
+
+(defn- table-implicit-parameters
+ "Returns a map of Table id -> implicit parameters: the writable fields a new model on each Table returns, skipping a
+ Table whose column names among them clash once slugified."
+ [table-ids]
+ (into {}
+ (for [table (when (seq table-ids) (actions.db/tables-with-fields (vec table-ids)))
+ :let [fields (table-action-fields table)]
+ :when (unique-field-slugs? fields)]
+ [(:id table)
+ (->> fields
+ (remove unwritable-field?)
+ (map field-implicit-parameter))])))
+
+(defn- select-actions-implicit-params [action implicit-parameters]
+ (let [saved-params (m/index-by :id (:parameters action))
action-kind (keyword (:kind action))]
- (cond->> (get model-id->implicit-parameters model-id)
+ (cond->> implicit-parameters
:always
(map (fn [param]
(let [saved-param (saved-params (:id param))
@@ -545,53 +625,43 @@
{:order (get param-id->order param-id)
:required (get param-id->required param-id)}))))))
-(defn- enrich-action [action model-id->db-id model-id->implicit-parameters field-id->viz-field]
- (case (:type action)
- :implicit
- (let [implicit-params (select-actions-implicit-params action model-id->implicit-parameters)]
- (cond-> (assoc action :database_id (model-id->db-id (:model_id action)))
- (seq implicit-params)
- (-> (assoc :parameters implicit-params)
- (update-in [:visualization_settings :fields] enrich-viz-settings-fields implicit-params field-id->viz-field))))
- :query
- action))
+(defn- enrich-implicit-action [action database-id implicit-parameters field-id->viz-field]
+ (let [implicit-params (select-actions-implicit-params action implicit-parameters)]
+ (cond-> (assoc action :database_id database-id)
+ (seq implicit-params)
+ (-> (assoc :parameters implicit-params)
+ (update-in [:visualization_settings :fields] enrich-viz-settings-fields implicit-params field-id->viz-field)))))
(defn- enrich-actions-with-implicit-params
- "Fills in implicit parameters for `actions` and adds the `:database_id` of the model for implicit actions.
-
- Pass in known-models to save a second Card lookup."
- [known-models actions]
- (let [implicit-action-model-ids (set (map :model_id (filter #(= :implicit (:type %)) actions)))
- implicit-action-models (if known-models
- (->> known-models
- (filter #(contains? implicit-action-model-ids (:id %)))
- distinct)
- (when (seq implicit-action-model-ids)
- (actions.db/cards implicit-action-model-ids)))
- model-id->db-id (into {} (for [card implicit-action-models]
- [(:id card) (:database_id card)]))
- model-id->implicit-parameters (when (seq implicit-action-models)
- (implicit-action-parameters implicit-action-models))
- field-id->viz-field (implicit-parameters->viz-fields (vals model-id->implicit-parameters))]
- (for [action actions]
- (enrich-action action model-id->db-id model-id->implicit-parameters field-id->viz-field))))
+ "Fills in implicit parameters for `actions` and adds the `:database_id` of implicit actions: an action of a model takes
+ them from its model, an action without one from its Table."
+ [actions]
+ (let [implicit (filter #(= :implicit (:type %)) actions)
+ models (when-let [model-ids (not-empty (into #{} (keep :model_id) implicit))]
+ (actions.db/cards model-ids))
+ table-ids (into #{} (comp (remove :model_id) (keep :table_id)) implicit)
+ model-id->params (model-implicit-parameters models)
+ table-id->params (table-implicit-parameters table-ids)
+ model-id->db-id (into {} (map (juxt :id :database_id)) models)
+ table-id->db-id (into {} (map (juxt :id :db_id)) (when (seq table-ids) (actions.db/tables (vec table-ids))))
+ field-id->viz (implicit-parameters->viz-fields (concat (vals model-id->params) (vals table-id->params)))]
+ (for [{model-id :model_id, table-id :table_id, :as action} actions]
+ (if (= :implicit (:type action))
+ (if model-id
+ (enrich-implicit-action action (model-id->db-id model-id) (model-id->params model-id) field-id->viz)
+ (enrich-implicit-action action (table-id->db-id table-id) (table-id->params table-id) field-id->viz))
+ action))))
(mu/defn select-actions :- [:maybe [:sequential ::actions.schema/action]]
"Find actions with given options and generate implicit parameters for execution. Also adds the `:database_id` of the
- model for implicit actions.
-
- Pass in known-models to save a second Card lookup."
- [known-models :- [:maybe [:sequential ::queries.schema/card]]
- & options :- [:* [:or :nil :keyword ms/PositiveInt :string :boolean]]]
- (enrich-actions-with-implicit-params known-models (apply select-actions-without-implicit-params options)))
+ table for implicit actions."
+ [& options :- [:* [:or :nil :keyword ms/PositiveInt :string :boolean]]]
+ (enrich-actions-with-implicit-params (apply select-actions-without-implicit-params options)))
(mu/defn select-actions-for-ids :- [:maybe [:sequential ::actions.schema/action]]
- "Find the Actions whose `:id` is in `action-ids`, filling in implicit parameters as [[select-actions]] does.
-
- Pass in known-models to save a second Card lookup."
- [known-models :- [:maybe [:sequential ::queries.schema/card]]
- action-ids :- [:sequential ::lib.schema.id/action]]
- (enrich-actions-with-implicit-params known-models (normalize-actions-by-type (actions.db/actions-with-ids action-ids))))
+ "Find the Actions whose `:id` is in `action-ids`, filling in implicit parameters as [[select-actions]] does."
+ [action-ids :- [:sequential ::lib.schema.id/action]]
+ (enrich-actions-with-implicit-params (normalize-actions-by-type (actions.db/actions-with-ids action-ids))))
(mu/defn select-action :- [:maybe ::actions.schema/action]
"Selects an Action and fills in the subtype data and implicit parameters.
@@ -599,7 +669,7 @@
[& options :- [:* [:or :nil :keyword ms/PositiveInt :string :boolean]]]
;; TODO -- it's dumb that we're selecting all matches rather than a single one above, limiting like this should
;; never be done server-side. I don't have time to fix this right now. -- Cam
- (first (apply select-actions nil options)))
+ (first (apply select-actions options)))
(defn- map-assoc-database-enable-actions
"Adds a boolean field `:database-enabled-actions` to each action according to the `database-enable-actions` setting for
@@ -622,7 +692,7 @@
[_model _k dashcards]
(let [actions-by-id
(when-let [action-ids (seq (keep :action_id dashcards))]
- (as-> (select-actions-for-ids nil action-ids) actions
+ (as-> (select-actions-for-ids action-ids) actions
(map-assoc-database-enable-actions actions)
(t2/hydrate actions :can_write)
(m/index-by :id actions)))]
@@ -651,7 +721,8 @@
(defmethod serdes/generate-path "ImplicitAction" [_ _] nil)
(defmethod serdes/make-spec "ImplicitAction" [_model-name _opts]
{:copy [:kind]
- :transform {:action_id (serdes/parent-ref)}})
+ :transform {:action_id (serdes/parent-ref)
+ :table_id (serdes/fk :model/Table)}})
(defmethod serdes/make-spec "Action" [_model-name opts]
{:copy [:archived :archived_directly :description :entity_id :name :public_uuid]
diff --git a/src/metabase/actions/schema.clj b/src/metabase/actions/schema.clj
index edecc6bd43d..0ee561b067f 100644
--- a/src/metabase/actions/schema.clj
+++ b/src/metabase/actions/schema.clj
@@ -99,7 +99,8 @@
:bulk/delete])
(def ^:private implicit-action-entries
- [[:kind {:optional true} [:maybe ::implicit-action.kind]]])
+ [[:kind {:optional true} [:maybe ::implicit-action.kind]]
+ [:table_id {:optional true} [:maybe ::lib.schema.id/table]]])
(mr/def ::implicit-action
(into [:map {:closed true}] implicit-action-entries))
@@ -131,7 +132,9 @@
;;
;; `not-null-in-app-db` = this is `NOT NULL` in the app DB, and will always come back when you `SELECT` something,
;; but its value is populated automatically on `INSERT` or `UPDATE`.
- (let [required-for-insert (case schema-type
+ (let [query-entries (cond->> query-action-entries
+ request? (remove (comp #{:database_id} first)))
+ required-for-insert (case schema-type
(:select :update) {:optional true}
:insert {})
common (into
@@ -152,11 +155,11 @@
[:archived_directly {:optional true} :boolean]
[:description {:optional true} [:maybe :string]]
[:parameters {:optional true} [:maybe [:sequential ::action.parameter]]]
- [:database_id {:optional true} [:maybe ::lib.schema.id/database]]
[:parameter_mappings {:optional true} [:maybe ::parameters.schema/parameter-mappings]]
[:visualization_settings {:optional true} [:maybe ms/VisualizationSettings]]]
(when-not request?
- [[:created_at {:optional true} (ms/InstanceOfClass java.time.temporal.Temporal)]
+ [[:database_id {:optional true} [:maybe ::lib.schema.id/database]]
+ [:created_at {:optional true} (ms/InstanceOfClass java.time.temporal.Temporal)]
[:updated_at {:optional true} (ms/InstanceOfClass java.time.temporal.Temporal)]
[:public_uuid {:optional true} [:maybe ms/UUIDString]]
[:public_uuid_prefix {:optional true} [:maybe :string]]
@@ -168,10 +171,10 @@
(into [:map {:closed true}] common)
[:multi {:decode/normalize lib.schema.common/normalize-map-no-kebab-case
:dispatch (comp #{:implicit :query} keyword :type)}
- [:implicit (into [:map {:closed true} [:model_id required-for-insert ::lib.schema.id/card]] implicit-action-entries)]
- [:query (into [:map {:closed true}] query-action-entries)]
+ [:implicit (into [:map {:closed true}] implicit-action-entries)]
+ [:query (into [:map {:closed true}] query-entries)]
;; a partial update need not repeat `:type`; accept every type's keys rather than dropping them
- [nil (into [:map {:closed true}] cat [implicit-action-entries query-action-entries])]]]))
+ [nil (into [:map {:closed true}] cat [implicit-action-entries query-entries])]]]))
(mr/def ::action
"An Action as it should appear when we `SELECT` it from the app DB."
@@ -197,13 +200,15 @@
"A ImplicitAction as selected from the app DB: every column of `:implicit_action`."
[:map {:closed true}
[:action_id ::lib.schema.id/action]
- [:kind [:or :keyword :string]]])
+ [:kind [:or :keyword :string]]
+ [:table_id [:maybe ::lib.schema.id/table]]])
(mr/def ::implicit-action.update
"What an update (or insert) of a ImplicitAction accepts: every column of `:implicit_action` except `id`, all optional."
[:map {:closed true}
[:action_id {:optional true} [:maybe ::lib.schema.id/action]]
- [:kind {:optional true} [:maybe [:or :keyword :string]]]])
+ [:kind {:optional true} [:maybe [:or :keyword :string]]]
+ [:table_id {:optional true} [:maybe ::lib.schema.id/table]]])
(mr/def ::query-action.dataset-query
"The `:dataset_query` column of a QueryAction, decoded."
diff --git a/src/metabase/actions_rest/api.clj b/src/metabase/actions_rest/api.clj
index 93220d5312a..82b41c6e14c 100644
--- a/src/metabase/actions_rest/api.clj
+++ b/src/metabase/actions_rest/api.clj
@@ -32,12 +32,12 @@
[:model-id {:optional true} [:maybe ::lib.schema.id/card]]
[:type {:optional true} [:maybe ::actions.schema/type]]
[:archived {:default false} :boolean]]]
- (let [model (when model-id
- (api/read-check :model/Card model-id))
- action-ids (actions-rest.db/action-ids-visible-to-user
+ (when model-id
+ (api/read-check :model/Card model-id))
+ (let [action-ids (actions-rest.db/action-ids-visible-to-user
{:type action-type, :model-id model-id, :archived archived})
actions (when (seq action-ids)
- (actions/select-actions-for-ids (when model [model]) action-ids))]
+ (actions/select-actions-for-ids action-ids))]
(t2/hydrate (filterv mi/can-read? actions) :creator :can_write)))
(api.macros/defendpoint :get "/public" :- [:sequential ::actions.schema/action]
@@ -77,16 +77,17 @@
"Create a new action."
[_route-params
_query-params
- {:keys [parameters database_id]
+ {:keys [parameters dataset_query]
action-type :type
:as action} :- ::actions.schema/action.create-request]
- (when (and (nil? database_id)
+ (when (and (nil? (:database dataset_query))
(= action-type :query))
- (throw (ex-info (tru "Must provide a database_id for query actions")
+ (throw (ex-info (tru "Must provide a dataset_query for query actions")
{:type action-type
:status-code 400})))
(api/create-check :model/Action action)
(actions/check-implicit-actions-supported action)
+ (actions/check-implicit-action-table-pk action)
(actions/check-action-databases-enabled action)
(let [action-id (actions/insert! (assoc action :creator_id api/*current-user-id*))]
(analytics/track-event! :snowplow/action
@@ -112,8 +113,10 @@
(api/update-check existing-action action)
(api/check-400 (not (and (:archived action) (get action :model_id (:model_id existing-action))))
(tru "A model''s action can''t be archived. Delete it instead."))
- (when (some #(contains? action %) [:dataset_query :database_id :type :kind :model_id])
- (actions/check-action-databases-enabled (merge (actions/select-action :id id) action)))
+ (when (some #(contains? action %) [:dataset_query :database_id :type :kind :model_id :table_id])
+ (let [merged (merge (actions/select-action :id id) action)]
+ (actions/check-implicit-action-table-pk merged)
+ (actions/check-action-databases-enabled merged)))
(actions/update! (assoc action :id id) existing-action))
(let [{:keys [parameters type] :as action} (actions/select-action :id id)]
(events/publish-event! :event/action-update {:object action :user-id api/*current-user-id*})
diff --git a/src/metabase/public_sharing_rest/api.clj b/src/metabase/public_sharing_rest/api.clj
index 0edefe023ce..136e73a0afe 100644
--- a/src/metabase/public_sharing_rest/api.clj
+++ b/src/metabase/public_sharing_rest/api.clj
@@ -501,9 +501,10 @@
(public-sharing.validation/check-public-sharing-enabled)
(let [dashboard-id (api/check-404 (public-sharing/public-uuid->id :model/Dashboard uuid))]
(api/check-404 (public-sharing-rest.db/dashcard-id-in-dashboard dashcard-id dashboard-id))
- (actions/fetch-values
- (api/check-404 (actions/dashcard->action dashcard-id))
- parameters)))
+ (request/with-current-user nil
+ (actions/fetch-values
+ (api/check-404 (actions/dashcard->action dashcard-id))
+ parameters))))
(def ^:private dashcard-execution-throttle (throttle/make-throttler :dashcard-id :attempts-threshold 5000))
diff --git a/src/metabase/queries/db.clj b/src/metabase/queries/db.clj
index 0b301d827df..369e5ee0126 100644
--- a/src/metabase/queries/db.clj
+++ b/src/metabase/queries/db.clj
@@ -360,12 +360,12 @@
:join [:implicit_action [:= :action.id :implicit_action.action_id]]
:where [:= :action.model_id model-id]}))
-(mu/defn move-actions-of-models!
- "Move the Actions of the Cards with `model-ids` to the Collection with `collection-id`, returning the number
+(mu/defn move-actions-of-model!
+ "Move the Actions of the model Card with `model-id` to the Collection with `collection-id`, returning the number
updated."
- [model-ids :- [:set ::lib.schema.id/card]
+ [model-id :- ::lib.schema.id/card
collection-id :- [:maybe ::lib.schema.id/collection]]
- (t2/update! :model/Action :model_id [:in model-ids] {:collection_id collection-id}))
+ (t2/update! :model/Action {:model_id model-id} {:collection_id collection-id}))
(mu/defn delete-actions-of-model!
"Delete the Actions of the Card with `model-id`, returning the number deleted."
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 98e8cc42184..64ff60280c8 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -1119,13 +1119,6 @@
(sync.field-values/update-field-values-for-on-demand-dbs! field-ids))
(parameter-card/upsert-or-delete-from-parameters! "card" (:id card) (:parameters card))))
-(defn- move-model-actions
- "Moves the Actions of `card` into its Collection when the update changes it, returning `card`."
- [card original]
- (u/prog1 card
- (when (not= (:collection_id card) (:collection_id original))
- (queries.db/move-actions-of-models! #{(:id card)} (:collection_id card)))))
-
(defn- apply-dashboard-question-updates [card changes]
(if-let [dashboard-id (:dashboard_id changes)]
(assoc card :collection_id (queries.db/dashboard-collection-id dashboard-id))
@@ -1194,10 +1187,14 @@
(cond-> (some data-app-card-columns (keys changes)) (doto check-data-app-card))
(clear-metabot-origin changes)
(pre-update changes)
- (move-model-actions original)
maybe-populate-initially-published-at
public-sharing/add-public-uuid-prefix-if-changed)))
+(t2/define-after-update :model/Card
+ [card]
+ (u/prog1 card
+ (queries.db/move-actions-of-model! (:id card) (:collection_id card))))
+
;; Cards don't normally get deleted (they get archived instead) so this mostly affects tests
(t2/define-before-delete :model/Card
[{:keys [id] :as card}]
diff --git a/src/metabase/warehouse_schema/db.clj b/src/metabase/warehouse_schema/db.clj
index ef2d83351e1..9d4d3936933 100644
--- a/src/metabase/warehouse_schema/db.clj
+++ b/src/metabase/warehouse_schema/db.clj
@@ -137,6 +137,13 @@
[table-id :- ::lib.schema.id/table]
(t2/delete! :model/Field :table_id table-id))
+(mu/defn delete-implicit-actions-for-table!
+ "Delete the implicit Actions that write to the Table with `table-id`, returning the number deleted."
+ [table-id :- ::lib.schema.id/table]
+ (if-let [action-ids (not-empty (t2/select-fn-set :action_id :model/ImplicitAction :table_id table-id))]
+ (t2/delete! :model/Action :id [:in action-ids])
+ 0))
+
(mu/defn user-renamed-field-names :- [:set :string]
"The lower-cased names, among `names`, of the Fields of the Table with `table-id` whose display name a user set.
Uploads use it to leave those Fields alone when appending re-derives display names from the CSV header."
diff --git a/src/metabase/warehouse_schema/models/table.clj b/src/metabase/warehouse_schema/models/table.clj
index 5ded5a410fc..b1052c008c9 100644
--- a/src/metabase/warehouse_schema/models/table.clj
+++ b/src/metabase/warehouse_schema/models/table.clj
@@ -242,7 +242,8 @@
[table]
;; We need to use toucan to delete the fields instead of cascading deletes because MySQL doesn't support columns with cascade delete
;; foreign key constraints in generated columns. #44866
- (warehouse-schema.db/delete-fields-for-table! (:id table)))
+ (warehouse-schema.db/delete-fields-for-table! (:id table))
+ (warehouse-schema.db/delete-implicit-actions-for-table! (:id table)))
(t2/define-before-update :model/Table
[table]
diff --git a/src/metabase/warehouses/db.clj b/src/metabase/warehouses/db.clj
index 53fde593478..3f07a45a7c7 100644
--- a/src/metabase/warehouses/db.clj
+++ b/src/metabase/warehouses/db.clj
@@ -103,12 +103,18 @@
:select [:id]
:where [:= :database_id database-id]}))
-(mu/defn delete-query-actions-for-database!
- "Delete the query Actions whose query runs against the Database with `database-id`, returning the number deleted."
+(mu/defn delete-actions-for-database!
+ "Delete the query Actions whose query runs against the Database with `database-id` and the implicit Actions that write
+ to one of its Tables, returning the number deleted."
[database-id :- ::lib.schema.id/database]
- (if-let [action-ids (not-empty (t2/select-fn-set :action_id :model/QueryAction :database_id database-id))]
- (t2/delete! :model/Action :id [:in action-ids])
- 0))
+ (let [[table-subquery _] (warehouse-schema-overlay/table-query)]
+ (if-let [action-ids (not-empty (into (t2/select-fn-set :action_id :model/QueryAction :database_id database-id)
+ (t2/select-fn-set :action_id :model/ImplicitAction
+ {:join [[table-subquery :table]
+ [:= :table.id :implicit_action.table_id]]
+ :where [:= :table.db_id database-id]})))]
+ (t2/delete! :model/Action :id [:in action-ids])
+ 0)))
(mu/defn delete-cards-for-database!
"Delete the Cards of the Database with `database-id`."
diff --git a/src/metabase/warehouses/models/database.clj b/src/metabase/warehouses/models/database.clj
index 10a9ea0f23e..fd2a0895443 100644
--- a/src/metabase/warehouses/models/database.clj
+++ b/src/metabase/warehouses/models/database.clj
@@ -427,7 +427,7 @@
(unschedule-tasks! database)
(secret/delete-orphaned-secrets! database)
(delete-database-fields! id)
- (warehouses.db/delete-query-actions-for-database! id)
+ (warehouses.db/delete-actions-for-database! id)
(->> (eduction
(map t2.realize/realize)
(partition-all 1000)
diff --git a/test/metabase/actions/execution_test.clj b/test/metabase/actions/execution_test.clj
index 1e031b91804..150e8122dd3 100644
--- a/test/metabase/actions/execution_test.clj
+++ b/test/metabase/actions/execution_test.clj
@@ -61,6 +61,30 @@
(defn- recorded-template [row]
(t2/select-one-fn :query :model/Query :query_hash (:hash row)))
+(deftest table-action-runs-with-the-fields-it-was-made-with-test
+ (testing "an implicit action without a model ignores sensitive fields when it runs, as when it was made"
+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2}
+ :model/Table {clash-id :id} {:db_id db-id :name "CLASH"}
+ :model/Field _ {:table_id clash-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Field _ {:table_id clash-id :name "NAME" :base_type :type/Text}
+ :model/Field _ {:table_id clash-id :name "name" :base_type :type/Text
+ :visibility_type :sensitive}
+ :model/Table {two-pk-id :id} {:db_id db-id :name "TWO_PK"}
+ :model/Field _ {:table_id two-pk-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Field _ {:table_id two-pk-id :name "secret" :base_type :type/Integer
+ :semantic_type :type/PK :visibility_type :sensitive}]
+ (mt/with-model-cleanup [:model/Action]
+ (doseq [[description table-id] {"a name that clashes only with a sensitive column" clash-id
+ "a second, sensitive primary key" two-pk-id}]
+ (testing description
+ (let [action-id (action/insert! {:type :implicit :name description :kind :row/update
+ :table_id table-id})
+ build-implicit-query #'actions.execution/build-implicit-query]
+ (is (=? {:row-parameters {}}
+ (build-implicit-query (action/select-action :id action-id) :model.row/update {"id" 1}))))))))))
+
(deftest native-action-audit-trail-test
(testing "a native query action records one QueryExecution row for the write"
(mt/test-helpers-set-global-values!
diff --git a/test/metabase/actions/models_test.clj b/test/metabase/actions/models_test.clj
index 6370f4ab989..991e22c54db 100644
--- a/test/metabase/actions/models_test.clj
+++ b/test/metabase/actions/models_test.clj
@@ -10,6 +10,7 @@
[metabase.driver :as driver]
[metabase.driver.mysql :as mysql]
[metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.query-processor.preprocess :as qp.preprocess]
@@ -277,18 +278,142 @@
(api/write-check :model/Action (:id action))))
(is (false? (mi/can-create? :model/Action (action-in app-id))))))))))
-(deftest implicit-action-requires-model-test
+(deftest implicit-action-requires-table-test
(mt/test-drivers (mt/normal-drivers-with-feature :actions/custom)
- (testing "an implicit action cannot be inserted without a model"
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"model_id"
- (action/insert! {:type :implicit :name "No model" :kind :row/create}))))
- (testing "an implicit action cannot be detached from its model"
+ (testing "an implicit action cannot be inserted without a model or a table"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"An implicit action needs a table"
+ (action/insert! {:type :implicit :name "No table" :kind :row/create}))))
+ (testing "an implicit action without a model writes to the table it was made for"
+ (mt/with-actions-test-data
+ (mt/with-model-cleanup [:model/Action]
+ (let [action-id (action/insert! {:type :implicit :name "Table" :kind :row/create :table_id (mt/id :categories)})]
+ (is (=? {:model_id nil
+ :table_id (mt/id :categories)
+ :database_id (mt/id)
+ :parameters [{:id "name"}]}
+ (action/select-action :id action-id)))))))
+ (testing "an implicit action can't be detached from its model"
(mt/with-actions-enabled
(mt/with-actions [{:keys [action-id]} {:type :implicit :kind "row/create"}]
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"model_id"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"An action's model can't be changed"
(action/update! {:id action-id :model_id nil} (action/select-action :id action-id))))
(is (some? (t2/select-one-fn :model_id :model/Action :id action-id))))))))
+(deftest actions-of-two-models-on-one-table-test
+ (testing "the actions of two models on the same table each get their own model's parameters"
+ (mt/with-actions-test-data-and-actions-enabled
+ (let [mp (mt/metadata-provider)
+ query (lib/query mp (lib.metadata/table mp (mt/id :categories)))
+ metadata (vec (qp.preprocess/query->expected-cols query))]
+ (mt/with-temp [:model/Card {first-model :id} {:type :model :dataset_query query :result_metadata metadata}
+ :model/Card {second-model :id} {:type :model :dataset_query query :result_metadata metadata}]
+ (mt/with-model-cleanup [:model/Action]
+ (let [first-id (action/insert! {:type :implicit :name "First" :kind :row/update :model_id first-model})
+ second-id (action/insert! {:type :implicit :name "Second" :kind :row/update :model_id second-model})]
+ (is (= {first-id ["id" "name"], second-id ["id" "name"]}
+ (into {} (map (juxt :id #(map :id (:parameters %))))
+ (action/select-actions-for-ids [first-id second-id])))))))))))
+
+(deftest model-less-implicit-action-table-rules-test
+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2}
+ :model/Table {clash-id :id} {:db_id db-id :name "CLASH"}
+ :model/Field _ {:table_id clash-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Field _ {:table_id clash-id :name "name" :base_type :type/Text}
+ :model/Field _ {:table_id clash-id :name "NAME" :base_type :type/Text
+ :visibility_type :sensitive}
+ :model/Table {stub-id :id} {:db_id db-id :name "STUB"}]
+ (mt/with-model-cleanup [:model/Action]
+ (testing "a column name that clashes only with a sensitive column leaves the action its fields"
+ (let [action-id (action/insert! {:type :implicit :name "Clash" :kind :row/update :table_id clash-id})]
+ (is (= ["id" "name"] (map :id (:parameters (action/select-action :id action-id)))))))
+ (testing "the hooks take a table without fields, as a load writes the action before it, or without, the table's fields"
+ (is (some? (action/insert! {:type :implicit :name "Stub" :kind :row/create :table_id stub-id})))))))
+
+(deftest deleting-a-table-deletes-its-actions-test
+ (testing "deleting a table, or its database, deletes the implicit actions without a model that write to it"
+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2}
+ :model/Table {table-id :id} {:db_id db-id :name "T"}
+ :model/Field _ {:table_id table-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Table {other-id :id} {:db_id db-id :name "U"}
+ :model/Field _ {:table_id other-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK}]
+ (mt/with-model-cleanup [:model/Action]
+ (let [of-table (action/insert! {:type :implicit :name "T" :kind :row/create :table_id table-id})
+ of-database (action/insert! {:type :implicit :name "U" :kind :row/create :table_id other-id})]
+ (t2/delete! :model/Table table-id)
+ (is (not (t2/exists? :model/Action :id of-table)))
+ (is (t2/exists? :model/Action :id of-database))
+ (t2/delete! :model/Database db-id)
+ (is (not (t2/exists? :model/Action :id of-database))))))))
+
+(deftest model-less-implicit-action-fields-test
+ (testing "an implicit action without a model has the fields a new model on its table returns: no sensitive or retired ones"
+ (mt/with-temp-vals-in-db :model/Field (mt/id :venues :price) {:visibility_type "sensitive"}
+ (mt/with-temp-vals-in-db :model/Field (mt/id :venues :latitude) {:visibility_type "hidden"}
+ (mt/with-temp-vals-in-db :model/Field (mt/id :venues :longitude) {:visibility_type "details-only"}
+ (mt/with-temp-vals-in-db :model/Field (mt/id :venues :category_id) {:visibility_type "retired"}
+ (mt/with-model-cleanup [:model/Action]
+ (let [action-id (action/insert! {:type :implicit :name "Venue" :kind :row/update
+ :table_id (mt/id :venues)})]
+ (is (= #{"id" "name" "latitude" "longitude"}
+ (set (map :id (:parameters (action/select-action :id action-id))))))))))))))
+
+(defn- table-query
+ "A query of the test Table `table-key`."
+ [table-key]
+ (let [mp (mt/metadata-provider)]
+ (lib/query mp (lib.metadata/table mp (mt/id table-key)))))
+
+(deftest model-action-collection-follows-model-test
+ (mt/with-actions-enabled
+ (mt/with-temp [:model/Collection {coll-id :id} {}
+ :model/Collection {other-id :id} {}]
+ (mt/with-actions [{model-id :id} {:type :model :dataset_query (table-query :categories)
+ :collection_id coll-id}
+ {:keys [action-id]} {:type :query}]
+ (testing "an action of a model goes in the model's collection"
+ (is (= coll-id (t2/select-one-fn :collection_id :model/Action :id action-id))))
+ (testing "and can't be moved out of it"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A model's action goes in the model's collection"
+ (t2/update! :model/Action action-id {:collection_id other-id})))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A model's action goes in the model's collection"
+ (t2/update! :model/Action action-id {:collection_id nil}))))
+ (testing "nor be inserted in another collection"
+ (mt/with-model-cleanup [:model/Action]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A model's action goes in the model's collection"
+ (action/insert! {:type :query
+ :name "Elsewhere"
+ :model_id model-id
+ :collection_id other-id
+ :database_id (mt/id)
+ :dataset_query (lib/native-query (mt/metadata-provider) "select 1")})))))
+ (testing "moving the model moves its actions"
+ (t2/update! :model/Card model-id {:collection_id other-id})
+ (is (= other-id (t2/select-one-fn :collection_id :model/Action :id action-id))))))))
+
+(deftest model-action-has-no-table-test
+ (testing "an implicit action of a model reads its model's table, so it can't be given one"
+ (mt/with-actions [_ {:type :model :dataset_query (table-query :categories)}
+ {:keys [action-id]} {:type :implicit :kind "row/create"}]
+ (is (nil? (t2/select-one-fn :table_id :model/ImplicitAction :action_id action-id)))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"An action of a model writes to the model's table"
+ (t2/update! :model/ImplicitAction {:action_id action-id} {:table_id (mt/id :categories)})))
+ (is (nil? (t2/select-one-fn :table_id :model/ImplicitAction :action_id action-id))))))
+
+(deftest load-moves-action-to-another-model-test
+ (testing "a serdes load can move an action to another model, as exports from before the model was fixed can hold such a move"
+ (mt/with-temp [:model/Collection {other-coll :id} {}
+ :model/Card {other-id :id} {:type :model :dataset_query (table-query :categories)
+ :collection_id other-coll}]
+ (mt/with-actions [_ {:type :model :dataset_query (table-query :categories)}
+ {:keys [action-id]} {:type :query}]
+ (binding [mi/*deserializing?* true]
+ (t2/update! :model/Action action-id {:model_id other-id :collection_id other-coll}))
+ (is (= {:model_id other-id :collection_id other-coll}
+ (t2/select-one [:model/Action :model_id :collection_id] :id action-id)))))))
+
(deftest switching-to-implicit-checks-the-model-test
(mt/test-drivers (mt/normal-drivers-with-feature :actions/custom)
(mt/with-actions-enabled
@@ -481,6 +606,21 @@
nil)
(is (not (t2/exists? :model/Action :entity_id entity-id))))))
+(deftest load-table-action-without-its-table-test
+ (testing "a table action doesn't depend on its table for serdes, and loading it makes a stub of a table that isn't there"
+ (mt/with-model-cleanup [:model/Action :model/Table]
+ (let [action-id (action/insert! {:type :implicit :name "On categories" :kind :row/create
+ :table_id (mt/id :categories) :creator_id (mt/user->id :crowberto)})
+ entity-id (u/generate-nano-id)
+ exported (-> (u/rfirst (serdes/extract-all "Action" {:filter-column :id :filter-ids [action-id]}))
+ (assoc :entity_id entity-id :serdes/meta [{:model "Action" :id entity-id :label "copy"}])
+ (assoc-in [:implicit 0 :table_id] [(:name (mt/db)) "PUBLIC" "NOT_SYNCED_YET"]))]
+ (is (= #{} (set (filter #(= "Table" (:model (last %))) (serdes/deserialization-dependencies exported)))))
+ (serdes/load-one! exported nil)
+ (let [table-id (t2/select-one-fn :table_id :model/ImplicitAction
+ :action_id (t2/select-one-pk :model/Action :entity_id entity-id))]
+ (is (= "NOT_SYNCED_YET" (t2/select-one-fn :name :model/Table :id table-id))))))))
+
(deftest storage-path-test
(testing "actions without a model in the data actions root or namespace are stored in the data_actions folder"
(mt/with-temp [:model/Collection {folder-eid :entity_id} {:namespace "data-actions"}
diff --git a/test/metabase/actions_rest/api_test.clj b/test/metabase/actions_rest/api_test.clj
index fc0cb43d8c3..d3187236a1a 100644
--- a/test/metabase/actions_rest/api_test.clj
+++ b/test/metabase/actions_rest/api_test.clj
@@ -9,12 +9,15 @@
[metabase.analytics.snowplow-test :as snowplow-test]
[metabase.collections.models.collection :as collection]
[metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.permissions.core :as perms]
+ [metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.test-util :as perms.test-util]
[metabase.search.core :as search]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
+ [metabase.util :as u]
[metabase.util.malli.schema :as ms]
[toucan2.core :as t2]))
@@ -355,7 +358,7 @@
{:dataset_query (write-query query-db-id)}))))))))))
(deftest action-update-cannot-repoint-a-query-action-with-a-blanked-query-test
- (testing "PUT /api/action/:id checks actions-enabled on a database_id that no query overrides"
+ (testing "PUT /api/action/:id can't repoint a query action whose query has no database"
(do-with-actions-enabled-on-model-db-only!
(fn [model-db-id other-db-id]
(mt/with-model-cleanup [:model/Action]
@@ -366,9 +369,9 @@
(testing "blanking the query leaves the action on the database it was created against"
(is (=? {:database_id model-db-id}
(mt/user-http-request :crowberto :put 200 url {:dataset_query {}}))))
- (testing "the database_id that would now be written through is checked"
- (is (= "Actions are not enabled."
- (mt/user-http-request :crowberto :put 400 url {:database_id other-db-id}))))
+ (testing "a database_id in the body is dropped"
+ (is (=? {:database_id model-db-id}
+ (mt/user-http-request :crowberto :put 200 url {:database_id other-db-id}))))
(is (=? {:database_id model-db-id}
(mt/user-http-request :crowberto :get 200 url))))))))))
@@ -530,8 +533,8 @@
(is (=? {:errors {:name "string"},
:specific-errors {:name ["missing required key, received: nil"]}}
(mt/user-http-request :crowberto :post 400 "action" {:type "query"})))
- (is (=? {:specific-errors {:model_id ["missing required key, received: nil"]}}
- (mt/user-http-request :crowberto :post 400 "action" {:type "implicit" :name "test"}))))))))))
+ (is (= "An implicit action needs a table."
+ (mt/user-http-request :crowberto :post 400 "action" {:type "implicit" :name "test"}))))))))))
(deftest model-actions-cannot-be-archived-test
(testing "a model's action can't be archived, only deleted"
@@ -585,7 +588,6 @@
{:name "Rename Category"
:type "query"
:collection_id collection-id
- :database_id (mt/id)
:dataset_query {:database (mt/id)
:type "native"
:native {:query "UPDATE categories SET name = {{name}} WHERE id = {{id}}"
@@ -620,6 +622,81 @@
mt/rows
ffirst)))))))))
+(deftest query-action-database-is-its-query-database-test
+ (testing "a query action's database is always its query's: a database_id in a create or update body is dropped"
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-model-cleanup [:model/Action]
+ (mt/with-temp [:model/Database {other-db-id :id} {}]
+ (let [created (mt/user-http-request :crowberto :post 200 "action"
+ (assoc (model-less-query-action nil) :database_id other-db-id))
+ path (str "action/" (:id created))]
+ (is (=? {:database_id (mt/id)} created))
+ (is (=? {:database_id (mt/id)}
+ (mt/user-http-request :crowberto :put 200 path {:database_id other-db-id})))
+ (is (= (mt/id) (t2/select-one-fn :database_id :model/QueryAction :action_id (:id created)))))))))
+ (testing "a query action needs a query"
+ (mt/with-actions-test-data-and-actions-enabled
+ (is (= "Must provide a dataset_query for query actions"
+ (mt/user-http-request :crowberto :post 400 "action"
+ (dissoc (model-less-query-action nil) :dataset_query)))))))
+
+(defn- table-query
+ "A query of the test Table `table-key`."
+ [table-key]
+ (let [mp (mt/metadata-provider)]
+ (lib/query mp (lib.metadata/table mp (mt/id table-key)))))
+
+(deftest implicit-action-without-model-test
+ (testing "an implicit action without a model writes to its table, and a reader of its collection who can query the table runs and prefills it"
+ (mt/with-actions-test-data-tables #{"categories" "venues"}
+ (mt/with-actions-test-data-and-actions-enabled
+ (perms.test-util/with-restored-perms!
+ (mt/with-model-cleanup [:model/Action]
+ (mt/with-temp [:model/Collection {coll-id :id} {:namespace "data-actions"}]
+ (let [create! (fn [kind]
+ (mt/user-http-request :crowberto :post 200 "action"
+ {:name "Table action" :type "implicit" :kind kind
+ :table_id (mt/id :categories) :collection_id coll-id}))
+ update (create! "row/update")
+ path (str "action/" (:id update))]
+ (is (=? {:model_id nil
+ :table_id (mt/id :categories)
+ :database_id (mt/id)
+ :parameters [{:id "id"} {:id "name"}]}
+ update))
+ (perms/grant-collection-read-permissions! (perms/all-users-group) coll-id)
+ (mt/with-no-data-perms-for-all-users!
+ (data-perms/set-database-permission! (perms/all-users-group) (mt/id) :perms/view-data :unrestricted)
+ (testing "prefilling reads the row as the user, so without query access to the table it fills in nothing"
+ (is (= {} (mt/user-http-request :rasta :post 200 (str path "/execute/values") {:parameters {"id" 1}}))))
+ (data-perms/set-database-permission! (perms/all-users-group) (mt/id) :perms/create-queries :query-builder)
+ (is (= {:id 1 :name "African"}
+ (mt/user-http-request :rasta :post 200 (str path "/execute/values") {:parameters {"id" 1}})))
+ (is (=? {:rows-updated 1}
+ (mt/user-http-request :rasta :post 200 (str path "/execute")
+ {:parameters {:id 1 :name "Renamed Category"}}))))
+ (is (= {:id 1 :name "Renamed Category"}
+ (mt/user-http-request :crowberto :post 200 (str path "/execute/values") {:parameters {"id" 1}})))
+ (testing "its table can be changed"
+ (is (=? {:table_id (mt/id :venues)}
+ (mt/user-http-request :crowberto :put 200 path {:table_id (mt/id :venues)}))))))))))))
+
+(deftest implicit-insert-returns-only-action-columns-test
+ (testing "the row an implicit insert returns has only the primary key and the columns the action has fields for, so no sensitive column"
+ (mt/with-actions-test-data-tables #{"venues" "categories"}
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-temp-vals-in-db :model/Field (mt/id :venues :price) {:visibility_type "sensitive"}
+ (mt/with-model-cleanup [:model/Action]
+ (let [{action-id :id} (mt/user-http-request :crowberto :post 200 "action"
+ {:name "Add venue" :type "implicit" :kind "row/create"
+ :table_id (mt/id :venues)})
+ {:keys [created-row]} (mt/user-http-request :crowberto :post 200 (str "action/" action-id "/execute")
+ {:parameters {:name "Bird" :category_id 1}})
+ columns (set (map (comp u/lower-case-en name) (keys created-row)))]
+ (is (contains? columns "id"))
+ (is (contains? columns "name"))
+ (is (not (contains? columns "price"))))))))))
+
(deftest only-admins-write-actions-without-model-test
(testing "only admins can create or update an action without a model, whatever their permissions on its collection"
(mt/with-actions-test-data-and-actions-enabled
@@ -725,14 +802,20 @@
(is (=? {:can_write false} (mt/user-http-request :rasta :get 200 (str "action/" action-id)))))))))))
(deftest attached-action-keeps-model-collection-test
- (testing "an action with a model stays in the model's collection whatever collection_id an update sends"
+ (testing "an action with a model can't be moved out of the model's collection"
(mt/with-actions-test-data-and-actions-enabled
(mt/with-temp [:model/Collection {coll-id :id} {}
:model/Collection {other-id :id} {}]
- (mt/with-actions [{:keys [action-id]} {:public_uuid nil :made_public_by_id nil :collection_id coll-id}]
+ (mt/with-actions [_ {:type :model :dataset_query (table-query :categories) :collection_id coll-id}
+ {:keys [action-id]} {:public_uuid nil :made_public_by_id nil}]
(let [model-collection (t2/select-one-fn :collection_id :model/Action :id action-id)]
- (mt/user-http-request :crowberto :put 200 (str "action/" action-id) {:collection_id other-id})
- (is (= model-collection (t2/select-one-fn :collection_id :model/Action :id action-id)))))))))
+ (is (= "A model's action goes in the model's collection."
+ (mt/user-http-request :crowberto :put 400 (str "action/" action-id) {:collection_id other-id})))
+ (is (= model-collection (t2/select-one-fn :collection_id :model/Action :id action-id)))
+ (testing "sending the collection it already has is fine"
+ (is (=? {:collection_id model-collection}
+ (mt/user-http-request :crowberto :put 200 (str "action/" action-id)
+ {:collection_id model-collection}))))))))))
(deftest action-without-model-collection-guards-test
(testing "an action without a model can only go in the data actions root or an existing, unarchived data actions collection"
@@ -753,16 +836,74 @@
(mt/user-http-request :crowberto :put 400 path {:collection_id default-id})
(is (= coll-id (:collection_id (mt/user-http-request :crowberto :get 200 path))))))))))
+(deftest implicit-action-without-model-needs-single-pk-table-test
+ (testing "the API refuses an implicit action without a model on a table without exactly one usable primary key"
+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2}
+ :model/Table {no-pk-id :id} {:db_id db-id :name "NO_PK"}
+ :model/Field _ {:table_id no-pk-id :name "name" :base_type :type/Text}
+ :model/Table {composite-pk-id :id} {:db_id db-id :name "COMPOSITE_PK"}
+ :model/Field _ {:table_id composite-pk-id :name "a" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Field _ {:table_id composite-pk-id :name "b" :base_type :type/Integer
+ :semantic_type :type/PK}
+ :model/Table {sensitive-pk-id :id} {:db_id db-id :name "SENSITIVE_PK"}
+ :model/Field _ {:table_id sensitive-pk-id :name "id" :base_type :type/Integer
+ :semantic_type :type/PK :visibility_type :sensitive}]
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-model-cleanup [:model/Action]
+ (let [{action-id :id} (mt/user-http-request :crowberto :post 200 "action"
+ {:name "Good" :type "implicit" :kind "row/create"
+ :table_id (mt/id :categories)})]
+ (doseq [[description table-id] {"no primary key" no-pk-id
+ "a composite one" composite-pk-id
+ "only a sensitive one" sensitive-pk-id}]
+ (testing description
+ (is (= "An implicit action needs a table with exactly one primary key."
+ (mt/user-http-request :crowberto :post 400 "action"
+ {:name "Bad" :type "implicit" :kind "row/create"
+ :table_id table-id})))
+ (is (= "An implicit action needs a table with exactly one primary key."
+ (mt/user-http-request :crowberto :put 400 (str "action/" action-id)
+ {:table_id table-id})))))))))))
+
+(deftest implicit-action-of-model-on-native-question-checks-actions-enabled-test
+ (testing "an implicit action of a model built on a native question is refused while actions are off on its database"
+ (mt/with-actions-test-data
+ (mt/with-model-cleanup [:model/Action]
+ (let [mp (mt/metadata-provider)]
+ (mt/with-temp [:model/Card {question-id :id} {:dataset_query (lib/native-query mp "SELECT * FROM categories")}
+ :model/Card {model-id :id} {:type :model
+ :dataset_query (lib/query mp (lib.metadata/card mp question-id))}]
+ (is (= "Actions are not enabled."
+ (mt/user-http-request :crowberto :post 400 "action"
+ {:name "Add" :type "implicit" :kind "row/create"
+ :model_id model-id})))))))))
+
(deftest action-with-missing-model-test
- (testing "creating or moving an action onto a model that does not exist is a 404"
+ (testing "creating an action on a model that does not exist is a 404"
(mt/with-actions-test-data-and-actions-enabled
(mt/with-model-cleanup [:model/Action]
(is (= "Not found."
(mt/user-http-request :crowberto :post 404 "action"
- (assoc (model-less-query-action nil) :model_id Integer/MAX_VALUE))))
- (let [path (str "action/" (:id (mt/user-http-request :crowberto :post 200 "action" (model-less-query-action nil))))]
- (is (= "Not found."
- (mt/user-http-request :crowberto :put 404 path {:model_id Integer/MAX_VALUE}))))))))
+ (assoc (model-less-query-action nil) :model_id Integer/MAX_VALUE))))))))
+
+(deftest action-model-cannot-change-test
+ (testing "an action's model is set on create and can't be changed, added or removed"
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-model-cleanup [:model/Action]
+ (mt/with-actions [{model-id :id} {:type :model :dataset_query (table-query :categories)}
+ {:keys [action-id]} {:type :query}]
+ (let [model-less (str "action/" (:id (mt/user-http-request :crowberto :post 200 "action" (model-less-query-action nil))))
+ of-model (str "action/" action-id)]
+ (is (= "An action's model can't be changed."
+ (mt/user-http-request :crowberto :put 400 model-less {:model_id model-id})))
+ (is (= "An action's model can't be changed."
+ (mt/user-http-request :crowberto :put 400 of-model {:model_id nil})))
+ (is (=? {:model_id nil} (mt/user-http-request :crowberto :get 200 model-less)))
+ (is (=? {:model_id model-id} (mt/user-http-request :crowberto :get 200 of-model)))
+ (testing "sending the model it already has is fine"
+ (is (=? {:name "Same model"}
+ (mt/user-http-request :crowberto :put 200 of-model {:name "Same model" :model_id model-id}))))))))))
(deftest archiving-directly-test
(testing "archiving an action through the API marks it as archived directly, and unarchiving clears that"
@@ -1091,9 +1232,9 @@
:hidden true}}}}]
(testing "Hidden parameter should fail gracefully"
(testing "POST /api/action/:id/execute"
- (is (partial= {:message "No destination parameter found for #{\"name\"}. Found: #{\"last_login\" \"id\"}"}
- (mt/user-http-request :crowberto :post 400 (format "action/%s/execute" action-id)
- {:parameters {:name "Darth Vader"}})))))))))
+ (is (re-find #"^No destination parameter found for #\{\"name\"\}"
+ (:message (mt/user-http-request :crowberto :post 400 (format "action/%s/execute" action-id)
+ {:parameters {:name "Darth Vader"}}))))))))))
(deftest implicit-update-timestamp-round-trip-test
(mt/test-drivers (mt/normal-drivers-with-feature :actions)
diff --git a/test/metabase/app_db/schema_migrations_test.clj b/test/metabase/app_db/schema_migrations_test.clj
index 187ea7d7910..65f4bdb7960 100644
--- a/test/metabase/app_db/schema_migrations_test.clj
+++ b/test/metabase/app_db/schema_migrations_test.clj
@@ -3773,6 +3773,50 @@
(is (= #{kept-button} (t2/select-pks-set :report_dashboardcard :id [:in [kept-button deleted-button]])))
(is (not (t2/exists? :query_action :action_id question)))))))
+(deftest implicit-action-table-id-test
+ (testing "v65.2026-10-23T00:00:00 thru v65.2026-10-23T00:00:03: implicit actions get an empty table_id that goes with its table"
+ (impl/test-migrations ["v65.2026-10-23T00:00:00" "v65.2026-10-23T00:00:03"] [migrate!]
+ (let [user-id (t2/insert-returning-pk! :core_user {:first_name "Action"
+ :last_name "Owner"
+ :password "superstrong"
+ :entity_id (u/generate-nano-id)
+ :date_joined :%now})
+ db-id (t2/insert-returning-pk! :metabase_database {:name "Actions DB"
+ :engine "h2"
+ :details "{}"
+ :created_at :%now
+ :updated_at :%now})
+ table-id (t2/insert-returning-pk! :metabase_table {:active true
+ :db_id db-id
+ :name "customers"
+ :created_at :%now
+ :updated_at :%now})
+ model-id (t2/insert-returning-pk! :report_card {:name "Model"
+ :entity_id (u/generate-nano-id)
+ :type "model"
+ :display "table"
+ :dataset_query "{}"
+ :visualization_settings "{}"
+ :creator_id user-id
+ :database_id db-id
+ :table_id table-id
+ :created_at :%now
+ :updated_at :%now})
+ action-id (t2/insert-returning-pk! :action {:name "Action"
+ :entity_id (u/generate-nano-id)
+ :type "implicit"
+ :model_id model-id
+ :created_at :%now
+ :updated_at :%now})]
+ (t2/insert! :implicit_action {:action_id action-id :kind "row/create"})
+ (migrate!)
+ (is (nil? (t2/select-one-fn :table_id :implicit_action :action_id action-id)))
+ (testing "deleting the table deletes the implicit actions that write to it"
+ (t2/update! :implicit_action {:action_id action-id} {:table_id table-id})
+ (t2/delete! :metabase_table :id table-id)
+ (is (not (t2/exists? :implicit_action :action_id action-id))))))))
+
(deftest timeline-event-entity-ids-test
(testing "v65.h1c4r5 thru v65.lpm4z3: existing timeline events get distinct portable IDs, other data unchanged"
(impl/test-migrations ["v65.h1c4r5" "v65.lpm4z3"] [migrate!]
diff --git a/test/metabase/dashboards_rest/api_test.clj b/test/metabase/dashboards_rest/api_test.clj
index da75cbeff45..eb7463ff53f 100644
--- a/test/metabase/dashboards_rest/api_test.clj
+++ b/test/metabase/dashboards_rest/api_test.clj
@@ -4669,6 +4669,28 @@
(is (partial= {:message "No destination parameter found for #{\"price\"}. Found: #{\"id\" \"name\"}"}
(mt/user-http-request :crowberto :post 400 execute-path {:parameters {"id" 1 "name" "Blueberries" "price" 1234}})))))))))))
+(deftest dashcard-implicit-action-needs-read-access-to-the-action-test
+ (testing "running or prefilling an implicit action from a dashcard needs read access to the action, not only to the dashboard"
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection {dashboard-coll :id} {}
+ :model/Collection {model-coll :id} {}]
+ (perms/grant-collection-read-permissions! (perms-group/all-users) dashboard-coll)
+ (let [mp (mt/metadata-provider)]
+ (mt/with-actions [{model-id :id} {:type :model
+ :dataset_query (lib/query mp (lib.metadata/table mp (mt/id :categories)))
+ :collection_id model-coll}
+ {:keys [action-id]} {:type :implicit :kind "row/update"}]
+ (mt/with-temp [:model/Dashboard {dashboard-id :id} {:collection_id dashboard-coll}
+ :model/DashboardCard {dashcard-id :id} {:dashboard_id dashboard-id
+ :action_id action-id
+ :card_id model-id}]
+ (let [path (format "dashboard/%s/dashcard/%s/execute" dashboard-id dashcard-id)]
+ (mt/user-http-request :rasta :post 403 (str path "/values") {:parameters {"id" 1}})
+ (mt/user-http-request :rasta :post 403 path {:parameters {"id" 1 "name" "Renamed"}})
+ (is (= {:id 1 :name "African"}
+ (mt/user-http-request :crowberto :post 200 (str path "/values") {:parameters {"id" 1}}))))))))))))
+
(deftest dashcard-implicit-action-only-expose-unhidden-fields
(mt/test-drivers (mt/normal-drivers-with-feature :actions)
(mt/with-actions-test-data-tables #{"venues" "categories"}
diff --git a/test/metabase/public_sharing_rest/api_test.clj b/test/metabase/public_sharing_rest/api_test.clj
index 0dcb6e30125..c69b7c90de1 100644
--- a/test/metabase/public_sharing_rest/api_test.clj
+++ b/test/metabase/public_sharing_rest/api_test.clj
@@ -1014,6 +1014,27 @@
(is (= "An error occurred."
(mt/user-http-request :crowberto :post 400 execute-path {:parameters {"id" 1 "name" "Blueberries" "price" 1234}})))))))))))))
+(deftest public-dashboard-action-prefill-ignores-signed-in-user-test
+ (testing "prefill on a public dashboard works for a signed-in user who can't read the action, as for anyone"
+ (mt/with-temporary-setting-values [enable-public-sharing true]
+ (mt/with-actions-test-data-and-actions-enabled
+ (mt/with-temp [:model/Collection {collection-id :id} {}]
+ (perms/revoke-collection-permissions! (perms-group/all-users) collection-id)
+ (let [mp (mt/metadata-provider)]
+ (mt/with-actions [{card-id :id} {:type :model
+ :dataset_query (lib/query mp (lib.metadata/table mp (mt/id :categories)))
+ :collection_id collection-id}
+ {:keys [action-id]} {:type :implicit :kind "row/update"}]
+ (let [public-uuid (str (random-uuid))]
+ (mt/with-temp [:model/Dashboard {dashboard-id :id} {:public_uuid public-uuid}
+ :model/DashboardCard {dashcard-id :id} {:dashboard_id dashboard-id
+ :action_id action-id
+ :card_id card-id}]
+ (is (= {:id 1 :name "African"}
+ (mt/user-http-request :rasta :post 200
+ (format "public/dashboard/%s/dashcard/%s/execute/values" public-uuid dashcard-id)
+ {:parameters {"id" 1}}))))))))))))
+
(deftest public-dashboard-action-prefill-validates-dashcard-belongs-to-dashboard-test
(testing "prefill should validate that the dashcard belongs to the dashboard"
(mt/with-temporary-setting-values [enable-public-sharing true]
diff --git a/test/metabase/queries/models/card_test.clj b/test/metabase/queries/models/card_test.clj
index f66a211f4fc..9d1baadccff 100644
--- a/test/metabase/queries/models/card_test.clj
+++ b/test/metabase/queries/models/card_test.clj
@@ -879,10 +879,10 @@
(is (= coll-2 (action-collection)))
(t2/update! :model/Card model-id {:collection_id nil})
(is (nil? (action-collection))))
- (testing "attaching an action to another model moves it to that model's collection"
- (t2/update! :model/Card model-id {:collection_id coll-1})
- (t2/update! :model/Action action-id {:model_id other-id})
- (is (= coll-2 (action-collection))))))))
+ (testing "an action can't be attached to another model"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"An action's model can't be changed"
+ (t2/update! :model/Action action-id {:model_id other-id})))
+ (is (nil? (action-collection))))))))
(deftest model-changes-outside-update-card-publish-no-action-events-test
(testing "GHY-4722: a serdes load writes models with t2 directly, and must not publish action events (they would dirty the remote sync ledger during a pull)"