From 9a104951f983cf2209cadaf3f09cfca9f96db14b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 24 Nov 2024 05:24:50 +0000 Subject: [PATCH] Fix API to match existing frontend type StatusCodeListInterface --- src/backend/InvenTree/generic/states/api.py | 4 ++-- src/backend/InvenTree/generic/states/serializers.py | 4 ++-- src/frontend/src/components/render/StatusRenderer.tsx | 2 +- src/frontend/src/forms/CommonForms.tsx | 2 +- src/frontend/src/tables/settings/CustomStateTable.tsx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/InvenTree/generic/states/api.py b/src/backend/InvenTree/generic/states/api.py index 2d2870217d..5589e9b3b6 100644 --- a/src/backend/InvenTree/generic/states/api.py +++ b/src/backend/InvenTree/generic/states/api.py @@ -70,7 +70,7 @@ class StatusView(GenericAPIView): if not issubclass(status_class, StatusCode): raise NotImplementedError('`status_class` not a valid StatusCode class') - data = {'class_name': status_class.__name__, 'values': status_class.dict()} + data = {'status_class': status_class.__name__, 'values': status_class.dict()} # Extend with custom values try: @@ -108,7 +108,7 @@ class AllStatusViews(StatusView): status_classes = inheritors(StatusCode) for cls in status_classes: - cls_data = {'class_name': cls.__name__, 'values': cls.dict()} + cls_data = {'status_class': cls.__name__, 'values': cls.dict()} # Extend with custom values for item in cls.custom_values(): diff --git a/src/backend/InvenTree/generic/states/serializers.py b/src/backend/InvenTree/generic/states/serializers.py index 63a057a0fd..dd62e2c0ba 100644 --- a/src/backend/InvenTree/generic/states/serializers.py +++ b/src/backend/InvenTree/generic/states/serializers.py @@ -30,9 +30,9 @@ class GenericStateClassSerializer(serializers.Serializer): class Meta: """Meta class for GenericStateClassSerializer.""" - fields = ['class_name', 'values'] + fields = ['status_class', 'values'] - class_name = serializers.CharField(label=_('Class'), read_only=True) + status_class = serializers.CharField(label=_('Class'), read_only=True) values = serializers.DictField( child=GenericStateValueSerializer(), label=_('Values'), required=True diff --git a/src/frontend/src/components/render/StatusRenderer.tsx b/src/frontend/src/components/render/StatusRenderer.tsx index 843ad574c0..f13d0ce36b 100644 --- a/src/frontend/src/components/render/StatusRenderer.tsx +++ b/src/frontend/src/components/render/StatusRenderer.tsx @@ -13,7 +13,7 @@ export interface StatusCodeInterface { } export interface StatusCodeListInterface { - statusClass: string; + status_class: string; values: { [key: string]: StatusCodeInterface; }; diff --git a/src/frontend/src/forms/CommonForms.tsx b/src/frontend/src/forms/CommonForms.tsx index f49e92f575..ba4b3d09e1 100644 --- a/src/frontend/src/forms/CommonForms.tsx +++ b/src/frontend/src/forms/CommonForms.tsx @@ -30,7 +30,7 @@ export function useCustomStateFields(): ApiFormFieldSet { const options: any[] = []; const valuesList = Object.values(statusCodes.status ?? {}).find( - (value: StatusCodeListInterface) => value.statusClass === statusClass + (value: StatusCodeListInterface) => value.status_class === statusClass ); Object.values(valuesList?.values ?? {}).forEach( diff --git a/src/frontend/src/tables/settings/CustomStateTable.tsx b/src/frontend/src/tables/settings/CustomStateTable.tsx index 7f4ce18bb1..4025053f04 100644 --- a/src/frontend/src/tables/settings/CustomStateTable.tsx +++ b/src/frontend/src/tables/settings/CustomStateTable.tsx @@ -36,7 +36,7 @@ export default function CustomStateTable() { const getLogicalState = useCallback( (group: string, key: number) => { const valuesList = Object.values(statusCodes.status ?? {}).find( - (value: StatusCodeListInterface) => value.statusClass === group + (value: StatusCodeListInterface) => value.status_class === group ); const value = Object.values(valuesList?.values ?? {}).find(