diff --git a/frontend/src/app/departments/[id]/page.tsx b/frontend/src/app/departments/[id]/page.tsx index 788f2c54..0b17b411 100644 --- a/frontend/src/app/departments/[id]/page.tsx +++ b/frontend/src/app/departments/[id]/page.tsx @@ -432,7 +432,6 @@ export default function DepartmentDetailPage() { const h = useDepartmentPage(departmentId); const activeMembersCount = h.members.filter((member) => member.is_active).length; - const inactiveMembersCount = h.members.length - activeMembersCount; const roleOptions = h.roles.map((role) => ({ id: role.id, name: role.name })); const isManagementMode = h.userPerms.can_manage || @@ -558,9 +557,6 @@ export default function DepartmentDetailPage() {

О составе

{activeMembersCount} активных - {inactiveMembersCount ? ( - {inactiveMembersCount} неактивных - ) : null} {isManagementMode ? ( Режим управления ) : ( @@ -612,17 +608,6 @@ export default function DepartmentDetailPage() { className="app-input w-full rounded-lg py-2.5 pl-9 pr-3 text-sm" />
-
@@ -646,15 +631,15 @@ export default function DepartmentDetailPage() { ) : (
-

- Участники не найдены -

-

- Измени поисковый запрос или включи показ неактивных связей. -

-
- )} -
+

+ Участники не найдены +

+

+ Измени поисковый запрос. +

+ + )} +
diff --git a/frontend/src/hooks/useDepartmentPage.ts b/frontend/src/hooks/useDepartmentPage.ts index 2f0857a8..60d10e9d 100644 --- a/frontend/src/hooks/useDepartmentPage.ts +++ b/frontend/src/hooks/useDepartmentPage.ts @@ -51,7 +51,6 @@ export type DepartmentPageController = { selectableEmployees: Array<{ id: number; name: string }>; selectedHeadId: number | null; selectedMemberId: number | null; - showInactiveMembers: boolean; userPerms: DepartmentUserPermissions; closeAddMember: () => void; closeDepartmentEditor: () => void; @@ -67,7 +66,6 @@ export type DepartmentPageController = { setRoleDraft: (next: DepartmentRoleDraft | ((current: DepartmentRoleDraft) => DepartmentRoleDraft)) => void; setSelectedHeadId: (id: number | null) => void; setSelectedMemberId: (id: number | null) => void; - setShowInactiveMembers: (value: boolean) => void; submitAddMember: () => Promise; submitHeadChange: () => Promise; submitQuickHeadChange: (headId: number) => Promise; @@ -132,7 +130,6 @@ export function useDepartmentPage(departmentId: number): DepartmentPageControlle const [error, setError] = useState(null); const [pendingKey, setPendingKey] = useState(null); const [membersQuery, setMembersQuery] = useState(""); - const [showInactiveMembers, setShowInactiveMembers] = useState(false); const [editDepartmentOpen, setEditDepartmentOpen] = useState(false); const [departmentDraft, setDepartmentDraft] = useState({ name: "", description: "" }); @@ -234,7 +231,7 @@ export function useDepartmentPage(departmentId: number): DepartmentPageControlle const q = membersQuery.trim().toLowerCase(); return members.filter((item) => { - if (!showInactiveMembers && !item.is_active) { + if (!item.is_active) { return false; } @@ -256,7 +253,7 @@ export function useDepartmentPage(departmentId: number): DepartmentPageControlle roleName.includes(q) ); }); - }, [members, membersQuery, showInactiveMembers]); + }, [members, membersQuery]); const selectableEmployees = useMemo(() => { const activeIds = new Set( @@ -542,7 +539,6 @@ export function useDepartmentPage(departmentId: number): DepartmentPageControlle selectableEmployees, selectedHeadId, selectedMemberId, - showInactiveMembers, userPerms: userPerms || EMPTY_USER_PERMS, closeAddMember, closeDepartmentEditor, @@ -558,7 +554,6 @@ export function useDepartmentPage(departmentId: number): DepartmentPageControlle setRoleDraft, setSelectedHeadId, setSelectedMemberId, - setShowInactiveMembers, submitAddMember, submitHeadChange, submitQuickHeadChange,