chore: fix biome lint warnings & update Makefile

2026-05-29 13:32:35 +09:00
parent deed33aad2
commit 00b89c04d6
22 changed files with 99 additions and 121 deletions
--- a/adminfront/src/features/users/UserCreatePage.tsx
+++ b/adminfront/src/features/users/UserCreatePage.tsx
@@ -8,7 +8,6 @@ import {
  Plus,
  Save,
  Trash2,
-  Mail,
  X,
 } from "lucide-react";
 import * as React from "react";
@@ -22,7 +21,6 @@ import {
  CardHeader,
  CardTitle,
 } from "../../components/ui/card";
-import { Checkbox } from "../../components/ui/checkbox";
 import {
  Dialog,
  DialogContent,
@@ -184,7 +182,7 @@ function UserCreatePage() {
    if (e.key === "Enter" || e.key === "," || e.key === " ") {
      e.preventDefault();
      const value = newSubEmail.trim().replace(/,/g, "");
-      if (value && value.includes("@") && !currentSubEmails.includes(value)) {
+      if (value?.includes("@") && !currentSubEmails.includes(value)) {
        setValue("metadata.sub_email", [...currentSubEmails, value], {
          shouldDirty: true,
        });
@@ -667,8 +665,7 @@ function UserCreatePage() {
                    onClick={() => {
                      const value = newSubEmail.trim().replace(/,/g, "");
                      if (
-                        value &&
-                        value.includes("@") &&
+                        value?.includes("@") &&
                        !currentSubEmails.includes(value)
                      ) {
                        setValue(
--- a/adminfront/src/features/users/UserDetailPage.tsx
+++ b/adminfront/src/features/users/UserDetailPage.tsx
@@ -35,7 +35,6 @@ import {
  CardHeader,
  CardTitle,
 } from "../../components/ui/card";
-import { Checkbox } from "../../components/ui/checkbox";
 import {
  Dialog,
  DialogContent,
@@ -95,7 +94,10 @@ import { resolvePersonalTenant } from "./utils/personalTenant";

 type UserFormValues = Omit<UserUpdateRequest, "metadata"> & {
  email: string;
-  metadata: Record<string, Record<string, string | number | boolean | string[]> | string[] | undefined> & {
+  metadata: Record<
+    string,
+    Record<string, string | number | boolean | string[]> | string[] | undefined
+  > & {
    sub_email?: string[];
  };
 };
@@ -322,8 +324,8 @@ function UserDetailPage() {
  const userId = params.id ?? "";
  const navigate = useNavigate();
  const queryClient = useQueryClient();
-  const [error, setError] = React.useState<string | null>(null);
-  const [successMsg, setSuccessMsg] = React.useState<string | null>(null);
+  const [_error, _setError] = React.useState<string | null>(null);
+  const [_successMsg, _setSuccessMsg] = React.useState<string | null>(null);
  const [isPasswordResetOpen, setIsPasswordResetOpen] = React.useState(false);
  const [generatedPassword, setGeneratedPassword] = React.useState<
    string | null
@@ -419,7 +421,7 @@ function UserDetailPage() {
    if (e.key === "Enter" || e.key === "," || e.key === " ") {
      e.preventDefault();
      const value = newSubEmail.trim().replace(/,/g, "");
-      if (value && value.includes("@") && !currentSubEmails.includes(value)) {
+      if (value?.includes("@") && !currentSubEmails.includes(value)) {
        setValue("metadata.sub_email", [...currentSubEmails, value], {
          shouldDirty: true,
        });
@@ -595,7 +597,7 @@ function UserDetailPage() {
    );
  };

-  const setPrimaryAppointment = (targetIndex: number) => {
+  const _setPrimaryAppointment = (targetIndex: number) => {
    setAdditionalAppointments((current) =>
      current.map((appointment, index) => ({
        ...appointment,
@@ -793,11 +795,13 @@ function UserDetailPage() {
      sub_email: rawSubEmail,
      ...safeMetadata
    } = cleanMetadata;
-    
+
    // Parse sub_email
    let sub_email: string[] = [];
    if (Array.isArray(rawSubEmail)) {
-      sub_email = rawSubEmail.filter(e => typeof e === 'string' && e.includes("@"));
+      sub_email = rawSubEmail.filter(
+        (e) => typeof e === "string" && e.includes("@"),
+      );
    } else if (typeof rawSubEmail === "string" && rawSubEmail.trim() !== "") {
      sub_email = rawSubEmail
        .split(/[;,\n\r\t]/)
@@ -816,7 +820,7 @@ function UserDetailPage() {
    };
    // email cannot be updated directly via this API in current backend implementation,
    // so we delete it from payload if it spread
-    // @ts-ignore
+    // @ts-expect-error
    delete payload.email;
    payload.role = undefined;

@@ -992,16 +996,21 @@ function UserDetailPage() {
                <Mail size={14} className="text-primary/70" />
                {user.email}
              </div>
-              {Boolean(user.metadata?.sub_email &&
-                Array.isArray(user.metadata.sub_email) &&
-                user.metadata.sub_email.length > 0) && (
-                  <div className="flex items-center gap-1.5 bg-background px-2.5 py-1 rounded-full border">
-                    <Mail size={14} className="text-primary/40" />
-                    <span className="text-[10px] font-bold">
-                      +{Array.isArray(user.metadata?.sub_email) ? user.metadata.sub_email.length : 0}
-                    </span>
-                  </div>
-                )}
+              {Boolean(
+                user.metadata?.sub_email &&
+                  Array.isArray(user.metadata.sub_email) &&
+                  user.metadata.sub_email.length > 0,
+              ) && (
+                <div className="flex items-center gap-1.5 bg-background px-2.5 py-1 rounded-full border">
+                  <Mail size={14} className="text-primary/40" />
+                  <span className="text-[10px] font-bold">
+                    +
+                    {Array.isArray(user.metadata?.sub_email)
+                      ? user.metadata.sub_email.length
+                      : 0}
+                  </span>
+                </div>
+              )}
              {user.phone && (
                <div className="flex items-center gap-1.5 bg-background px-2.5 py-1 rounded-full border">
                  <Shield size={14} className="text-primary/70" />
@@ -1170,8 +1179,7 @@ function UserDetailPage() {
                          onClick={() => {
                            const value = newSubEmail.trim().replace(/,/g, "");
                            if (
-                              value &&
-                              value.includes("@") &&
+                              value?.includes("@") &&
                              !currentSubEmails.includes(value)
                            ) {
                              setValue(
--- a/adminfront/src/features/users/UserListPage.render.test.tsx
+++ b/adminfront/src/features/users/UserListPage.render.test.tsx
@@ -1,5 +1,5 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createI18nMock } from "../../test/i18nMock";
--- a/adminfront/src/features/users/UserListPage.tsx
+++ b/adminfront/src/features/users/UserListPage.tsx
@@ -13,7 +13,6 @@ import {
  ChevronDown,
  ChevronLeft,
  ChevronRight,
-  Download,
  FileDown,
  FileSpreadsheet,
  LayoutDashboard,
@@ -268,7 +267,7 @@ const UserListSearchControls = React.memo(function UserListSearchControls({
 });

 function UserListPage() {
-  const navigate = useNavigate();
+  const _navigate = useNavigate();
  const [page, setPage] = React.useState(1);
  const [search, setSearch] = React.useState("");
  const [selectedCompany, setSelectedCompany] = React.useState<string>("");
@@ -563,7 +562,7 @@ function UserListPage() {
    },
  });

-  const handleApplyBulkStatus = () => {
+  const _handleApplyBulkStatus = () => {
    if (selectedUserIds.length === 0 || !selectedBulkStatus) return;
    bulkUpdateMutation.mutate({
      userIds: selectedUserIds,
@@ -571,7 +570,7 @@ function UserListPage() {
    });
  };

-  const handleApplyBulkPermission = () => {
+  const _handleApplyBulkPermission = () => {
    if (selectedUserIds.length === 0 || !selectedBulkPermission) return;
    bulkUpdateMutation.mutate({
      userIds: selectedUserIds,
@@ -594,7 +593,7 @@ function UserListPage() {
    }
  };

-  const handleDelete = (userId: string, userName: string) => {
+  const _handleDelete = (userId: string, userName: string) => {
    if (
      !window.confirm(
        t(
--- a/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx
+++ b/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx
@@ -19,8 +19,6 @@ import {
  bulkUpdateUsers,
  fetchAllTenants,
  fetchGroups,
-  type GroupSummary,
-  type TenantSummary,
  type UserSummary,
 } from "../../../lib/adminApi";
 import { t } from "../../../lib/i18n";
@@ -49,7 +47,7 @@ export function UserBulkMoveGroupModal({
  const [searchTerm, setSearchTerm] = React.useState("");
  const [acknowledgeWarning, setAcknowledgeWarning] = React.useState(false);

-  const queryClient = useQueryClient();
+  const _queryClient = useQueryClient();

  const { data: tenantsData } = useQuery({
    queryKey: ["tenants", "all"],
--- a/adminfront/src/features/users/orgChartPicker.ts
+++ b/adminfront/src/features/users/orgChartPicker.ts
@@ -102,7 +102,7 @@ export function isHanmacFamilyTenant<T extends TenantFilterTarget>(
  tenants: T[],
  hanmacFamilyTenantId?: string,
 ) {
-  if (!tenant || !tenant.id) return false;
+  if (!tenant?.id) return false;

  const rootTenantId = resolveHanmacFamilyTenantId(
    tenants,