Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PUI] Active user filter #7833

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/frontend/src/defaults/backendMappings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ export const colorMap: { [key: string]: string } = {
success: 'green',
info: 'cyan',
danger: 'red',
primary: 'blue',
secondary: 'gray',
default: 'gray'
};
5 changes: 4 additions & 1 deletion src/frontend/src/forms/BuildForms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ export function useBuildOrderFields({
icon: <IconLink />
},
issued_by: {
icon: <IconUser />
icon: <IconUser />,
filters: {
is_active: true
}
},
responsible: {
icon: <IconUsersGroup />,
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/src/forms/PurchaseOrderForms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ export function usePurchaseOrderFields(): ApiFormFieldSet {
}
},
responsible: {
filters: {
is_active: true
},
icon: <IconUsers />
}
};
Expand Down
9 changes: 8 additions & 1 deletion src/frontend/src/forms/ReturnOrderForms.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { IconUsers } from '@tabler/icons-react';
import { useMemo } from 'react';

export function useReturnOrderLineItemFields({
Expand Down Expand Up @@ -32,7 +33,13 @@ export function useReturnOrderLineItemFields({
price_currency: {},
target_date: {},
notes: {},
link: {}
link: {},
responsible: {
filters: {
is_active: true
},
icon: <IconUsers />
}
};
}, [create, orderId, customerId]);
}
3 changes: 3 additions & 0 deletions src/frontend/src/forms/SalesOrderForms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ export function useReturnOrderFields(): ApiFormFieldSet {
}
},
responsible: {
filters: {
is_active: true
},
icon: <IconUsers />
}
};
Expand Down
6 changes: 6 additions & 0 deletions src/frontend/src/hooks/UseFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading