diff --git a/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx b/src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx index e6a7c2630d38293914fe95a8946efdf6d5129ad4..7eabc46b460d1917d38d7cb5ae864bfda3659362 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 f339e89d33efac424758013cfbc4a7b2d9e9fbdc..bb5095e8a5c68a40702bbc1de8dc1f8d1c3802fa 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 63d8c2a8bc6c667d3cfae4c6bdc440e1dce943fc..96b501d6d00da80b3d0ed303dd8f0edc7c38c663 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' })); }