From 84f195bba99fb6eaa4814adef614d500dde73eb6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Wed, 2 Oct 2024 15:05:43 +0200
Subject: [PATCH] api endpoint changed idObject => id
---
.../OverviewImagesModal.component.test.tsx | 2 +-
.../OverviewImagesModal/utils/useOverviewImage.test.ts | 4 ++--
.../utils/useOverviewImageLinkActions.test.ts | 8 ++++----
.../utils/useOverviewImageLinkActions.ts | 2 +-
.../utils/useOverviewImageLinkElements.test.ts | 4 ++--
.../utils/useOverviewImageSize.test.tsx | 4 ++--
.../utils/useOverviewImageUrl.test.ts | 2 +-
.../FunctionalArea/TopBar/TopBar.component.test.tsx | 2 +-
src/models/mocks/overviewImageMocks.ts | 2 +-
src/models/overviewImageView.ts | 2 +-
src/redux/project/project.mock.ts | 2 +-
src/redux/project/project.selectors.ts | 6 ++----
.../overviewImage/selectOverviewImage.test.ts | 8 +++-----
.../overviewImage/selectOverviewImage.ts | 2 +-
.../overviewImage/showOverviewImageModal.test.ts | 10 +++++-----
.../overviewImage/showOverviewImageModal.ts | 2 +-
16 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx b/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
index 5b7ed93e..c13cc7a9 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
@@ -78,7 +78,7 @@ describe('OverviewImagesModal - component', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
index f5ae9c32..702a3d48 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
@@ -56,7 +56,7 @@ describe('useOverviewImage - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -96,7 +96,7 @@ describe('useOverviewImage - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
index 375cd187..afcf6cb1 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
@@ -98,7 +98,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -155,7 +155,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -233,7 +233,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -337,7 +337,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
index 5059ea59..3d0967ca 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
@@ -25,7 +25,7 @@ export const useOverviewImageLinkActions = (): UseOverviewImageLinkActionsResult
const currentMapModelId = useAppSelector(currentModelIdSelector);
const checkIfImageIsAvailable = (imageId: number): boolean =>
- overviewImages.some(image => image.idObject === imageId);
+ overviewImages.some(image => image.id === imageId);
const checkIfMapAlreadyOpened = (modelId: number): boolean =>
openedMaps.some(map => map.modelId === modelId);
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
index 61169d09..298ee2e9 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
@@ -59,7 +59,7 @@ describe('useOverviewImageLinkConfigs - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -96,7 +96,7 @@ describe('useOverviewImageLinkConfigs - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
index f1cfe2e7..0ba9f969 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
@@ -55,7 +55,7 @@ describe('useOverviewImageSize - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -84,7 +84,7 @@ describe('useOverviewImageSize - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
index b257be4c..da3d6a6a 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
@@ -49,7 +49,7 @@ describe('useOverviewImageUrl - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
index 0fb61179..f87cc56c 100644
--- a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
+++ b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
@@ -129,7 +129,7 @@ describe('TopBar - component', () => {
const actions = store.getActions();
expect(actions[FIRST_ARRAY_ELEMENT]).toStrictEqual({
- payload: projectFixture.topOverviewImage?.idObject,
+ payload: projectFixture.topOverviewImage?.id,
type: 'modal/openOverviewImagesModalById',
});
});
diff --git a/src/models/mocks/overviewImageMocks.ts b/src/models/mocks/overviewImageMocks.ts
index 99906390..a86766b9 100644
--- a/src/models/mocks/overviewImageMocks.ts
+++ b/src/models/mocks/overviewImageMocks.ts
@@ -4,7 +4,7 @@ import { OverviewImageLinkImage, OverviewImageLinkModel } from '@/types/models';
export const OVERVIEW_LINK_IMAGE_MOCK: OverviewImageLinkImage = {
idObject: 1,
polygon: [],
- imageLinkId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageLinkId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
type: 'OverviewImageLink',
};
diff --git a/src/models/overviewImageView.ts b/src/models/overviewImageView.ts
index 1c1da19a..c012cd97 100644
--- a/src/models/overviewImageView.ts
+++ b/src/models/overviewImageView.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
import { overviewImageLink } from './overviewImageLink';
export const overviewImageView = z.object({
- idObject: z.number(),
+ id: z.number(),
filename: z.string(),
width: z.number(),
height: z.number(),
diff --git a/src/redux/project/project.mock.ts b/src/redux/project/project.mock.ts
index 0b8da5ef..1e3dc15a 100644
--- a/src/redux/project/project.mock.ts
+++ b/src/redux/project/project.mock.ts
@@ -10,7 +10,7 @@ export const PROJECT_STATE_INITIAL_MOCK: ProjectState = {
};
export const PROJECT_OVERVIEW_IMAGE_MOCK: NonNullable<OverviewImageView> = {
- idObject: 440,
+ id: 440,
filename: '9d4911bdeeea752f076e57a91d9b1f45/biolayout_main_root.png',
width: 5776,
height: 4040,
diff --git a/src/redux/project/project.selectors.ts b/src/redux/project/project.selectors.ts
index 7ab9a0c2..c009c3c4 100644
--- a/src/redux/project/project.selectors.ts
+++ b/src/redux/project/project.selectors.ts
@@ -10,16 +10,14 @@ export const projectDataSelector = createSelector(projectSelector, project => pr
export const projectDefaultOverviewImageIdSelector = createSelector(
projectDataSelector,
- projectData => projectData?.topOverviewImage?.idObject || OVERVIEW_IMAGE_ID_DEFAULT,
+ projectData => projectData?.topOverviewImage?.id || OVERVIEW_IMAGE_ID_DEFAULT,
);
export const currentOverviewImageSelector = createSelector(
projectDataSelector,
currentOverviewImageIdSelector,
(projectData, imageId): OverviewImageView | undefined =>
- (projectData?.overviewImageViews || []).find(
- overviewImage => overviewImage.idObject === imageId,
- ),
+ (projectData?.overviewImageViews || []).find(overviewImage => overviewImage.id === imageId),
);
export const projectOverviewImagesSelector = createSelector(
diff --git a/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts b/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
index 500bfae9..e38b1c0a 100644
--- a/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
+++ b/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
@@ -29,11 +29,9 @@ describe('selectOverviewImage - plugin method', () => {
});
it('should dispatch action set overview image', () => {
- selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.idObject);
+ selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.id);
- expect(dispatchSpy).toHaveBeenCalledWith(
- setOverviewImageId(PROJECT_OVERVIEW_IMAGE_MOCK.idObject),
- );
+ expect(dispatchSpy).toHaveBeenCalledWith(setOverviewImageId(PROJECT_OVERVIEW_IMAGE_MOCK.id));
});
});
@@ -55,7 +53,7 @@ describe('selectOverviewImage - plugin method', () => {
});
it('should throw error', () => {
- expect(() => selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.idObject)).toThrow(
+ expect(() => selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.id)).toThrow(
OVERVIEW_IMAGE_ERRORS.IMAGE_ID_IS_INVALID,
);
});
diff --git a/src/services/pluginsManager/overviewImage/selectOverviewImage.ts b/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
index 71ef40f1..2172b3e9 100644
--- a/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
+++ b/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
@@ -6,7 +6,7 @@ import { store } from '@/redux/store';
export const selectOverviewImage = (imageId: number): void => {
const { dispatch, getState } = store;
const overviewImages = projectOverviewImagesSelector(getState());
- const foundOverviewImage = overviewImages.find(o => o.idObject === imageId);
+ const foundOverviewImage = overviewImages.find(o => o.id === imageId);
const isImageIdValid = Boolean(foundOverviewImage);
if (!isImageIdValid) {
diff --git a/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts b/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
index f829470b..cddb6f0d 100644
--- a/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
+++ b/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
@@ -31,12 +31,12 @@ describe('showOverviewImageModal - plugin method', () => {
PROJECT_OVERVIEW_IMAGE_MOCK,
{
...PROJECT_OVERVIEW_IMAGE_MOCK,
- idObject: defaultImageId,
+ id: defaultImageId,
},
],
topOverviewImage: {
...PROJECT_OVERVIEW_IMAGE_MOCK,
- idObject: defaultImageId,
+ id: defaultImageId,
},
},
},
@@ -70,10 +70,10 @@ describe('showOverviewImageModal - plugin method', () => {
});
it('should dispatch action set overview image', () => {
- showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.idObject);
+ showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.id);
expect(dispatchSpy).toHaveBeenCalledWith(
- openOverviewImagesModalById(PROJECT_OVERVIEW_IMAGE_MOCK.idObject),
+ openOverviewImagesModalById(PROJECT_OVERVIEW_IMAGE_MOCK.id),
);
});
});
@@ -97,7 +97,7 @@ describe('showOverviewImageModal - plugin method', () => {
});
it('should throw error', () => {
- expect(() => showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.idObject)).toThrow(
+ expect(() => showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.id)).toThrow(
OVERVIEW_IMAGE_ERRORS.IMAGE_ID_IS_INVALID,
);
});
diff --git a/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts b/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
index ac435106..bd4bcfd7 100644
--- a/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
+++ b/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
@@ -12,7 +12,7 @@ export const showOverviewImageModal = (imageId?: number): void => {
const defaultImageId = projectDefaultOverviewImageIdSelector(getState());
const selectedImageId = imageId || defaultImageId;
- const foundOverviewImage = overviewImages.find(o => o.idObject === selectedImageId);
+ const foundOverviewImage = overviewImages.find(o => o.id === selectedImageId);
const isImageIdValid = Boolean(foundOverviewImage);
if (!isImageIdValid) {
--
GitLab