From a56707f0b4bd240466e766dea8e8a33acb4f3c9e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 7 Aug 2024 23:13:01 +0000 Subject: [PATCH 1/4] Fix status label renderer colors --- src/frontend/src/defaults/backendMappings.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/frontend/src/defaults/backendMappings.tsx b/src/frontend/src/defaults/backendMappings.tsx index 7ec0a776c267..ddfb39641341 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' }; From 272a6a929ecda35e211169f17b05cab11610c398 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 7 Aug 2024 23:17:30 +0000 Subject: [PATCH 2/4] Add "active" filters to forms --- src/frontend/src/forms/PurchaseOrderForms.tsx | 3 +++ src/frontend/src/forms/ReturnOrderForms.tsx | 9 ++++++++- src/frontend/src/forms/SalesOrderForms.tsx | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/forms/PurchaseOrderForms.tsx b/src/frontend/src/forms/PurchaseOrderForms.tsx index 102818ddf6c4..844396a35ac7 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: { + active: true + }, icon: } }; diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx index c582089ffb89..2f010426877a 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: { + active: true + }, + icon: + } }; }, [create, orderId, customerId]); } diff --git a/src/frontend/src/forms/SalesOrderForms.tsx b/src/frontend/src/forms/SalesOrderForms.tsx index 6b137a367ae9..78e23046dcb4 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: { + active: true + }, icon: } }; From 9c9a56c5964437b16486d5f294bd4e272d350558 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 7 Aug 2024 23:44:54 +0000 Subject: [PATCH 3/4] Fix "is_active" filter --- src/frontend/src/forms/BuildForms.tsx | 5 ++++- src/frontend/src/forms/PurchaseOrderForms.tsx | 2 +- src/frontend/src/forms/ReturnOrderForms.tsx | 2 +- src/frontend/src/forms/SalesOrderForms.tsx | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx index 9b98bb04a4d8..3e8d86adb14e 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 844396a35ac7..28feda1a4126 100644 --- a/src/frontend/src/forms/PurchaseOrderForms.tsx +++ b/src/frontend/src/forms/PurchaseOrderForms.tsx @@ -179,7 +179,7 @@ export function usePurchaseOrderFields(): ApiFormFieldSet { }, responsible: { filters: { - active: true + is_active: true }, icon: } diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx index 2f010426877a..588b91c479a5 100644 --- a/src/frontend/src/forms/ReturnOrderForms.tsx +++ b/src/frontend/src/forms/ReturnOrderForms.tsx @@ -36,7 +36,7 @@ export function useReturnOrderLineItemFields({ link: {}, responsible: { filters: { - active: true + is_active: true }, icon: } diff --git a/src/frontend/src/forms/SalesOrderForms.tsx b/src/frontend/src/forms/SalesOrderForms.tsx index 78e23046dcb4..02f5a976d5d1 100644 --- a/src/frontend/src/forms/SalesOrderForms.tsx +++ b/src/frontend/src/forms/SalesOrderForms.tsx @@ -137,7 +137,7 @@ export function useReturnOrderFields(): ApiFormFieldSet { }, responsible: { filters: { - active: true + is_active: true }, icon: } From a69c20e7a1619be1eb012e68b8dcc80c34ae4258 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 8 Aug 2024 00:21:00 +0000 Subject: [PATCH 4/4] Limit filters to active users / owners --- src/frontend/src/hooks/UseFilter.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/frontend/src/hooks/UseFilter.tsx b/src/frontend/src/hooks/UseFilter.tsx index e319e0c96d5b..62d63713cb1c 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