diff --git a/web/api.py b/web/api.py index 018414c..e01e102 100644 --- a/web/api.py +++ b/web/api.py @@ -276,14 +276,4 @@ def sub_order_set(username, set_id, sub): op.delete_instance(recursive=True) return ('', 204) - return jsonify({ - "orderSets": [ - { - 'id': op.id, - 'name': op.name, - } - for op - in orders_pool_list(sub.id) - ], - "orderSet": op.to_dict() - }) + return jsonify(op.to_dict()) diff --git a/web/vite/src/OrderSet.tsx b/web/vite/src/OrderSet.tsx index 85fffa8..c3933d8 100644 --- a/web/vite/src/OrderSet.tsx +++ b/web/vite/src/OrderSet.tsx @@ -77,12 +77,15 @@ type FormOrderSet = Omit & { export const OrderSet: React.FC = () => { const navigate = useNavigate(); const { username, set_id } = useParams(); - const loaderData = useLoaderData<{ - orderSets: Pick[]; - orderSet: OrderSet; - }>(); - const orderSet = loaderData?.orderSet; - const orderSets = loaderData?.orderSets || []; + const orderSet = useLoaderData(); + + const [orderSets, setOrderSets] = React.useState([]); + React.useEffect(() => { + fetch(`/api/orders/${username}/sets`) + .then((response) => response.json()) + .then(setOrderSets); + }, [username]); + const [showScheduling, setShowScheduling] = React.useState( orderSet?.scheduled, );