From ff9966ed3c3378b76fd6143fc50a9f25eae7b278 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Fri, 14 Feb 2025 14:26:19 +0100
Subject: [PATCH] order is a number
---
.../EditOverlayGroupModal.component.test.tsx | 2 +-
.../EditOverlayGroupModal/EditOverlayGroupModal.component.tsx | 2 +-
src/redux/overlayGroup/overlayGroup.thunks.ts | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx b/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx
index e6a7c263..7eabc46b 100644
--- a/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx
@@ -62,7 +62,7 @@ describe('EditOverlayModal - component', () => {
expect(screen.getByLabelText('Name')).toBeVisible();
expect(screen.getByLabelText('Order')).toBeVisible();
expect(screen.getByTestId('overlay-group-name')).toHaveValue(overlayGroupFixture.name);
- expect(screen.getByTestId('overlay-group-order')).toHaveValue(`${overlayGroupFixture.order}`);
+ expect(screen.getByTestId('overlay-group-order')).toHaveValue(overlayGroupFixture.order);
});
it('should handle input change correctly', () => {
renderComponent({
diff --git a/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.tsx b/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.tsx
index f339e89d..bb5095e8 100644
--- a/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.tsx
+++ b/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.tsx
@@ -32,7 +32,7 @@ export const EditOverlayGroupModal = (): React.ReactNode => {
<label className="mt-5 block text-sm font-semibold" htmlFor="overlayGroupOrder">
Order
<Input
- type="numbe"
+ type="number"
value={order}
onChange={handleOrderChange}
className="mt-2.5 text-sm font-medium"
diff --git a/src/redux/overlayGroup/overlayGroup.thunks.ts b/src/redux/overlayGroup/overlayGroup.thunks.ts
index 63d8c2a8..96b501d6 100644
--- a/src/redux/overlayGroup/overlayGroup.thunks.ts
+++ b/src/redux/overlayGroup/overlayGroup.thunks.ts
@@ -29,7 +29,9 @@ export const getOverlayGroups = createAsyncThunk<OverlayGroup[], void, ThunkConf
pageableSchema(overlayGroupSchema),
);
- return isDataValid ? response.data.content : [];
+ return isDataValid
+ ? response.data.content.sort((groupA, groupB) => groupA.order - groupB.order)
+ : [];
} catch (error) {
return Promise.reject(getError({ error, prefix: 'Failed to fetch overlay groups' }));
}
--
GitLab