diff --git a/src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx b/src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx
index b8015a4bda66ceedeb92c00b3c2f3276d48bb871..aef70523363da59b07be9b3e557582a676304c90 100644
--- a/src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx
@@ -4,8 +4,8 @@ import {
InitialStoreState,
getReduxWrapperWithStore,
} from '@/utils/testing/getReduxWrapperWithStore';
-import { overlayFixture } from '@/models/fixtures/overlaysFixture';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { overlayFixture, overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
+import { mockNetworkNewAPIResponse, mockNetworkResponse } from '@/utils/mockNetworkResponse';
import { apiPath } from '@/redux/apiPath';
import { HttpStatusCode } from 'axios';
import { DEFAULT_ERROR } from '@/constants/errors';
@@ -16,6 +16,8 @@ import { Modal } from '../Modal.component';
const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
+
jest.mock('../../../../utils/showToast');
const renderComponent = (initialStoreState: InitialStoreState = {}): { store: StoreType } => {
@@ -173,6 +175,17 @@ describe('EditOverlayModal - component', () => {
.onPatch(apiPath.updateOverlay(overlayFixture.idObject))
.reply(HttpStatusCode.Ok, overlayFixture);
+ const page = {
+ ...overlaysPageFixture,
+ data: [overlayFixture],
+ };
+
+ mockedAxiosNewClient
+ .onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
+ .reply(HttpStatusCode.Ok, page);
+
+ // eslint-disable-next-line no-console
+ console.log(overlayFixture);
const saveButton = screen.getByTestId('save-button');
expect(saveButton).toBeVisible();
await act(() => {
diff --git a/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx b/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx
index c60246b26b343b9b84f7d27022dac2ae7547fa3d..909b4195d31d050bb12bb3b0010996eb51a3696a 100644
--- a/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx
@@ -5,16 +5,18 @@ import {
getReduxWrapperWithStore,
} from '@/utils/testing/getReduxWrapperWithStore';
import { act } from 'react-dom/test-utils';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse, mockNetworkResponse } from '@/utils/mockNetworkResponse';
import { apiPath } from '@/redux/apiPath';
import { HttpStatusCode } from 'axios';
import { loginFixture } from '@/models/fixtures/loginFixture';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { MODAL_INITIAL_STATE_MOCK } from '@/redux/modal/modal.mock';
import { userFixture } from '@/models/fixtures/userFixture';
+import { ZERO } from '@/constants/common';
import { LoginModal } from './LoginModal.component';
const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
const renderComponent = (initialStoreState: InitialStoreState = {}): { store: StoreType } => {
const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState);
@@ -31,12 +33,15 @@ const renderComponent = (initialStoreState: InitialStoreState = {}): { store: St
);
};
-const testOverlaysFixture = overlaysFixture.map(overlay => {
- return {
- ...overlay,
- publicOverlay: false,
- };
-});
+const testOverlaysPageFixture = {
+ ...overlaysPageFixture,
+ content: [
+ {
+ ...overlaysPageFixture.content[ZERO],
+ publicOverlay: false,
+ },
+ ],
+};
describe('LoginModal - component', () => {
test('renders LoginModal component', () => {
@@ -79,14 +84,14 @@ describe('LoginModal - component', () => {
it('should fetch user overlays when login is successful', async () => {
mockedAxiosClient.onPost(apiPath.postLogin()).reply(HttpStatusCode.Ok, loginFixture);
mockedAxiosClient.onGet(apiPath.user(loginFixture.login)).reply(HttpStatusCode.Ok, userFixture);
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
creator: loginFixture.login,
publicOverlay: false,
}),
)
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent();
const loginInput = screen.getByLabelText(/login/i);
@@ -104,7 +109,7 @@ describe('LoginModal - component', () => {
});
expect(store.getState().overlays.userOverlays.loading).toBe('succeeded');
- expect(store.getState().overlays.userOverlays.data).toEqual(testOverlaysFixture);
+ expect(store.getState().overlays.userOverlays.data).toEqual(testOverlaysPageFixture.content);
});
it('should display loggedInMenuModal after successful login as admin', async () => {
mockedAxiosClient.onPost(apiPath.postLogin()).reply(HttpStatusCode.Ok, loginFixture);
@@ -117,14 +122,14 @@ describe('LoginModal - component', () => {
},
],
});
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
creator: loginFixture.login,
publicOverlay: false,
}),
)
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
@@ -156,14 +161,14 @@ describe('LoginModal - component', () => {
},
],
});
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
creator: loginFixture.login,
publicOverlay: false,
}),
)
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
@@ -187,14 +192,14 @@ describe('LoginModal - component', () => {
it('should close modal after successful login as user', async () => {
mockedAxiosClient.onPost(apiPath.postLogin()).reply(HttpStatusCode.Ok, loginFixture);
mockedAxiosClient.onGet(apiPath.user(loginFixture.login)).reply(HttpStatusCode.Ok, userFixture);
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
creator: loginFixture.login,
publicOverlay: false,
}),
)
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
diff --git a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
index 802c56a2b8b76ee3a34fc80bc59c2dcafced0a9b..8f8c45e902a0d5c6fd127fc85acb94d792c06312 100644
--- a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
+++ b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
@@ -89,7 +89,7 @@ describe('SearchBar - component', () => {
const { store } = renderComponent({
reactions: {
...INITIAL_STORE_STATE_MOCK.reactions,
- data: newReactionsFixture,
+ data: newReactionsFixture.content,
},
});
const input = screen.getByTestId<HTMLInputElement>('search-input');
diff --git a/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/UserOverlayForm.component.test.tsx b/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/UserOverlayForm.component.test.tsx
index d800a3a2a27b75bc29fca7f30aa1a528dda3161f..359431504b60ef299f185210fa1cf741b44d1c03 100644
--- a/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/UserOverlayForm.component.test.tsx
+++ b/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/UserOverlayForm.component.test.tsx
@@ -10,13 +10,13 @@ import { AppDispatch, RootState, StoreType } from '@/redux/store';
import { drawerOverlaysStepOneFixture } from '@/redux/drawer/drawerFixture';
import { MockStoreEnhanced } from 'redux-mock-store';
import { getReduxStoreWithActionsListener } from '@/utils/testing/getReduxStoreActionsListener';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse, mockNetworkResponse } from '@/utils/mockNetworkResponse';
import { HttpStatusCode } from 'axios';
import { apiPath } from '@/redux/apiPath';
import {
createdOverlayFileFixture,
createdOverlayFixture,
- overlaysFixture,
+ overlaysPageFixture,
uploadedOverlayFileContentFixture,
} from '@/models/fixtures/overlaysFixture';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
@@ -27,6 +27,7 @@ import { UserOverlayForm } from './UserOverlayForm.component';
jest.mock('../../../../../utils/showToast');
const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
const renderComponent = (initialStore?: InitialStoreState): { store: StoreType } => {
const { Wrapper, store } = getReduxWrapperWithStore(initialStore);
@@ -59,12 +60,15 @@ const renderComponentWithActionListener = (
);
};
-const testOverlaysFixture = overlaysFixture.map(overlay => {
- return {
- ...overlay,
- publicOverlay: false,
- };
-});
+const testOverlaysPageFixture = {
+ ...overlaysPageFixture,
+ content: [
+ {
+ ...overlaysPageFixture.content[0],
+ publicOverlay: false,
+ },
+ ],
+};
describe('UserOverlayForm - Component', () => {
beforeEach(() => {
@@ -220,9 +224,9 @@ describe('UserOverlayForm - Component', () => {
.onPost(apiPath.createOverlay(projectFixture.projectId))
.reply(HttpStatusCode.Ok, createdOverlayFixture);
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent({
user: {
@@ -265,7 +269,12 @@ describe('UserOverlayForm - Component', () => {
const refetchedUserOverlays = store.getState().overlays.userOverlays.data;
await waitFor(() => {
- expect(refetchedUserOverlays).toEqual(testOverlaysFixture);
+ // eslint-disable-next-line no-console
+ console.log(refetchedUserOverlays);
+ // eslint-disable-next-line no-console
+ console.log(testOverlaysPageFixture.content);
+
+ expect(refetchedUserOverlays).toEqual(testOverlaysPageFixture.content);
});
});
it('should show toast after successful creating user overlays', async () => {
@@ -281,9 +290,9 @@ describe('UserOverlayForm - Component', () => {
.onPost(apiPath.createOverlay(projectFixture.projectId))
.reply(HttpStatusCode.Ok, createdOverlayFixture);
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
- .reply(HttpStatusCode.Ok, testOverlaysFixture);
+ .reply(HttpStatusCode.Ok, testOverlaysPageFixture);
const { store } = renderComponent({
user: {
diff --git a/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/hooks/useUserOverlayForm.ts b/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/hooks/useUserOverlayForm.ts
index 5229c9fa0cb374030ed3d5ae294d07d0062f5331..7e2bb34ee0302432ceede4ff3867147cb8beaf08 100644
--- a/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/hooks/useUserOverlayForm.ts
+++ b/src/components/Map/Drawer/OverlaysDrawer/UserOverlayForm/hooks/useUserOverlayForm.ts
@@ -100,8 +100,12 @@ export const useUserOverlayForm = (): ReturnType => {
filename = 'unknown.txt'; // Elements list is sent to the backend as a file, so we need to create a filename for the elements list.
}
+ // eslint-disable-next-line no-console
+ console.log('x1');
if (!overlayContent || !projectId || !name) return;
+ // eslint-disable-next-line no-console
+ console.log('x2');
dispatch(
addOverlay({
content: overlayContent,
@@ -112,12 +116,24 @@ export const useUserOverlayForm = (): ReturnType => {
type: type.id,
}),
);
+ // eslint-disable-next-line no-console
+ console.log('x3');
setName('');
+ // eslint-disable-next-line no-console
+ console.log('x3');
setDescription('');
+ // eslint-disable-next-line no-console
+ console.log('x4');
setElementsList('');
+ // eslint-disable-next-line no-console
+ console.log('x5');
setOverlayContent('');
+ // eslint-disable-next-line no-console
+ console.log('x6');
setUploadedFile(null);
+ // eslint-disable-next-line no-console
+ console.log('x7');
};
return {
diff --git a/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.component.test.tsx b/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.component.test.tsx
index 3e3df316d994e237f0f3ed6be3010e332467816e..6cc8c8eac4473e6a2a4c5d66e228419a6880340e 100644
--- a/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.component.test.tsx
+++ b/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.component.test.tsx
@@ -5,18 +5,18 @@ import {
InitialStoreState,
getReduxWrapperWithStore,
} from '@/utils/testing/getReduxWrapperWithStore';
-import { overlayFixture, overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlayFixture, overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { apiPath } from '@/redux/apiPath';
import { DEFAULT_ERROR } from '@/constants/errors';
import { act } from 'react-dom/test-utils';
import { BASE_API_URL } from '@/constants';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse } from '@/utils/mockNetworkResponse';
import { HttpStatusCode } from 'axios';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
import { MODAL_INITIAL_STATE_MOCK } from '@/redux/modal/modal.mock';
import { UserOverlaysWithoutGroup } from './UserOverlaysWithoutGroup.component';
-const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
const renderComponent = (initialStoreState: InitialStoreState = {}): { store: StoreType } => {
const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState);
@@ -35,9 +35,9 @@ const renderComponent = (initialStoreState: InitialStoreState = {}): { store: St
describe('UserOverlaysWithoutGroup - component', () => {
it('should render list of overlays', async () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
renderComponent({
user: {
authenticated: true,
@@ -50,7 +50,7 @@ describe('UserOverlaysWithoutGroup - component', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -65,16 +65,16 @@ describe('UserOverlaysWithoutGroup - component', () => {
withoutGroupTitle.click();
});
- for (let index = 0; index < overlaysFixture.length; index += 1) {
- const overlay = overlaysFixture[index];
+ for (let index = 0; index < overlaysPageFixture.content.length; index += 1) {
+ const overlay = overlaysPageFixture.content[index];
expect(screen.getByText(overlay.name)).toBeVisible();
}
});
it('should display loading message if fetching user overlays is pending', async () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
renderComponent({
user: {
@@ -111,7 +111,7 @@ describe('UserOverlaysWithoutGroup - component', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -140,9 +140,15 @@ describe('UserOverlaysWithoutGroup - component', () => {
expect(screen.getByText('Edit')).toBeVisible();
});
it('should display overlay description on info icon hover/click', async () => {
- mockedAxiosClient
+ const page = {
+ ...overlaysPageFixture,
+ data: [overlayFixture],
+ };
+
+ mockedAxiosNewClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
- .reply(HttpStatusCode.Ok, [overlayFixture]);
+ .reply(HttpStatusCode.Ok, page);
+
renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
user: {
@@ -195,7 +201,7 @@ describe('UserOverlaysWithoutGroup - component', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
diff --git a/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/hooks/useUserOverlays.test.ts b/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/hooks/useUserOverlays.test.ts
index e7b61b7bb654d8ccc8074d56a5f213612ec13399..f8de514a0661d42c32c737b576e7aa000776330d 100644
--- a/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/hooks/useUserOverlays.test.ts
+++ b/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/hooks/useUserOverlays.test.ts
@@ -2,15 +2,15 @@
import { getReduxStoreWithActionsListener } from '@/utils/testing/getReduxStoreActionsListener';
import { renderHook } from '@testing-library/react';
import { DEFAULT_ERROR } from '@/constants/errors';
-import { overlayFixture, overlaysFixture } from '@/models/fixtures/overlaysFixture';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { overlayFixture, overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
+import { mockNetworkNewAPIResponse } from '@/utils/mockNetworkResponse';
import { apiPath } from '@/redux/apiPath';
import { HttpStatusCode } from 'axios';
import { act } from 'react-dom/test-utils';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
import { useUserOverlays } from './useUserOverlays';
-const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
describe('useUserOverlays', () => {
it('should not fetch user overlays on mount if login does not exist', async () => {
@@ -41,14 +41,14 @@ describe('useUserOverlays', () => {
expect(userOverlaysList).toEqual([]);
});
it('should store fetched user overlays to userOverlaysList state', () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
publicOverlay: false,
creator: 'test',
}),
)
- .reply(HttpStatusCode.Ok, overlaysFixture);
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
const { Wrapper } = getReduxStoreWithActionsListener({
user: {
@@ -62,7 +62,7 @@ describe('useUserOverlays', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -77,19 +77,24 @@ describe('useUserOverlays', () => {
wrapper: Wrapper,
});
- expect(userOverlaysList).toEqual(overlaysFixture);
+ expect(userOverlaysList).toEqual(overlaysPageFixture.content);
});
it('should move user overlay list item on order change', async () => {
const FIRST_USER_OVERLAY = overlayFixture;
const SECOND_USER_OVERLAY = overlayFixture;
- mockedAxiosClient
+
+ const page = {
+ ...overlaysPageFixture,
+ data: [FIRST_USER_OVERLAY, SECOND_USER_OVERLAY],
+ };
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
publicOverlay: false,
creator: 'test',
}),
)
- .reply(HttpStatusCode.Ok, [FIRST_USER_OVERLAY, SECOND_USER_OVERLAY]);
+ .reply(HttpStatusCode.Ok, page);
const { Wrapper } = getReduxStoreWithActionsListener({
user: {
@@ -127,14 +132,20 @@ describe('useUserOverlays', () => {
it('calls updateOverlays on calling updateUserOverlaysOrder', async () => {
const FIRST_USER_OVERLAY = { ...overlayFixture, order: 1, idObject: 12 };
const SECOND_USER_OVERLAY = { ...overlayFixture, order: 2, idObject: 92 };
- mockedAxiosClient
+
+ const page = {
+ ...overlaysPageFixture,
+ data: [FIRST_USER_OVERLAY, SECOND_USER_OVERLAY],
+ };
+
+ mockedAxiosNewClient
.onGet(
apiPath.getAllUserOverlaysByCreatorQuery({
publicOverlay: false,
creator: 'test',
}),
)
- .reply(HttpStatusCode.Ok, [FIRST_USER_OVERLAY, SECOND_USER_OVERLAY]);
+ .reply(HttpStatusCode.Ok, page);
const { Wrapper, store } = getReduxStoreWithActionsListener({
user: {
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.test.tsx
index a217830adf2ec4c1e922d330ffcfaca56aa6d094..61c33f6c8b7ecb9f02939d0a2a766ded7cd65d1f 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.test.tsx
@@ -332,7 +332,7 @@ describe('BioEntitiesPinsListItem - component ', () => {
},
reactions: {
...INITIAL_STORE_STATE_MOCK.reactions,
- data: newReactionsFixture,
+ data: newReactionsFixture.content,
},
},
);
diff --git a/src/models/fixtures/overlaysFixture.ts b/src/models/fixtures/overlaysFixture.ts
index f8766b2ee6b6d473312dd6361cf95cfc07e5e89e..efb684cac4793c556b1ff2c07959336561093fda 100644
--- a/src/models/fixtures/overlaysFixture.ts
+++ b/src/models/fixtures/overlaysFixture.ts
@@ -1,7 +1,7 @@
import { ZOD_SEED } from '@/constants';
-import { z } from 'zod';
// eslint-disable-next-line import/no-extraneous-dependencies
import { createFixture } from 'zod-fixture';
+import { pageableSchema } from '@/models/pageableSchema';
import {
createdOverlayFileSchema,
createdOverlaySchema,
@@ -9,7 +9,7 @@ import {
uploadedOverlayFileContentSchema,
} from '../mapOverlay';
-export const overlaysFixture = createFixture(z.array(mapOverlay), {
+export const overlaysPageFixture = createFixture(pageableSchema(mapOverlay), {
seed: ZOD_SEED,
array: { min: 2, max: 2 },
});
@@ -29,3 +29,8 @@ export const uploadedOverlayFileContentFixture = createFixture(uploadedOverlayFi
export const createdOverlayFixture = createFixture(createdOverlaySchema, {
seed: ZOD_SEED,
});
+
+export const emptyPageFixture = createFixture(pageableSchema(mapOverlay), {
+ seed: ZOD_SEED,
+ array: { min: 0, max: 0 },
+});
diff --git a/src/models/pageableSchema.ts b/src/models/pageableSchema.ts
index 94c544ee3909ae23cd73b48f3ddb4e9da1383820..9ec3a540feba76b54ba5dc6cf721568d6d746fc8 100644
--- a/src/models/pageableSchema.ts
+++ b/src/models/pageableSchema.ts
@@ -1,7 +1,8 @@
import { z } from 'zod';
import { ZodTypeAny } from 'zod/lib/types';
-export const pageableSchema = <T extends ZodTypeAny>(type: T): ZodTypeAny =>
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export const pageableSchema = <T extends ZodTypeAny>(type: T) =>
z.object({
totalPages: z.number().nonnegative(),
totalElements: z.number().nonnegative(),
diff --git a/src/redux/apiPath.ts b/src/redux/apiPath.ts
index 7daee91c4f21af65b834152710694424093d4c93..fa826b6a690c630591a171db2e29e8931a0aded6 100644
--- a/src/redux/apiPath.ts
+++ b/src/redux/apiPath.ts
@@ -69,7 +69,7 @@ export const apiPath = {
getAllOverlaysByProjectIdQuery: (
projectId: string,
{ publicOverlay }: { publicOverlay: boolean },
- ): string => `projects/${projectId}/overlays/?publicOverlay=${String(publicOverlay)}`,
+ ): string => `projects/${projectId}/overlays/?isPublic=${String(publicOverlay)}`,
getAllBackgroundsByProjectIdQuery: (projectId: string): string =>
`projects/${projectId}/backgrounds/`,
getProjectById: (projectId: string): string => `projects/${projectId}`,
@@ -98,7 +98,9 @@ export const apiPath = {
publicOverlay: boolean;
creator: string;
}): string =>
- `projects/${PROJECT_ID}/overlays/?creator=${creator}&publicOverlay=${String(publicOverlay)}`,
+ `projects/${PROJECT_ID}/overlays/?size=10000&creator=${creator}&isPublic=${String(
+ publicOverlay,
+ )}`,
updateOverlay: (overlayId: number): string => `projects/${PROJECT_ID}/overlays/${overlayId}/`,
removeOverlay: (overlayId: number): string => `projects/${PROJECT_ID}/overlays/${overlayId}/`,
downloadElementsCsv: (): string =>
diff --git a/src/redux/overlays/overlays.reducers.test.ts b/src/redux/overlays/overlays.reducers.test.ts
index 1c4cada35a94834d7b670696893c106d237f9106..fda71acd1483388e04977accefca6ea9c2d1b141 100644
--- a/src/redux/overlays/overlays.reducers.test.ts
+++ b/src/redux/overlays/overlays.reducers.test.ts
@@ -4,14 +4,14 @@ import {
createdOverlayFileFixture,
createdOverlayFixture,
overlayFixture,
- overlaysFixture,
+ overlaysPageFixture,
uploadedOverlayFileContentFixture,
} from '@/models/fixtures/overlaysFixture';
import {
ToolkitStoreWithSingleSlice,
createStoreInstanceUsingSliceReducer,
} from '@/utils/createStoreInstanceUsingSliceReducer';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse, mockNetworkResponse } from '@/utils/mockNetworkResponse';
import { HttpStatusCode } from 'axios';
import { waitFor } from '@testing-library/react';
import { unwrapResult } from '@reduxjs/toolkit';
@@ -27,6 +27,7 @@ import { OverlaysState } from './overlays.types';
import { ADD_OVERLAY_MOCK } from './overlays.mock';
const mockedAxiosClient = mockNetworkResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
const INITIAL_STATE: OverlaysState = {
data: [],
@@ -63,9 +64,9 @@ describe('overlays reducer', () => {
expect(overlaysReducer(undefined, action)).toEqual(INITIAL_STATE);
});
it('should update store after successful getAllPublicOverlaysByProjectId query', async () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
const { type } = await store.dispatch(getAllPublicOverlaysByProjectId(PROJECT_ID));
const { data, loading, error } = store.getState().overlays;
@@ -73,11 +74,11 @@ describe('overlays reducer', () => {
expect(type).toBe('overlays/getAllPublicOverlaysByProjectId/fulfilled');
expect(loading).toEqual('succeeded');
expect(error).toEqual({ message: '', name: '' });
- expect(data).toEqual(overlaysFixture);
+ expect(data).toEqual(overlaysPageFixture.content);
});
it('should update store after failed getAllPublicOverlaysByProjectId query', async () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
.reply(HttpStatusCode.NotFound, []);
@@ -94,9 +95,9 @@ describe('overlays reducer', () => {
});
it('should update store on loading getAllPublicOverlaysByProjectId query', async () => {
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
const actionPromise = store.dispatch(getAllPublicOverlaysByProjectId(PROJECT_ID));
@@ -107,7 +108,7 @@ describe('overlays reducer', () => {
actionPromise.then(() => {
const { data: dataPromiseFulfilled, loading: promiseFulfilled } = store.getState().overlays;
- expect(dataPromiseFulfilled).toEqual(overlaysFixture);
+ expect(dataPromiseFulfilled).toEqual(overlaysPageFixture.content);
expect(promiseFulfilled).toEqual('succeeded');
});
});
diff --git a/src/redux/overlays/overlays.thunks.ts b/src/redux/overlays/overlays.thunks.ts
index 389da3066415557b1c8f02aa7ec6395cf9ff3172..087d5117629969a32d58beb8aa3087270a812cd3 100644
--- a/src/redux/overlays/overlays.thunks.ts
+++ b/src/redux/overlays/overlays.thunks.ts
@@ -5,8 +5,8 @@ import {
mapOverlay,
uploadedOverlayFileContentSchema,
} from '@/models/mapOverlay';
-import { axiosInstance } from '@/services/api/utils/axiosInstance';
-import { CreatedOverlay, CreatedOverlayFile, MapOverlay } from '@/types/models';
+import { axiosInstance, axiosInstanceNewAPI } from '@/services/api/utils/axiosInstance';
+import { CreatedOverlay, CreatedOverlayFile, MapOverlay, PageOf } from '@/types/models';
import { validateDataUsingZodSchema } from '@/utils/validateDataUsingZodSchema';
import { createAsyncThunk } from '@reduxjs/toolkit';
import { z } from 'zod';
@@ -16,6 +16,7 @@ import { ThunkConfig } from '@/types/store';
import { BASE_API_URL } from '@/constants';
import { getError } from '@/utils/error-report/getError';
import axios from 'axios';
+import { pageableSchema } from '@/models/pageableSchema';
import { apiPath } from '../apiPath';
import {
CHUNK_SIZE,
@@ -35,13 +36,13 @@ export const getAllPublicOverlaysByProjectId = createAsyncThunk<MapOverlay[], st
'overlays/getAllPublicOverlaysByProjectId',
async (projectId: string) => {
try {
- const response = await axiosInstance.get<MapOverlay[]>(
+ const response = await axiosInstanceNewAPI.get<PageOf<MapOverlay>>(
apiPath.getAllOverlaysByProjectIdQuery(projectId, { publicOverlay: true }),
);
- const isDataValid = validateDataUsingZodSchema(response.data, z.array(mapOverlay));
+ const isDataValid = validateDataUsingZodSchema(response.data, pageableSchema(mapOverlay));
- return isDataValid ? response.data : [];
+ return isDataValid ? response.data.content : [];
} catch (error) {
return Promise.reject(getError({ error, prefix: OVERLAYS_FETCHING_ERROR_PREFIX }));
}
@@ -54,9 +55,14 @@ export const getAllUserOverlaysByCreator = createAsyncThunk<MapOverlay[], void,
try {
const state = getState() as RootState;
const creator = state.user.login;
+ // eslint-disable-next-line no-console
+ console.log('z1');
if (!creator) return [];
- const response = await axiosInstance<MapOverlay[]>(
+ // eslint-disable-next-line no-console
+ console.log('z2');
+
+ const response = await axiosInstanceNewAPI<PageOf<MapOverlay>>(
apiPath.getAllUserOverlaysByCreatorQuery({
creator,
publicOverlay: false,
@@ -66,17 +72,25 @@ export const getAllUserOverlaysByCreator = createAsyncThunk<MapOverlay[], void,
},
);
- const isDataValid = validateDataUsingZodSchema(response.data, z.array(mapOverlay));
+ // eslint-disable-next-line no-console
+ console.log('z3');
+
+ const isDataValid = validateDataUsingZodSchema(response.data, pageableSchema(mapOverlay));
const sortByOrder = (userOverlayA: MapOverlay, userOverlayB: MapOverlay): number => {
if (userOverlayA.order > userOverlayB.order) return 1;
return -1;
};
- const sortedUserOverlays = response.data
+ // eslint-disable-next-line no-console
+ console.log('z4', response.data.content);
+
+ const sortedUserOverlays = response.data.content
.sort(sortByOrder)
.filter(overlay => !overlay.publicOverlay);
+ // eslint-disable-next-line no-console
+ console.log('z5', isDataValid, sortedUserOverlays);
return isDataValid ? sortedUserOverlays : [];
} catch (error) {
return Promise.reject(getError({ error, prefix: USER_OVERLAYS_FETCHING_ERROR_PREFIX }));
@@ -200,16 +214,22 @@ export const addOverlay = createAsyncThunk<undefined, AddOverlayArgs, ThunkConfi
// eslint-disable-next-line consistent-return
) => {
try {
+ // eslint-disable-next-line no-console
+ console.log('y0');
const createdFile = await createFile({
filename,
content,
});
+ // eslint-disable-next-line no-console
+ console.log('y1');
await uploadContent({
createdFile,
overlayContent: content,
});
+ // eslint-disable-next-line no-console
+ console.log('y2');
await creteOverlay({
createdFile,
description,
@@ -218,9 +238,15 @@ export const addOverlay = createAsyncThunk<undefined, AddOverlayArgs, ThunkConfi
projectId,
});
+ // eslint-disable-next-line no-console
+ console.log('y3');
await dispatch(getAllUserOverlaysByCreator());
+ // eslint-disable-next-line no-console
+ console.log('y4');
showToast({ type: 'success', message: USER_OVERLAY_ADD_SUCCESS_MESSAGE });
+ // eslint-disable-next-line no-console
+ console.log('y5');
} catch (error) {
if (axios.isAxiosError(error) && error.code === 'ERR_BAD_REQUEST') {
const data = error.response?.data;
diff --git a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts
index c0f486b95bf1c15209090f56863fffdbeb120b73..efaf233e0d08240b2ae6a68a7618d94bf354a23a 100644
--- a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts
+++ b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts
@@ -1,12 +1,12 @@
import { DEFAULT_ERROR } from '@/constants/errors';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
import { RootState, store } from '@/redux/store';
import { OVERLAY_BIO_ENTITY_INITIAL_STATE_MOCK } from '@/redux/overlayBioEntity/overlayBioEntity.mock';
import { DataOverlay } from '@/services/pluginsManager/map/overlays/types/DataOverlay';
import { getVisibleDataOverlays } from './getVisibleDataOverlays';
-const ACTIVE_OVERLAYS_IDS = overlaysFixture.map(overlay => overlay.idObject);
+const ACTIVE_OVERLAYS_IDS = overlaysPageFixture.content.map(overlay => overlay.idObject);
describe('getVisibleDataOverlays', () => {
afterEach(() => {
@@ -22,7 +22,7 @@ describe('getVisibleDataOverlays', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -36,7 +36,7 @@ describe('getVisibleDataOverlays', () => {
);
expect(getVisibleDataOverlays()).toEqual(
- overlaysFixture.map(overlay => new DataOverlay(overlay)),
+ overlaysPageFixture.content.map(overlay => new DataOverlay(overlay)),
);
});
diff --git a/src/services/pluginsManager/map/overlays/hideDataOverlay.test.ts b/src/services/pluginsManager/map/overlays/hideDataOverlay.test.ts
index 3f9a88e455f7bebdfba51701e205166396102be8..3d17efabea63062b49966bb46dbe25d59cbbc4db 100644
--- a/src/services/pluginsManager/map/overlays/hideDataOverlay.test.ts
+++ b/src/services/pluginsManager/map/overlays/hideDataOverlay.test.ts
@@ -1,6 +1,6 @@
/* eslint-disable no-magic-numbers */
import { RootState, store } from '@/redux/store';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { DEFAULT_ERROR } from '@/constants/errors';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
import { OVERLAY_BIO_ENTITY_INITIAL_STATE_MOCK } from '@/redux/overlayBioEntity/overlayBioEntity.mock';
@@ -8,7 +8,7 @@ import { hideDataOverlay } from './hideDataOverlay';
import { PluginsEventBus } from '../../pluginsEventBus';
import { ERROR_OVERLAY_ID_NOT_ACTIVE, ERROR_OVERLAY_ID_NOT_FOUND } from '../../errorMessages';
-const OVERLAY_ID = overlaysFixture[0].idObject;
+const OVERLAY_ID = overlaysPageFixture.content[0].idObject;
describe('hideDataOverlay', () => {
afterEach(() => {
@@ -22,7 +22,7 @@ describe('hideDataOverlay', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -40,7 +40,7 @@ describe('hideDataOverlay', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -61,7 +61,7 @@ describe('hideDataOverlay', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -86,7 +86,7 @@ describe('hideDataOverlay', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -97,6 +97,9 @@ describe('hideDataOverlay', () => {
hideDataOverlay(OVERLAY_ID);
- expect(pluginDispatchEvent).toHaveBeenCalledWith('onHideOverlay', overlaysFixture[0]);
+ expect(pluginDispatchEvent).toHaveBeenCalledWith(
+ 'onHideOverlay',
+ overlaysPageFixture.content[0],
+ );
});
});
diff --git a/src/services/pluginsManager/map/overlays/removeDataOverlay.test.ts b/src/services/pluginsManager/map/overlays/removeDataOverlay.test.ts
index a178691f8ddaf9db1a9337a6d04abc8fe7baaf33..f2e8feff983f9d894daa34527c72acb57d99be8b 100644
--- a/src/services/pluginsManager/map/overlays/removeDataOverlay.test.ts
+++ b/src/services/pluginsManager/map/overlays/removeDataOverlay.test.ts
@@ -1,7 +1,7 @@
/* eslint-disable no-magic-numbers */
import { RootState, store } from '@/redux/store';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { DEFAULT_ERROR } from '@/constants/errors';
import { removeOverlay } from '@/redux/overlays/overlays.thunks';
import { removeDataOverlay } from './removeDataOverlay';
@@ -14,7 +14,7 @@ const MOCK_STATE = {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -35,7 +35,7 @@ describe('removeDataOverlay', () => {
it('should dispatch removeOverlay with correct overlayId if matching overlay is found', () => {
getStateSpy.mockImplementation(() => MOCK_STATE as RootState);
- const overlayId = overlaysFixture[0].idObject;
+ const overlayId = overlaysPageFixture.content[0].idObject;
removeDataOverlay(overlayId);
diff --git a/src/services/pluginsManager/map/overlays/showDataOverlay/showDataOverlay.test.ts b/src/services/pluginsManager/map/overlays/showDataOverlay/showDataOverlay.test.ts
index 3ccebefa0b896ad8aeaac85e2c6ebd3e7b32ec19..da92e7f915ce3c20495cc1ef696fb7b3787cc114 100644
--- a/src/services/pluginsManager/map/overlays/showDataOverlay/showDataOverlay.test.ts
+++ b/src/services/pluginsManager/map/overlays/showDataOverlay/showDataOverlay.test.ts
@@ -1,6 +1,6 @@
/* eslint-disable no-magic-numbers */
import { RootState, store } from '@/redux/store';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { DEFAULT_ERROR } from '@/constants/errors';
import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock';
import { OVERLAY_BIO_ENTITY_INITIAL_STATE_MOCK } from '@/redux/overlayBioEntity/overlayBioEntity.mock';
@@ -17,7 +17,7 @@ jest.mock('../../../../../redux/overlayBioEntity/overlayBioEntity.thunk');
jest.mock('../../../../../redux/store');
jest.mock('./setBackgroundtoEmptyIfAvailable');
-const OVERLAY_ID = overlaysFixture[0].idObject;
+const OVERLAY_ID = overlaysPageFixture.content[0].idObject;
describe('showDataOverlay function', () => {
afterEach(() => {
@@ -33,7 +33,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -52,7 +52,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -71,7 +71,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -94,7 +94,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -105,7 +105,10 @@ describe('showDataOverlay function', () => {
showDataOverlay(OVERLAY_ID);
- expect(pluginDispatchEvent).toHaveBeenCalledWith('onShowOverlay', overlaysFixture[0]);
+ expect(pluginDispatchEvent).toHaveBeenCalledWith(
+ 'onShowOverlay',
+ overlaysPageFixture.content[0],
+ );
});
it('should not set empty background when it show overlay', () => {
@@ -115,7 +118,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
@@ -135,7 +138,7 @@ describe('showDataOverlay function', () => {
overlays: {
...OVERLAYS_INITIAL_STATE_MOCK,
userOverlays: {
- data: overlaysFixture,
+ data: overlaysPageFixture.content,
loading: 'idle',
error: DEFAULT_ERROR,
},
diff --git a/src/utils/initialize/useInitializeStore.test.ts b/src/utils/initialize/useInitializeStore.test.ts
index 1a99f715fa58967978dc5b381962a660731e6ebf..8243df3004c2c266b33b382dfb60c2adccb3e540 100644
--- a/src/utils/initialize/useInitializeStore.test.ts
+++ b/src/utils/initialize/useInitializeStore.test.ts
@@ -1,7 +1,7 @@
import { PROJECT_ID } from '@/constants';
import { backgroundsFixture } from '@/models/fixtures/backgroundsFixture';
import { modelsFixture } from '@/models/fixtures/modelsFixture';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { overlaysPageFixture } from '@/models/fixtures/overlaysFixture';
import { projectFixture } from '@/models/fixtures/projectFixture';
import { apiPath } from '@/redux/apiPath';
import { backgroundsDataSelector } from '@/redux/backgrounds/background.selectors';
@@ -16,16 +16,16 @@ import { HttpStatusCode } from 'axios';
import * as hook from './useInitializeStore';
const mockedAxiosClient = mockNetworkResponse();
-const mockedAxiosNEWApiClient = mockNetworkNewAPIResponse();
+const mockedAxiosNewClient = mockNetworkNewAPIResponse();
describe('useInitializeStore - hook', () => {
describe('when fired', () => {
beforeAll(() => {
mockedAxiosClient.onGet(apiPath.getModelsString()).reply(HttpStatusCode.Ok, modelsFixture);
- mockedAxiosClient
+ mockedAxiosNewClient
.onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
- mockedAxiosNEWApiClient
+ .reply(HttpStatusCode.Ok, overlaysPageFixture);
+ mockedAxiosNewClient
.onGet(apiPath.getProjectById(PROJECT_ID))
.reply(HttpStatusCode.Ok, projectFixture);
mockedAxiosClient
@@ -59,7 +59,7 @@ describe('useInitializeStore - hook', () => {
await waitFor(() => {
const data = overlaysDataSelector(store.getState());
- expect(data).toEqual(overlaysFixture);
+ expect(data).toEqual(overlaysPageFixture.content);
});
});