VORKOUT-8 #13

Merged
vlad.dev merged 30 commits from VORKOUT-8 into master 2025-07-02 12:23:44 +05:00
2 changed files with 6 additions and 16 deletions
Showing only changes of commit a936500101 - Show all commits

View File

@ -14,10 +14,9 @@ import {
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useUserSelector } from "@/store/userStore";
import { AllUserResponse, UserCreate as NewUserCreate } from "@/types/user";
import { UserCreate as NewUserCreate } from "@/types/user";
import { UserService } from "@/services/userService";
import { LoadingOutlined } from "@ant-design/icons";
import { useSearchParams } from "react-router-dom";
const { Option } = Select;
@ -33,15 +32,10 @@ const getBase64 = (file: FileType): Promise<string> =>
interface UserCreateProps {
closeDrawer: () => void;
setAccounts: React.Dispatch<React.SetStateAction<AllUserResponse>>;
getUsers: () => Promise<void>;
}
export default function UserCreate({
closeDrawer,
setAccounts,
getUsers,
}: UserCreateProps) {
export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
const user = useUserSelector();
const { t } = useTranslation();
const [previewOpen, setPreviewOpen] = useState(false);
@ -185,7 +179,7 @@ export default function UserCreate({
<Form.Item
label={t("password")}
name="password"
rules={[{ required: true, message: t("passwordMessage") }]}
rules={[{ message: t("passwordMessage") }]}
>
<Input.Password />
</Form.Item>
@ -194,7 +188,7 @@ export default function UserCreate({
label={t("email")}
name="email"
rules={[
{ required: true, message: t("emailMessage") },
{ message: t("emailMessage") },
{ type: "email", message: t("emailErrorMessage") },
]}
>
@ -204,7 +198,7 @@ export default function UserCreate({
<Form.Item
label={t("tenant")}
name="bindTenantId"
rules={[{ required: true, message: t("tenantMessage") }]}
rules={[{ message: t("tenantMessage") }]}
>
<Input />
</Form.Item>

View File

@ -203,11 +203,7 @@ export default function AccountsPage() {
closeDrawer={closeCreateDrawer}
type="create"
>
<UserCreate
getUsers={getUsers}
setAccounts={setAccounts}
closeDrawer={closeCreateDrawer}
/>
<UserCreate getUsers={getUsers} closeDrawer={closeCreateDrawer} />
</ContentDrawer>
<ContentDrawer
login={activeAccount?.login}