From 09bc06108c13c6b26438b22376b2e29681298bc0 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 8 Aug 2024 11:19:55 +1000 Subject: [PATCH] [PUI] Active user filter (#7833) * Fix status label renderer colors * Add "active" filters to forms * Fix "is_active" filter * Limit filters to active users / owners --- src/frontend/src/defaults/backendMappings.tsx | 2 ++ src/frontend/src/forms/BuildForms.tsx | 5 ++++- src/frontend/src/forms/PurchaseOrderForms.tsx | 3 +++ src/frontend/src/forms/ReturnOrderForms.tsx | 9 ++++++++- src/frontend/src/forms/SalesOrderForms.tsx | 3 +++ src/frontend/src/hooks/UseFilter.tsx | 6 ++++++ 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/defaults/backendMappings.tsx b/src/frontend/src/defaults/backendMappings.tsx index 7ec0a776c2..ddfb396413 100644 --- a/src/frontend/src/defaults/backendMappings.tsx +++ b/src/frontend/src/defaults/backendMappings.tsx @@ -26,5 +26,7 @@ export const colorMap: { [key: string]: string } = { success: 'green', info: 'cyan', danger: 'red', + primary: 'blue', + secondary: 'gray', default: 'gray' }; diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx index 9b98bb04a4..3e8d86adb1 100644 --- a/src/frontend/src/forms/BuildForms.tsx +++ b/src/frontend/src/forms/BuildForms.tsx @@ -107,7 +107,10 @@ export function useBuildOrderFields({ icon: }, issued_by: { - icon: + icon: , + filters: { + is_active: true + } }, responsible: { icon: , diff --git a/src/frontend/src/forms/PurchaseOrderForms.tsx b/src/frontend/src/forms/PurchaseOrderForms.tsx index 102818ddf6..28feda1a41 100644 --- a/src/frontend/src/forms/PurchaseOrderForms.tsx +++ b/src/frontend/src/forms/PurchaseOrderForms.tsx @@ -178,6 +178,9 @@ export function usePurchaseOrderFields(): ApiFormFieldSet { } }, responsible: { + filters: { + is_active: true + }, icon: } }; diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx index c582089ffb..588b91c479 100644 --- a/src/frontend/src/forms/ReturnOrderForms.tsx +++ b/src/frontend/src/forms/ReturnOrderForms.tsx @@ -1,3 +1,4 @@ +import { IconUsers } from '@tabler/icons-react'; import { useMemo } from 'react'; export function useReturnOrderLineItemFields({ @@ -32,7 +33,13 @@ export function useReturnOrderLineItemFields({ price_currency: {}, target_date: {}, notes: {}, - link: {} + link: {}, + responsible: { + filters: { + is_active: true + }, + icon: + } }; }, [create, orderId, customerId]); } diff --git a/src/frontend/src/forms/SalesOrderForms.tsx b/src/frontend/src/forms/SalesOrderForms.tsx index 6b137a367a..02f5a976d5 100644 --- a/src/frontend/src/forms/SalesOrderForms.tsx +++ b/src/frontend/src/forms/SalesOrderForms.tsx @@ -136,6 +136,9 @@ export function useReturnOrderFields(): ApiFormFieldSet { } }, responsible: { + filters: { + is_active: true + }, icon: } }; diff --git a/src/frontend/src/hooks/UseFilter.tsx b/src/frontend/src/hooks/UseFilter.tsx index e319e0c96d..62d63713cb 100644 --- a/src/frontend/src/hooks/UseFilter.tsx +++ b/src/frontend/src/hooks/UseFilter.tsx @@ -81,6 +81,9 @@ export function useProjectCodeFilters() { export function useUserFilters() { return useFilters({ url: apiUrl(ApiEndpoints.user_list), + params: { + is_active: true + }, transform: (item) => ({ value: item.pk, label: item.username @@ -92,6 +95,9 @@ export function useUserFilters() { export function useOwnerFilters() { return useFilters({ url: apiUrl(ApiEndpoints.owner_list), + params: { + is_active: true + }, transform: (item) => ({ value: item.pk, label: item.name