From af6bc0fb5a243086262e261ceea2dc1bab65d95f Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 28 Mar 2024 10:23:22 -0700 Subject: [PATCH 1/2] Resolve hasura API url again. --- hasura/metadata/tables.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 2f47a4e8f..38dff43fa 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -4242,7 +4242,7 @@ interval_sec: 10 num_retries: 0 timeout_sec: 60 - webhook: https://worktest.home.irony.online + webhook_from_env: HASURA_API_URL headers: - name: event-secret value_from_env: EVENT_SECRET @@ -5761,6 +5761,7 @@ _eq: X-Hasura-User-Id - active: _eq: true + allow_aggregations: true update_permissions: - role: user permission: From fd9575e5a5dc69de5b4f8f0c5b55d92fc63a1f41 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 28 Mar 2024 13:25:13 -0700 Subject: [PATCH 2/2] IO-2702 Adjust concat Signed-off-by: Allan Carr --- .../shop-info.rostatus.component.jsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx index e1d633417..7c90a49a2 100644 --- a/client/src/components/shop-info/shop-info.rostatus.component.jsx +++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx @@ -39,16 +39,23 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) { form.getFieldValue(["md_ro_statuses", "statuses"]) || [] ); - const [productionStatus] = useState( - form - .getFieldValue(["md_ro_statuses", "production_statuses"]) - .concat( - form.getFieldValue(["md_ro_statuses", "additional_board_statuses"]) - ) || [] + const [productionStatus, setProductionStatus] = useState( + ( + form.getFieldValue(["md_ro_statuses", "production_statuses"]) || [] + ).concat( + form.getFieldValue(["md_ro_statuses", "additional_board_statuses"]) || [] + ) || [] ); const handleBlur = () => { setOptions(form.getFieldValue(["md_ro_statuses", "statuses"])); + setProductionStatus( + form + .getFieldValue(["md_ro_statuses", "production_statuses"]) + .concat( + form.getFieldValue(["md_ro_statuses", "additional_board_statuses"]) + ) + ); }; return (