Skip to content
Snippets Groups Projects
Commit 372fe339 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '281-duplicated-overlays' into 'development'

Resolve "Duplicated overlays"

Closes #281

See merge request !230
parents aaafe80d 78bedb45
No related branches found
Tags v18.0.0-beta.1
2 merge requests!231Development,!230Resolve "Duplicated overlays"
Pipeline #94713 passed
......@@ -31,6 +31,13 @@ const renderComponent = (initialStoreState: InitialStoreState = {}): { store: St
);
};
const testOverlaysFixture = overlaysFixture.map(overlay => {
return {
...overlay,
publicOverlay: false,
};
});
describe('LoginModal - component', () => {
test('renders LoginModal component', () => {
renderComponent();
......@@ -79,7 +86,7 @@ describe('LoginModal - component', () => {
publicOverlay: false,
}),
)
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent();
const loginInput = screen.getByLabelText(/login/i);
......@@ -97,11 +104,7 @@ describe('LoginModal - component', () => {
});
expect(store.getState().overlays.userOverlays.loading).toBe('succeeded');
// eslint-disable-next-line no-console
console.log(overlaysFixture);
// eslint-disable-next-line no-console
console.log(store.getState().overlays.userOverlays.data);
expect(store.getState().overlays.userOverlays.data).toEqual(overlaysFixture);
expect(store.getState().overlays.userOverlays.data).toEqual(testOverlaysFixture);
});
it('should display loggedInMenuModal after successful login as admin', async () => {
mockedAxiosClient.onPost(apiPath.postLogin()).reply(HttpStatusCode.Ok, loginFixture);
......@@ -121,7 +124,7 @@ describe('LoginModal - component', () => {
publicOverlay: false,
}),
)
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
......@@ -160,7 +163,7 @@ describe('LoginModal - component', () => {
publicOverlay: false,
}),
)
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
......@@ -191,7 +194,7 @@ describe('LoginModal - component', () => {
publicOverlay: false,
}),
)
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent({
modal: MODAL_INITIAL_STATE_MOCK,
......
......@@ -59,6 +59,13 @@ const renderComponentWithActionListener = (
);
};
const testOverlaysFixture = overlaysFixture.map(overlay => {
return {
...overlay,
publicOverlay: false,
};
});
describe('UserOverlayForm - Component', () => {
beforeEach(() => {
jest.clearAllMocks();
......@@ -215,7 +222,7 @@ describe('UserOverlayForm - Component', () => {
mockedAxiosClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent({
user: {
......@@ -258,7 +265,7 @@ describe('UserOverlayForm - Component', () => {
const refetchedUserOverlays = store.getState().overlays.userOverlays.data;
await waitFor(() => {
expect(refetchedUserOverlays).toEqual(overlaysFixture);
expect(refetchedUserOverlays).toEqual(testOverlaysFixture);
});
});
it('should show toast after successful creating user overlays', async () => {
......@@ -276,7 +283,7 @@ describe('UserOverlayForm - Component', () => {
mockedAxiosClient
.onGet(apiPath.getAllUserOverlaysByCreatorQuery({ creator: 'test', publicOverlay: false }))
.reply(HttpStatusCode.Ok, overlaysFixture);
.reply(HttpStatusCode.Ok, testOverlaysFixture);
const { store } = renderComponent({
user: {
......
......@@ -72,7 +72,9 @@ export const getAllUserOverlaysByCreator = createAsyncThunk<MapOverlay[], void,
return -1;
};
const sortedUserOverlays = response.data.sort(sortByOrder);
const sortedUserOverlays = response.data
.sort(sortByOrder)
.filter(overlay => !overlay.publicOverlay);
return isDataValid ? sortedUserOverlays : [];
} catch (error) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment