diff --git a/src/features/districts/ui/AddDistrict.tsx b/src/features/districts/ui/AddDistrict.tsx
index e8f6d19..8ad8998 100644
--- a/src/features/districts/ui/AddDistrict.tsx
+++ b/src/features/districts/ui/AddDistrict.tsx
@@ -212,7 +212,7 @@ export default function AddDistrict({ initialValues, setDialogOpen }: Props) {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/doctors/ui/AddedDoctor.tsx b/src/features/doctors/ui/AddedDoctor.tsx
index e7143cb..ec79ab4 100644
--- a/src/features/doctors/ui/AddedDoctor.tsx
+++ b/src/features/doctors/ui/AddedDoctor.tsx
@@ -455,7 +455,7 @@ const AddedDoctor = ({ initialValues, setDialogOpen }: Props) => {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/objects/ui/AddedObject.tsx b/src/features/objects/ui/AddedObject.tsx
index f8698b0..ead08f1 100644
--- a/src/features/objects/ui/AddedObject.tsx
+++ b/src/features/objects/ui/AddedObject.tsx
@@ -332,7 +332,7 @@ export default function AddedObject({ initialValues, setDialogOpen }: Props) {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/pharmacies/ui/AddedPharmacies.tsx b/src/features/pharmacies/ui/AddedPharmacies.tsx
index 01ddf85..a15fa73 100644
--- a/src/features/pharmacies/ui/AddedPharmacies.tsx
+++ b/src/features/pharmacies/ui/AddedPharmacies.tsx
@@ -419,7 +419,7 @@ const AddedPharmacies = ({ initialValues, setDialogOpen }: Props) => {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/plans/ui/AddedPlan.tsx b/src/features/plans/ui/AddedPlan.tsx
index b84ad9e..873699f 100644
--- a/src/features/plans/ui/AddedPlan.tsx
+++ b/src/features/plans/ui/AddedPlan.tsx
@@ -274,7 +274,7 @@ const AddedPlan = ({ initialValues, setDialogOpen }: Props) => {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/specifications/ui/AddedSpecification.tsx b/src/features/specifications/ui/AddedSpecification.tsx
index 9d54cec..d939f50 100644
--- a/src/features/specifications/ui/AddedSpecification.tsx
+++ b/src/features/specifications/ui/AddedSpecification.tsx
@@ -420,7 +420,7 @@ export const AddedSpecification = ({ initialValues, setDialogOpen }: Props) => {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/tour-plan/ui/AddedTourPlan.tsx b/src/features/tour-plan/ui/AddedTourPlan.tsx
index 635b4c9..0e904a1 100644
--- a/src/features/tour-plan/ui/AddedTourPlan.tsx
+++ b/src/features/tour-plan/ui/AddedTourPlan.tsx
@@ -202,7 +202,7 @@ const AddedTourPlan = ({ initialValues, setDialogOpen }: Props) => {
: "opacity-0",
)}
/>
- {u.first_name} {u.last_name} {u.region.name}
+ {u.first_name} {u.last_name} {u.region?.name}
))}
diff --git a/src/features/users/lib/data.ts b/src/features/users/lib/data.ts
index deca965..9acc231 100644
--- a/src/features/users/lib/data.ts
+++ b/src/features/users/lib/data.ts
@@ -65,11 +65,11 @@ export interface UserListRes {
export interface UserListData {
id: number;
- first_name: string;
- last_name: string;
+ first_name: string | null;
+ last_name: string | null;
region: {
id: number;
- name: string;
+ name: string | null;
};
is_active: boolean;
telegram_id: string;
diff --git a/src/features/users/ui/UserTable.tsx b/src/features/users/ui/UserTable.tsx
index bfea1ad..23aba4a 100644
--- a/src/features/users/ui/UserTable.tsx
+++ b/src/features/users/ui/UserTable.tsx
@@ -150,9 +150,15 @@ const UserTable = ({
)}
{index + 1 + (currentPage - 1) * 20}
- {user.first_name}
- {user.last_name}
- {user.region.name}
+
+ {user.first_name ? user.first_name : "No'malum"}
+
+
+ {user.last_name ? user.last_name : "No'malum"}
+
+
+ {user.region ? user.region.name : "No'malum"}
+