Skip to content

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

Move api to shared (#72856)

Fraser73e58e2135d7
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 958d8f17cbe..6147d522878 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -40,7 +40,7 @@ const elements = [
pattern: "frontend/src/metabase-lib/*/**",
}),
createElement({ type: "basic", name: "ui", enforceOutgoing: true }),
- createElement({ type: "basic", name: "api" }),
+ createElement({ type: "shared", name: "api" }),
// shared
createElement({ type: "shared", name: "common", enforceOutgoing: true }),
createElement({ type: "shared", name: "querying" }),
diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
index d63326025d6..03bb6de5429 100644
--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
@@ -11,6 +11,7 @@ import * as Urls from "metabase/utils/urls";
import type { User as UserType } from "metabase-types/api";
import { UserForm } from "../forms/UserForm";
+import { storeTemporaryPassword } from "../people";
interface NewUserModalProps {
onClose: () => void;
@@ -26,17 +27,21 @@ export const NewUserModal = ({
const [createUser] = useCreateUserMutation();
const handleSubmit = async (vals: Partial<UserType>) => {
+ const password = MetabaseSettings.isEmailConfigured()
+ ? undefined
+ : generatePassword();
const user = await createUser({
...vals,
email: vals.email ?? "",
first_name: vals.first_name ?? undefined,
last_name: vals.last_name ?? undefined,
login_attributes: vals.login_attributes || undefined,
- ...(MetabaseSettings.isEmailConfigured()
- ? {}
- : { password: generatePassword() }),
+ ...(password ? { password } : {}),
}).unwrap();
+ if (password) {
+ dispatch(storeTemporaryPassword({ id: user.id, password }));
+ }
dispatch(push(Urls.newUserSuccess(user)));
};
diff --git a/frontend/src/metabase/api/user.ts b/frontend/src/metabase/api/user.ts
index 654fb61aac0..6e4acc35ede 100644
--- a/frontend/src/metabase/api/user.ts
+++ b/frontend/src/metabase/api/user.ts
@@ -1,4 +1,3 @@
-import { storeTemporaryPassword } from "metabase/admin/people/people";
import { userUpdated } from "metabase/redux/user";
import type {
CreateUserRequest,
@@ -58,13 +57,6 @@ export const userApi = Api.injectEndpoints({
listTag("tenant"),
listTag("permissions-group"),
]),
- onQueryStarted: (request, { dispatch, queryFulfilled }) =>
- handleQueryFulfilled(queryFulfilled, (user) => {
- if (request.password) {
- const payload = { id: user.id, password: request.password };
- dispatch(storeTemporaryPassword(payload));
- }
- }),
}),
updatePassword: builder.mutation<void, UpdatePasswordRequest>({
query: ({ id, old_password, password }) => ({
@@ -72,9 +64,6 @@ export const userApi = Api.injectEndpoints({
url: `/api/user/${id}/password`,
body: { old_password, password },
}),
- onQueryStarted: ({ id, password }, { dispatch }) => {
- dispatch(storeTemporaryPassword({ id, password }));
- },
invalidatesTags: (_, error, { id }) =>
invalidateTags(error, [listTag("user"), idTag("user", id)]),
}),