forked from baron/baron-sso
refactor(adminfront): replace sonner with custom use-toast matching devfront UX policy
This commit is contained in:
@@ -20,6 +20,7 @@ import {
|
||||
createUser,
|
||||
fetchTenant,
|
||||
fetchTenants,
|
||||
fetchMe,
|
||||
} from "../../lib/adminApi";
|
||||
import { t } from "../../lib/i18n";
|
||||
|
||||
@@ -78,8 +79,9 @@ function UserCreatePage() {
|
||||
|
||||
// Lock company for tenant_admin
|
||||
React.useEffect(() => {
|
||||
if (profile?.role === "tenant_admin" && profile.companyCode) {
|
||||
setValue("companyCode", profile.companyCode);
|
||||
const p = profile as any;
|
||||
if (p?.role === "tenant_admin" && p.companyCode) {
|
||||
setValue("companyCode", p.companyCode);
|
||||
}
|
||||
}, [profile, setValue]);
|
||||
|
||||
@@ -360,7 +362,7 @@ function UserCreatePage() {
|
||||
id="companyCode"
|
||||
className="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
|
||||
{...register("companyCode")}
|
||||
disabled={profile?.role === "tenant_admin"}
|
||||
disabled={(profile as any)?.role === "tenant_admin"}
|
||||
>
|
||||
<option value="">
|
||||
{t(
|
||||
|
||||
@@ -19,7 +19,7 @@ import {
|
||||
useForm,
|
||||
} from "react-hook-form";
|
||||
import { Link, useNavigate, useParams } from "react-router-dom";
|
||||
import { toast } from "sonner";
|
||||
import { toast } from "../../components/ui/use-toast";
|
||||
import { Button } from "../../components/ui/button";
|
||||
import {
|
||||
Card,
|
||||
@@ -149,7 +149,7 @@ function TenantProfileCard({
|
||||
/>
|
||||
{errors.metadata?.[tenant.id]?.[field.key] && (
|
||||
<p className="text-[10px] text-destructive">
|
||||
{errors.metadata[tenant.id][field.key].message}
|
||||
{(errors.metadata as any)?.[tenant.id]?.[field.key]?.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -248,7 +248,7 @@ function UserDetailPage() {
|
||||
position: user.position || "",
|
||||
jobTitle: user.jobTitle || "",
|
||||
password: "",
|
||||
metadata: user.metadata || {},
|
||||
metadata: (user.metadata || {}) as any,
|
||||
});
|
||||
}
|
||||
}, [user, reset]);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { toast } from "../../components/ui/use-toast";
|
||||
import { useMutation, useQuery } from "@tanstack/react-query";
|
||||
import type { AxiosError } from "axios";
|
||||
import {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import type { AxiosError } from "axios";
|
||||
import { AlertTriangle, FolderTree, Loader2, Search } from "lucide-react";
|
||||
import * as React from "react";
|
||||
import { toast } from "sonner";
|
||||
import { toast } from "../../../components/ui/use-toast";
|
||||
import { Button } from "../../../components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
@@ -140,7 +140,7 @@ export function UserBulkMoveGroupModal({
|
||||
userIds,
|
||||
companyCode: selectedTenantSlug,
|
||||
department: selectedGroupName, // can be empty for "No Department"
|
||||
});
|
||||
} as any);
|
||||
};
|
||||
|
||||
const filteredGroups = React.useMemo(() => {
|
||||
|
||||
@@ -22,7 +22,7 @@ user2@test.com,Kim Cheol Su,,admin,baron,IT,E002`;
|
||||
},
|
||||
});
|
||||
expect(result[1].email).toBe("user2@test.com");
|
||||
expect(result[1].metadata.emp_id).toBe("E002");
|
||||
expect((result[1] as any).metadata.emp_id).toBe("E002");
|
||||
});
|
||||
|
||||
it("should return empty array for empty input", () => {
|
||||
|
||||
Reference in New Issue
Block a user