fix: type errors

2026-08-30 01:48:12 +00:00 · 2026-06-23 15:02:25 +03:00
parent 18989c97e6
commit cdfe7c1f5b
27 changed files with 1379 additions and 1377 deletions
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
@@ -14,9 +14,11 @@ import {
  TextInput,
  ActionIcon,
 } from "@mantine/core";
-import { DatePicker } from "@mantine/dates";

-import { FLEET_SELECT_NONE, type FleetFormFieldDef } from "@/pages/fleet/config/resources";
+import {
+  FLEET_SELECT_NONE,
+  type FleetFormFieldDef,
+} from "@/pages/fleet/config/resources";
 import type { FleetRecord } from "@/services/fleet/fleet.service";

 export interface FleetFormDialogProps {
@@ -87,12 +89,19 @@ const FleetFormDialog = ({
      const stringValue =
        typeof value === "string" ? value.trim() : String(value ?? "");

-      if (field.required && (stringValue === "" || stringValue === FLEET_SELECT_NONE)) {
+      if (
+        field.required &&
+        (stringValue === "" || stringValue === FLEET_SELECT_NONE)
+      ) {
        next[field.name] = `${field.label} is required`;
      }

      // Validate date format (YYYY-MM-DD) - DatePicker ensures this
-      if (field.type === "date" && stringValue && stringValue !== FLEET_SELECT_NONE) {
+      if (
+        field.type === "date" &&
+        stringValue &&
+        stringValue !== FLEET_SELECT_NONE
+      ) {
        const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
        if (!dateRegex.test(stringValue)) {
          next[field.name] = `${field.label} must be a valid date`;
@@ -115,7 +124,8 @@ const FleetFormDialog = ({
    const payload = Object.fromEntries(
      Object.entries(values)
        .map(([key, value]) => {
-          if (value === FLEET_SELECT_NONE || value === "") return [key, undefined];
+          if (value === FLEET_SELECT_NONE || value === "")
+            return [key, undefined];
          return [key, value];
        })
        .filter(([, value]) => value !== undefined),
@@ -133,20 +143,34 @@ const FleetFormDialog = ({
          key={field.name}
          label={field.label}
          data={field.options ?? []}
-          value={value == null || value === "" ? (field.noneOption ? FLEET_SELECT_NONE : null) : String(value)}
+          value={
+            value == null || value === ""
+              ? field.noneOption
+                ? FLEET_SELECT_NONE
+                : null
+              : String(value)
+          }
          onChange={(next) =>
            setValues((current) => ({ ...current, [field.name]: next ?? "" }))
          }
          error={error}
          searchable
          disabled={selectOptionsLoading}
-          rightSection={selectOptionsLoading ? <Loader2 size={14} className="animate-spin" /> : undefined}
+          rightSection={
+            selectOptionsLoading ? (
+              <Loader2 size={14} className="animate-spin" />
+            ) : undefined
+          }
        />
      );
    }

    if (field.type === "multiselect") {
-      const arrayValue = Array.isArray(value) ? value : (typeof value === "string" && value ? [value] : []);
+      const arrayValue = Array.isArray(value)
+        ? value
+        : typeof value === "string" && value
+          ? [value]
+          : [];

      return (
        <MultiSelect
@@ -162,7 +186,11 @@ const FleetFormDialog = ({
          searchable
          clearable
          disabled={selectOptionsLoading}
-          rightSection={selectOptionsLoading ? <Loader2 size={14} className="animate-spin" /> : undefined}
+          rightSection={
+            selectOptionsLoading ? (
+              <Loader2 size={14} className="animate-spin" />
+            ) : undefined
+          }
        />
      );
    }
@@ -194,7 +222,10 @@ const FleetFormDialog = ({
          placeholder={field.placeholder}
          value={String(value ?? "")}
          onChange={(e) =>
-            setValues((current) => ({ ...current, [field.name]: e.currentTarget?.value }))
+            setValues((current) => ({
+              ...current,
+              [field.name]: e.currentTarget?.value,
+            }))
          }
          error={error}
          minRows={3}
@@ -221,7 +252,7 @@ const FleetFormDialog = ({
          disabled={field.disabled}
          description={field.description || "Select a date"}
          rightSection={
-            <ActionIcon size="sm" variant="subtle" color="green" pointer={false}>
+            <ActionIcon size="sm" variant="subtle" color="green">
              <Calendar size={16} />
            </ActionIcon>
          }
@@ -250,7 +281,10 @@ const FleetFormDialog = ({
        description={field.description}
        value={String(value ?? "")}
        onChange={(e) =>
-          setValues((current) => ({ ...current, [field.name]: e.currentTarget?.value }))
+          setValues((current) => ({
+            ...current,
+            [field.name]: e.currentTarget?.value,
+          }))
        }
        error={error}
        disabled={field.disabled}
@@ -276,7 +310,11 @@ const FleetFormDialog = ({
          <Button variant="default" onClick={() => onOpenChange(false)}>
            Cancel
          </Button>
-          <Button color="edr-green" loading={isSubmitting} onClick={handleSubmit}>
+          <Button
+            color="edr-green"
+            loading={isSubmitting}
+            onClick={handleSubmit}
+          >
            Save
          </Button>
        </Group>
@@ -285,4 +323,4 @@ const FleetFormDialog = ({
  );
 };

-export default FleetFormDialog;
+export default FleetFormDialog;
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx
@@ -1,5 +1,5 @@
 import { Edit2, Trash2, Eye, Users, MoreVertical } from "lucide-react";
-import { ActionIcon, Group, Menu, MenuItem, Tooltip } from "@mantine/core";
+import { ActionIcon, Menu, MenuItem, Tooltip } from "@mantine/core";
 import { useNavigate } from "react-router-dom";

 import type { FleetResourceConfig } from "@/pages/fleet/config/resources";
@@ -37,30 +37,39 @@ const FleetRecordActions = ({
      <Menu position="bottom-end" withinPortal shadow="md">
        <Menu.Target>
          <Tooltip label="Actions">
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              size="sm"
-            >
+            <ActionIcon variant="subtle" color="gray" size="sm">
              <MoreVertical size={16} strokeWidth={2} />
            </ActionIcon>
          </Tooltip>
        </Menu.Target>
        <Menu.Dropdown>
          {isVehicle && onAssignDriver ? (
-            <MenuItem onClick={() => onAssignDriver(record)} leftSection={<Users size={14} strokeWidth={2} />}>
+            <MenuItem
+              onClick={() => onAssignDriver(record)}
+              leftSection={<Users size={14} strokeWidth={2} />}
+            >
              Assign Driver
            </MenuItem>
          ) : null}
-          <MenuItem onClick={() => onEdit(record)} leftSection={<Edit2 size={14} strokeWidth={2} />}>
+          <MenuItem
+            onClick={() => onEdit(record)}
+            leftSection={<Edit2 size={14} strokeWidth={2} />}
+          >
            Edit
          </MenuItem>
          {showDetail ? (
-            <MenuItem onClick={handleDetail} leftSection={<Eye size={14} strokeWidth={2} />}>
+            <MenuItem
+              onClick={handleDetail}
+              leftSection={<Eye size={14} strokeWidth={2} />}
+            >
              View details
            </MenuItem>
          ) : null}
-          <MenuItem color="red" onClick={() => onRemove(record)} leftSection={<Trash2 size={14} strokeWidth={2} />}>
+          <MenuItem
+            color="red"
+            onClick={() => onRemove(record)}
+            leftSection={<Trash2 size={14} strokeWidth={2} />}
+          >
            {removeLabel}
          </MenuItem>
        </Menu.Dropdown>
@@ -72,30 +81,39 @@ const FleetRecordActions = ({
    <Menu position="bottom-end" withinPortal shadow="md">
      <Menu.Target>
        <Tooltip label="Actions">
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            size="sm"
-          >
+          <ActionIcon variant="subtle" color="gray" size="sm">
            <MoreVertical size={16} strokeWidth={2} />
          </ActionIcon>
        </Tooltip>
      </Menu.Target>
      <Menu.Dropdown>
        {isVehicle && onAssignDriver ? (
-          <MenuItem onClick={() => onAssignDriver(record)} leftSection={<Users size={14} strokeWidth={2} />}>
+          <MenuItem
+            onClick={() => onAssignDriver(record)}
+            leftSection={<Users size={14} strokeWidth={2} />}
+          >
            Assign Driver
          </MenuItem>
        ) : null}
-        <MenuItem onClick={() => onEdit(record)} leftSection={<Edit2 size={14} strokeWidth={2} />}>
+        <MenuItem
+          onClick={() => onEdit(record)}
+          leftSection={<Edit2 size={14} strokeWidth={2} />}
+        >
          Edit
        </MenuItem>
        {showDetail ? (
-          <MenuItem onClick={handleDetail} leftSection={<Eye size={14} strokeWidth={2} />}>
+          <MenuItem
+            onClick={handleDetail}
+            leftSection={<Eye size={14} strokeWidth={2} />}
+          >
            View details
          </MenuItem>
        ) : null}
-        <MenuItem color="red" onClick={() => onRemove(record)} leftSection={<Trash2 size={14} strokeWidth={2} />}>
+        <MenuItem
+          color="red"
+          onClick={() => onRemove(record)}
+          leftSection={<Trash2 size={14} strokeWidth={2} />}
+        >
          {removeLabel}
        </MenuItem>
      </Menu.Dropdown>